[Refactor] ver 1.3.0 모임방 사용성 개선 작업

src/main/java/konkuk/thip/common/exception/code/ErrorCode.java

@@ -99,7 +99,7 @@ public enum ErrorCode implements ResponseCode {
     INVALID_ROOM_SEARCH_SORT(HttpStatus.BAD_REQUEST, 100005, "방 검색 시 정렬 조건이 잘못되었습니다."),
     ROOM_MEMBER_COUNT_EXCEEDED(HttpStatus.BAD_REQUEST, 100006, "방의 최대 인원 수를 초과했습니다."),
     ROOM_MEMBER_COUNT_UNDERFLOW(HttpStatus.BAD_REQUEST, 100007, "방의 인원 수가 1 이하(방장 포함)입니다."),
-    ROOM_IS_EXPIRED(HttpStatus.BAD_REQUEST, 100008, "방이 만료되었습니다."),
+    ROOM_IS_EXPIRED(HttpStatus.BAD_REQUEST, 100008, " 완료된 모임방에서는 기존 기록에 대한 조회만 가능해요."),
     ROOM_POST_TYPE_NOT_MATCH(HttpStatus.BAD_REQUEST, 100009, "일치하는 방 게시물 타입 이름이 없습니다. [RECORD, VOTE] 중 하나여야 합니다."),
     ROOM_NOT_IN_PROGRESS(HttpStatus.BAD_REQUEST, 100010, "진행 중인 방이 아닙니다."),
 

src/main/java/konkuk/thip/common/security/util/JwtUtil.java

@@ -25,9 +25,10 @@ public class JwtUtil {
 
     private final SecretKey secretKey;
 
-    //todo 확정 후 환경변수로 변경
-    private final long tokenExpiredMs = 2592000000L; // 30일
-    private final long signupTokenExpiredMs = 2592000000L; // 30일
+    @Value("${jwt.access-token-expiration}")
+    private long tokenExpiredMs;
+    @Value("${jwt.signup-token-expiration}")
+    private long signupTokenExpiredMs;
 
     public JwtUtil(@Value("${jwt.secret}") String secret) {
         secretKey = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8), Jwts.SIG.HS256.key().build().getAlgorithm());

src/main/java/konkuk/thip/common/swagger/SwaggerResponseDescription.java

@@ -99,7 +99,7 @@ public enum SwaggerResponseDescription {
     ROOM_GET_MEMBER_LIST(new LinkedHashSet<>(Set.of(
             ROOM_NOT_FOUND
     ))),
-    ROOM_PLAYING_DETAIL(new LinkedHashSet<>(Set.of(
+    ROOM_PLAYING_OR_EXPIRED_DETAIL(new LinkedHashSet<>(Set.of(
             BOOK_NOT_FOUND,
             ROOM_NOT_FOUND,
             ROOM_ACCESS_FORBIDDEN
@@ -109,7 +109,7 @@ public enum SwaggerResponseDescription {
             BOOK_NOT_FOUND,
             ROOM_ACCESS_FORBIDDEN
     ))),
-    ROOM_GET_DEADLINE_POPULAR(new LinkedHashSet<>(Set.of(
+    ROOM_GET_DEADLINE_POPULAR_RECENT(new LinkedHashSet<>(Set.of(
             CATEGORY_NOT_MATCH
     ))),
     CHANGE_ROOM_LIKE_STATE(new LinkedHashSet<>(Set.of(

src/main/java/konkuk/thip/common/util/DateUtil.java

@@ -46,7 +46,7 @@ public static String formatAfterTime(LocalDate date) {
         return minutes + "분 뒤";
     }
 
-    public static String RecruitingRoomFormatAfterTime(LocalDate date) {
+    public static String recruitingRoomFormatAfterTime(LocalDate date) {
         LocalDateTime now = LocalDateTime.now();
         LocalDateTime dateTime = date.atStartOfDay();
         Duration d = Duration.between(now, dateTime);
@@ -68,6 +68,29 @@ public static String RecruitingRoomFormatAfterTime(LocalDate date) {
         return "마감 임박";
     }
 
+    public static String recruitingRoomFormatAfterTimeSimple(LocalDate date) {
+        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime dateTime = date.atStartOfDay();
+        Duration d = Duration.between(now, dateTime);
+
+        if (d.isNegative() || d.isZero()) {
+            return "??";
+        }
+
+        long days = d.toDays();
+        if (days > 0) {
+            return days + "일";
+        }
+
+        long hours = d.toHours();
+        if (hours >= 1) {
+            return hours + "시간";
+        }
+
+        long minutes = d.toMinutes();
+        return minutes + "분";
+    }
+
 
     public static String formatDate(LocalDate date) {
         return date.format(DATE_FORMATTER);

src/main/java/konkuk/thip/recentSearch/application/service/manager/RecentSearchCreateManager.java

@@ -15,15 +15,15 @@ public class RecentSearchCreateManager {
     private final RecentSearchQueryPort recentSearchQueryPort;
 
     public void saveRecentSearchByUser(Long userId, String keyword, RecentSearchType type, boolean isFinalized) {
-        // 검색완료일 경우에 최근검색어 추가
-        if (isFinalized) {
-            // 동일 조건 (userId + keyword + type) 검색 기록이 이미 있는지 확인
-            recentSearchQueryPort.findRecentSearchByKeywordAndUserId(keyword, userId, type)
-                    .ifPresentOrElse(
-                            recentSearchCommandPort::touch, // 있으면 modifiedAt 갱신
-                            () -> recentSearchCommandPort.save(RecentSearch.withoutId(keyword, type, userId)) // 없으면 새로 저장
-                    );
-        }
+        if (!isFinalized) return; // 검색완료일 경우에 최근검색어 추가
+        if (keyword == null || keyword.trim().isEmpty()) return;
+        String normalized = keyword.trim();
 
+        // 동일 조건 (userId + keyword + type) 검색 기록이 이미 있는지 확인
+        recentSearchQueryPort.findRecentSearchByKeywordAndUserId(normalized, userId, type)
+                .ifPresentOrElse(
+                        recentSearchCommandPort::touch, // 있으면 modifiedAt 갱신
+                        () -> recentSearchCommandPort.save(RecentSearch.withoutId(normalized, type, userId)) // 없으면 새로 저장
+                );
     }
 }

src/main/java/konkuk/thip/room/adapter/in/web/RoomQueryController.java

@@ -27,10 +27,10 @@ public class RoomQueryController {
     private final RoomVerifyPasswordUseCase roomVerifyPasswordUseCase;
     private final RoomShowRecruitingDetailViewUseCase roomShowRecruitingDetailViewUseCase;
     private final RoomGetMemberListUseCase roomGetMemberListUseCase;
-    private final RoomShowPlayingDetailViewUseCase roomShowPlayingDetailViewUseCase;
+    private final RoomShowPlayingOrExpiredDetailViewUseCase roomShowPlayingOrExpiredDetailViewUseCase;
     private final RoomShowMineUseCase roomShowMineUseCase;
     private final RoomGetBookPageUseCase roomGetBookPageUseCase;
-    private final RoomGetDeadlinePopularUseCase roomGetDeadlinePopularUsecase;
+    private final RoomGetDeadlinePopularRecentUseCase roomGetDeadlinePopularRecentUseCase;
 
     @Operation(
             summary = "모집중인 방 검색",
@@ -41,14 +41,15 @@ public class RoomQueryController {
     public BaseResponse<RoomSearchResponse> searchRecruitingRooms(
             @Parameter(description = "검색 키워드 (책 이름 or 방 이름)", example = "해리") @RequestParam(value = "keyword", required = false, defaultValue = "") final String keyword,
             @Parameter(description = "모임방 카테고리", example = "문학") @RequestParam(value = "category", required = false, defaultValue = "") final String category,
+            @Parameter(description = "전체검색여부 (전체 검색에 해당할때만 true로 보내주세요) ", example = "true") @RequestParam(value = "isAllCategory", required = false, defaultValue = "false") final boolean isAllCategory,
             @Parameter(description = "정렬 방식 (마감 임박 : deadline, 신청 인원 : memberCount)", example = "deadline") @RequestParam("sort") final String sort,
             @Parameter(description = "사용자가 검색어 입력을 '확정'했는지 여부 (입력 중: false, 입력 확정: true)", example = "false") @RequestParam(name = "isFinalized") final boolean isFinalized,
             @Parameter(description = "커서 (첫번째 요청시 : null, 다음 요청시 : 이전 요청에서 반환받은 nextCursor 값)")
             @RequestParam(value = "cursor", required = false) final String cursor,
             @Parameter(hidden = true) @UserId final Long userId
     ) {
         return BaseResponse.ok(roomSearchUseCase.searchRecruitingRooms(
-                RoomSearchQuery.of(keyword, category, sort, isFinalized, cursor, userId)
+                RoomSearchQuery.of(keyword, category, sort, isFinalized, cursor, userId,isAllCategory)
         ));
     }
 
@@ -79,7 +80,7 @@ public BaseResponse<RoomRecruitingDetailViewResponse> getRecruitingRoomDetailVie
 
     @Operation(
             summary = "[모임 홈] 참여중인 내 모임방 조회",
-            description = "사용자가 참여중인 모임방 목록을 조회합니다."
+            description = "사용자가 참여중인 (모집중/진행중인 방) 모임방 목록을 조회합니다."
     )
     @ExceptionDescription(ROOM_GET_HOME_JOINED_LIST)
     @GetMapping("/rooms/home/joined")
@@ -105,18 +106,18 @@ public BaseResponse<RoomGetMemberListResponse> getRoomMemberList(
         return BaseResponse.ok(roomGetMemberListUseCase.getRoomMemberList(userId, roomId));
     }
 
-    // 진행중인 방 상세보기
+    // 진행중인/완료된 방 상세보기
     @Operation(
-            summary = "진행중인 방 상세보기",
-            description = "진행중인 방의 상세 정보를 조회합니다."
+            summary = "진행중인/완료된 방 상세보기",
+            description = "진행중인/완료된 방의 상세 정보를 조회합니다."
     )
-    @ExceptionDescription(ROOM_PLAYING_DETAIL)
-    @GetMapping("/rooms/{roomId}/playing")
-    public BaseResponse<RoomPlayingDetailViewResponse> getPlayingRoomDetailView(
+    @ExceptionDescription(ROOM_PLAYING_OR_EXPIRED_DETAIL)
+    @GetMapping("/rooms/{roomId}")
+    public BaseResponse<RoomPlayingOrExpiredDetailViewResponse> getPlayingOrExpiredRoomDetailView(
             @Parameter(hidden = true) @UserId final Long userId,
             @PathVariable("roomId") final Long roomId
     ) {
-        return BaseResponse.ok(roomShowPlayingDetailViewUseCase.getPlayingRoomDetailView(userId, roomId));
+        return BaseResponse.ok(roomShowPlayingOrExpiredDetailViewUseCase.getPlayingOrExpiredRoomDetailView(userId, roomId));
     }
 
     // 내 모임방 리스트 조회
@@ -148,16 +149,15 @@ public BaseResponse<RoomGetBookPageResponse> getBookPage(
     }
 
     @Operation(
-            summary = "마감 임박 및 인기 방 조회",
-            description = "카테고리별로 마감 임박 방과 인기 방을 조회합니다."
+            summary = "마감 임박/인기 방/최근 생성된 방 조회",
+            description = "카테고리별로 마감 임박 방, 인기 방, 최근 생성된 방을 조회합니다."
     )
-    @ExceptionDescription(ROOM_GET_DEADLINE_POPULAR)
+    @ExceptionDescription(ROOM_GET_DEADLINE_POPULAR_RECENT)
     @GetMapping("/rooms")
-    public BaseResponse<RoomGetDeadlinePopularResponse> getDeadlineAndPopularRoomList(
+    public BaseResponse<RoomGetDeadlinePopularRecentResponse> getDeadlineAndPopularAndRecentRoomList(
             @Parameter(description = "카테고리 이름 (default : 문학)", example = "과학/IT")
-            @RequestParam(value = "category", defaultValue = "문학") final String category,
-            @Parameter(hidden = true) @UserId final Long userId
+            @RequestParam(value = "category", defaultValue = "문학") final String category
     ) {
-        return BaseResponse.ok(roomGetDeadlinePopularUsecase.getDeadlineAndPopularRoomList(category, userId));
+        return BaseResponse.ok(roomGetDeadlinePopularRecentUseCase.getDeadlineAndPopularAndRecentRoomList(category));
     }
 }

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

@@ -0,0 +1,25 @@
+package konkuk.thip.room.adapter.in.web.response;
+
+import java.util.List;
+
+public record RoomGetDeadlinePopularRecentResponse(
+        List<RoomGetDeadlinePopularRecentDto> deadlineRoomList,
+        List<RoomGetDeadlinePopularRecentDto> popularRoomList,
+        List<RoomGetDeadlinePopularRecentDto> recentRoomList
+) {
+    public record RoomGetDeadlinePopularRecentDto(
+            Long roomId,
+            String bookImageUrl,
+            String roomName,
+            int recruitCount, // 방 최대 인원 수
+            int memberCount,
+            String deadlineDate
+    ) {
+    }
+
+    public static RoomGetDeadlinePopularRecentResponse of(List<RoomGetDeadlinePopularRecentDto> deadlineRoomList,
+                                                          List<RoomGetDeadlinePopularRecentDto> popularRoomList,
+                                                          List<RoomGetDeadlinePopularRecentDto> recentRoomList) {
+        return new RoomGetDeadlinePopularRecentResponse(deadlineRoomList, popularRoomList, recentRoomList);
+    }
+}

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

@@ -1,5 +1,7 @@
 package konkuk.thip.room.adapter.in.web.response;
 
+import io.swagger.v3.oas.annotations.media.Schema;
+
 import java.util.List;
 
 public record RoomGetHomeJoinedListResponse(
@@ -13,7 +15,12 @@ public record JoinedRoomInfo(
             String bookImageUrl,
             String roomTitle,
             int memberCount,
-            int userPercentage
+            @Schema(description = "진행중인 방에서 유저의 방 진행도, 모집중인 방은 쓰레기값이 넘어갑니다. 무시해주세요.",
+                    example = "35")
+            int userPercentage,
+            @Schema(description = "모집중인 방에서 방 모집 마감일까지 남은 시간, 진행중인 방은 쓰레기값이 넘어갑니다. 무시해주세요.",
+                    example = "3일")
+            String deadlineDate  // 방 모집 마감일 (~일/시 형식)
     ) {}
     public static RoomGetHomeJoinedListResponse of(List<RoomGetHomeJoinedListResponse.JoinedRoomInfo> roomList,
                                                    String nickname, String nextCursor, boolean isLast){

src/main/java/konkuk/thip/room/adapter/in/web/response/RoomPlayingDetailViewResponse.java → src/main/java/konkuk/thip/room/adapter/in/web/response/RoomPlayingOrExpiredDetailViewResponse.java

@@ -5,7 +5,7 @@
 import java.util.List;
 
 @Builder
-public record RoomPlayingDetailViewResponse(
+public record RoomPlayingOrExpiredDetailViewResponse(
         boolean isHost,
         Long roomId,
         String roomName,

src/main/java/konkuk/thip/room/adapter/out/persistence/RoomQueryPersistenceAdapter.java

@@ -16,6 +16,7 @@
 import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Repository
@@ -169,13 +170,18 @@ private CursorBasedList<RoomQueryDto> findRoomsByMemberCountCursor(Cursor cursor
     }
 
     @Override
-    public List<RoomQueryDto> findRoomsByCategoryOrderByDeadline(Category category, int limit, Long userId) {
-        return roomJpaRepository.findRoomsByCategoryOrderByStartDateAsc(category, limit, userId);
+    public List<RoomQueryDto> findRoomsByCategoryOrderByDeadline(Category category, int limit) {
+        return roomJpaRepository.findRoomsByCategoryOrderByStartDateAsc(category, limit);
     }
 
     @Override
-    public List<RoomQueryDto> findRoomsByCategoryOrderByPopular(Category category, int limit, Long userId) {
-        return roomJpaRepository.findRoomsByCategoryOrderByMemberCount(category, limit, userId);
+    public List<RoomQueryDto> findRoomsByCategoryOrderByPopular(Category category, int limit) {
+        return roomJpaRepository.findRoomsByCategoryOrderByMemberCount(category, limit);
+    }
+
+    @Override
+    public List<RoomQueryDto> findRoomsByCategoryOrderByRecent(Category category, LocalDateTime createdAfter, int limit) {
+        return roomJpaRepository.findRoomsByCategoryOrderByCreatedAtDesc(category, createdAfter, limit);
     }
 
     @Override

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

@@ -5,6 +5,7 @@
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
 import konkuk.thip.room.domain.value.Category;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import java.time.LocalDate;
@@ -31,9 +32,11 @@ public interface RoomQueryRepository {
 
     List<RoomQueryDto> findExpiredRoomsUserParticipated(Long userId, LocalDate dateCursor, Long roomIdCursor, int pageSize);
 
-    List<RoomQueryDto> findRoomsByCategoryOrderByStartDateAsc(Category category, int limit, Long userId);
+    List<RoomQueryDto> findRoomsByCategoryOrderByStartDateAsc(Category category, int limit);
 
-    List<RoomQueryDto> findRoomsByCategoryOrderByMemberCount(Category category, int limit, Long userId);
+    List<RoomQueryDto> findRoomsByCategoryOrderByMemberCount(Category category, int limit);
+
+    List<RoomQueryDto> findRoomsByCategoryOrderByCreatedAtDesc(Category category, LocalDateTime createdAfter, int limit);
 
     List<RoomQueryDto> findRoomsByIsbnOrderByStartDateAsc(String isbn, LocalDate dateCursor, Long roomIdCursor, int pageSize);
 }