feat: 세션 모두 조회 기능 완료

맵 스트럭트 적용 및 페이징 적용예정

Author: HuitaePark

build.gradle

@@ -41,6 +41,13 @@ dependencies {
     implementation 'io.jsonwebtoken:jjwt-jackson:0.12.6'
     //유효성 검사
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    // 맵 스트럭트 API
+    implementation 'org.mapstruct:mapstruct:1.6.3'
+    annotationProcessor 'org.projectlombok:lombok'
+    // 맵 스트럭트 어노테이션 프로세서 (수정됨)
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.6.3'
+    // 롬복과의 충돌 방지
+    annotationProcessor 'org.projectlombok:lombok-mapstruct-binding:0.2.0'
 
 }
 

src/main/java/com/waitit/capstone/domain/client/manager/HostController.java

@@ -2,7 +2,9 @@
 
 import com.waitit.capstone.domain.client.manager.dto.HostRequest;
 import com.waitit.capstone.domain.client.manager.dto.HostResponse;
+import com.waitit.capstone.domain.client.manager.dto.SessionListDto;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import lombok.AllArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -13,6 +15,7 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 @AllArgsConstructor
@@ -34,8 +37,16 @@ public ResponseEntity<?> saveHost(@RequestBody HostRequest request){
     }
 
     @GetMapping("/{id}")
+    @ResponseBody
     public ResponseEntity<HostResponse> getHost(@PathVariable Long id){
             HostResponse response = hostService.getHost(id);
             return ResponseEntity.status(HttpStatus.OK).body(response);
     }
+
+    @GetMapping("/sessions")
+    @ResponseBody
+    public ResponseEntity<List<SessionListDto>> getSessionList(){
+        List<SessionListDto> sessions = hostService.getAllSessions();
+        return ResponseEntity.status(HttpStatus.OK).body(sessions);
+    }
 }

src/main/java/com/waitit/capstone/domain/client/manager/HostService.java

@@ -2,29 +2,110 @@
 
 import com.waitit.capstone.domain.client.manager.dto.HostRequest;
 import com.waitit.capstone.domain.client.manager.dto.HostResponse;
+import com.waitit.capstone.domain.client.manager.dto.SessionListDto;
+import java.time.Duration;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
 @AllArgsConstructor
 @Service
 public class HostService {
     private final HostRepository hostRepository;
+    private final StringRedisTemplate redisTemplate;
+    private static final String ACTIVE_HOSTS_KEY = "active:hosts";
 
-    public boolean hostExist(Long id){
+    public boolean hostExist(Long id) {
         return true;
     }
+
     //호스트 정보 저장
-    public void saveHost(HostRequest request){
+    public void saveHost(HostRequest request) {
         Host host = request.toEntity();
+        String key = "waitList" + host.getId();
         hostRepository.save(host);
-        //레디스에 세션 올리기 필요
+        //세션 등록
+        redisTemplate.opsForList().rightPush(key, host.getHostName());
+        // 활성 호스트 Set 호스트 ID 추가
+        redisTemplate.opsForSet().add(ACTIVE_HOSTS_KEY, host.getId().toString());
+    }
+
+    // 호스트 세션 비활성화
+    public void deactivateHost(Long hostId) {
+        // 활성 호스트 Set에서 호스트 ID 제거
+        redisTemplate.opsForSet().remove(ACTIVE_HOSTS_KEY, hostId.toString());
     }
 
-    //요청받은 아이디로 db에서 호스트 조회
-    public HostResponse getHost(Long id){
+    //요청받은 아이디로 db에 호스트 조회
+    public HostResponse getHost(Long id) {
         Host host = hostRepository.findHostById(id);
         return HostResponse.from(host);
     }
 
+    public List<SessionListDto> getAllSessions() {
+        List<SessionListDto> result = new ArrayList<>();
+
+        // Redis Set에서 활성 호스트 ID 목록 가져오기
+        Set<String> activeHostIds = redisTemplate.opsForSet().members(ACTIVE_HOSTS_KEY);
+
+        if (activeHostIds != null && !activeHostIds.isEmpty()) {
+            // 문자열 ID를 Long 변환
+            List<Long> hostIds = activeHostIds.stream()
+                    .map(Long::parseLong)
+                    .collect(Collectors.toList());
+
+            // 활성 호스트만 DB 조회
+            List<Host> activeHosts = hostRepository.findAllById(hostIds);
+
+            for (Host host : activeHosts) {
+                String waitListKey = "waitList" + host.getId();
+
+                // 대기 인원 수 계산
+                Long waitingCount = redisTemplate.opsForList().size(waitListKey);
+
+                // 예상 시간 계산 (시작 시간부터 종료 시간까지)
+                String estimatedTime = calculateEstimatedTime(host.getStartTime(), host.getEndTime());
+
+                // DTO 생성 및 추가
+                SessionListDto sessionDto = SessionListDto.builder()
+                        .hostId(host.getId())
+                        .hostName(host.getHostName())
+                        .imgUrl(host.getImgUrl())
+                        .estimatedTime(estimatedTime)
+                        .waitingCount(waitingCount != null ? waitingCount.intValue() : 0)
+                        .build();
+
+                result.add(sessionDto);
+            }
+        }
+
+        return result;
+    }
+
+    // 호스트가 활성 상태인지 확인
+    public boolean isHostActive(Long hostId) {
+        return Boolean.TRUE.equals(redisTemplate.opsForSet().isMember(ACTIVE_HOSTS_KEY, hostId.toString()));
+    }
+
+    // 예상 시간 계산 메소드
+    private String calculateEstimatedTime(LocalDateTime startTime, LocalDateTime endTime) {
+        if (startTime == null || endTime == null) {
+            return "미정";
+        }
 
+        Duration duration = Duration.between(startTime, endTime);
+        long hours = duration.toHours();
+        long minutes = duration.toMinutesPart();
+
+        if (hours > 0) {
+            return hours + "시간 " + (minutes > 0 ? minutes + "분" : "");
+        } else {
+            return minutes + "분";
+        }
+    }
 }

src/main/java/com/waitit/capstone/domain/client/manager/dto/SessionListDto.java

@@ -0,0 +1,14 @@
+package com.waitit.capstone.domain.client.manager.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Builder
+public record SessionListDto(
+    Long hostId,
+    String hostName,
+    String imgUrl,
+    String estimatedTime,  // 예상 시간 (시작-종료 시간으로부터 계산)
+    int waitingCount){}      // 대기 인원 수

src/main/java/com/waitit/capstone/global/config/RedisConfig.java

@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 @Configuration
@@ -16,4 +17,10 @@ public RedisTemplate<String,String> redisTemplate(RedisConnectionFactory redisCo
         template.setValueSerializer(new StringRedisSerializer());
         return template;
     }
+    @Bean
+    public StringRedisTemplate stringRedisTemplate(RedisConnectionFactory connectionFactory) {
+        StringRedisTemplate template = new StringRedisTemplate();
+        template.setConnectionFactory(connectionFactory);
+        return template;
+    }
 }

src/main/resources/application.properties

@@ -9,7 +9,7 @@ spring.datasource.password=${SPRING_DATASOURCE_PASSWORD}
 
 # hibernate
 #none?? ?? ??
-spring.jpa.hibernate.ddl-auto=create
+spring.jpa.hibernate.ddl-auto=update
 spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
 
 # jwt secret key
@@ -18,3 +18,4 @@ spring.jwt.secret=${SPRING_JWT_SECRET}
 # Redis
 spring.data.redis.host=${SPRING_REDIS_HOST}
 spring.data.redis.port=${SPRING_REDIS_PORT}
+