[hotfix] 내 모임방 리스트 조회 api 수정

src/main/java/konkuk/thip/room/adapter/in/web/response/RoomShowMineResponse.java

@@ -1,7 +1,10 @@
 package konkuk.thip.room.adapter.in.web.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.util.List;
 
+@Schema(description = "내가 참여 중인 방 목록 조회 응답")
 public record RoomShowMineResponse(
         List<MyRoom> roomList,
         String nextCursor,
@@ -12,6 +15,11 @@ public record MyRoom(
             String bookImageUrl,
             String roomName,
             int memberCount,
-            String endDate      // 방 진행 마감일 or 방 모집 마감일 (~ 뒤 형식)
+
+            @Schema(description = "방 진행 마감일 or 방 모집 마감일까지 남은 시간 (ex. \"3일 뒤\"), 완료된 방은 쓰레기값이 넘어갑니다. 무시해주세요.")
+            String endDate,     // 방 진행 마감일 or 방 모집 마감일 (~ 뒤 형식)
+
+            @Schema(description = "방 상태 : [모집중(=recruiting), 진행중(=playing), 완료된(=expired)] 중 하나")
+            String type
     ) {}
 }

src/main/java/konkuk/thip/room/adapter/out/persistence/repository/RoomQueryRepositoryImpl.java

@@ -429,6 +429,7 @@ private List<RoomQueryDto> fetchMyRooms(
                         room.title,
                         room.recruitCount,
                         room.memberCount,
+                        room.startDate,     // 방의 진행 시작일 정보 채우기
                         cursorExpr
                 ))
                 .from(participant)

src/main/java/konkuk/thip/room/application/mapper/RoomQueryMapper.java

@@ -4,6 +4,8 @@
 import konkuk.thip.room.adapter.in.web.response.RoomGetDeadlinePopularResponse;
 import konkuk.thip.room.adapter.in.web.response.RoomShowMineResponse;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
+import konkuk.thip.room.application.port.in.dto.MyRoomType;
+import org.mapstruct.Context;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
@@ -17,11 +19,9 @@
 )
 public interface RoomQueryMapper {
 
-    @Mapping(
-            target = "endDate",
-            expression = "java(DateUtil.formatAfterTime(dto.endDate()))"
-    )
-    RoomShowMineResponse.MyRoom toShowMyRoomResponse(RoomQueryDto dto);
+    @Mapping(target = "endDate", expression = "java(DateUtil.formatAfterTime(dto.endDate()))")
+    @Mapping(target = "type", expression = "java(myRoomType.getType())")
+    RoomShowMineResponse.MyRoom toShowMyRoomResponse(RoomQueryDto dto, @Context MyRoomType myRoomType);
 
     @Mapping(
             target = "deadlineDate",

src/main/java/konkuk/thip/room/domain/MyRoomType.java → src/main/java/konkuk/thip/room/application/port/in/dto/MyRoomType.java

@@ -1,4 +1,4 @@
-package konkuk.thip.room.domain;
+package konkuk.thip.room.application.port.in.dto;
 
 import konkuk.thip.common.exception.InvalidStateException;
 import konkuk.thip.common.exception.code.ErrorCode;

src/main/java/konkuk/thip/room/application/port/out/dto/RoomQueryDto.java

@@ -1,6 +1,7 @@
 package konkuk.thip.room.application.port.out.dto;
 
 import com.querydsl.core.annotations.QueryProjection;
+import jakarta.annotation.Nullable;
 import lombok.Builder;
 import org.springframework.util.Assert;
 
@@ -13,6 +14,7 @@ public record RoomQueryDto(
         String roomName,
         int recruitCount, // 방 최대 인원 수
         int memberCount,
+        @Nullable LocalDate startDate,    // 방 진행 시작일
         LocalDate endDate       // 방 진행 마감일 or 방 모집 마감일
 ) {
     @QueryProjection
@@ -24,4 +26,16 @@ public record RoomQueryDto(
         Assert.isTrue(recruitCount > 0, "recruitCount must be greater than 0");
         Assert.isTrue(memberCount >= 0, "memberCount must be greater than or equal to 0");
     }
+
+    @QueryProjection
+    public RoomQueryDto(
+            Long roomId,
+            String bookImageUrl,
+            String roomName,
+            int recruitCount,
+            int memberCount,
+            LocalDate endDate
+    ) {
+        this(roomId, bookImageUrl, roomName, recruitCount, memberCount, null, endDate);
+    }
 }

src/main/java/konkuk/thip/room/application/service/RoomShowMineService.java

@@ -7,12 +7,12 @@
 import konkuk.thip.room.application.port.in.RoomShowMineUseCase;
 import konkuk.thip.room.application.port.out.RoomQueryPort;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
-import konkuk.thip.room.domain.MyRoomType;
+import konkuk.thip.room.application.port.in.dto.MyRoomType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.List;
+import java.time.LocalDate;
 
 @Service
 @RequiredArgsConstructor
@@ -43,20 +43,20 @@ public RoomShowMineResponse getMyRooms(Long userId, String type, String cursor)
         };
 
         // 3. dto -> response로 매핑 (EXPIRED 타입인 경우 endDate를 null로 처리)
-        boolean isExpiredType = myRoomType == MyRoomType.EXPIRED;
-        List<RoomShowMineResponse.MyRoom> myRooms = result.contents().stream()
+        var myRooms = result.contents().stream()
                 .map(dto -> {
-                    var myRoomResponse = roomQueryMapper.toShowMyRoomResponse(dto);
-                    if (isExpiredType) {
-                        return new RoomShowMineResponse.MyRoom(
-                                myRoomResponse.roomId(),
-                                myRoomResponse.bookImageUrl(),
-                                myRoomResponse.roomName(),
-                                myRoomResponse.memberCount(),
-                                null
-                        );
+                    if (myRoomType != MyRoomType.PLAYING_AND_RECRUITING) {
+                        // PLAYING, RECRUITING, EXPIRED 경우 타입 그대로 전달
+                        return roomQueryMapper.toShowMyRoomResponse(dto, myRoomType);
+                    }
+
+                    // PLAYING_AND_RECRUITING: startDate 기준으로 진행중/모집중 구분
+                    LocalDate now = LocalDate.now();
+                    if (dto.startDate() != null && dto.startDate().isBefore(now)) {
+                        return roomQueryMapper.toShowMyRoomResponse(dto, MyRoomType.PLAYING);   // 진행중인 방
+                    } else {
+                        return roomQueryMapper.toShowMyRoomResponse(dto, MyRoomType.RECRUITING);    // 모집중인 방
                     }
-                    return myRoomResponse;
                 })
                 .toList();