[refactor] RoomStatus 도입에 따른 방 만료 조건 수정 및 만료된 방 내부 게시글 조회만 가능하도록 수정

src/main/java/konkuk/thip/book/application/service/BookRecruitingRoomsService.java

@@ -11,8 +11,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDate;
-
 @Service
 @RequiredArgsConstructor
 public class BookRecruitingRoomsService implements BookRecruitingRoomsUseCase {
@@ -26,7 +24,7 @@ public class BookRecruitingRoomsService implements BookRecruitingRoomsUseCase {
     @Transactional(readOnly = true)
     public BookRecruitingRoomsResponse getRecruitingRoomsWithBook(String isbn, String cursorStr) {
         Integer totalRoomCount = (cursorStr == null || cursorStr.isBlank()) ? // 첫 요청 여부 판단
-                roomQueryPort.countRecruitingRoomsByBookAndStartDateAfter(isbn, LocalDate.now()) : null;
+                roomQueryPort.countRecruitingRoomsByBookIsbn(isbn) : null;
 
         Cursor cursor = Cursor.from(cursorStr, DEFAULT_PAGE_SIZE);
         CursorBasedList<RoomQueryDto> roomDtos = roomQueryPort.findRoomsByIsbnOrderByDeadline(isbn, cursor);

src/main/java/konkuk/thip/book/application/service/BookSearchService.java

@@ -113,9 +113,8 @@ public BookDetailSearchResult searchDetailBooks(String isbn,Long userId) {
     }
 
     private int getRecruitingRoomCount(Book book) {
-        //오늘 날짜 기준으로 방 활동 시작 기간이 이후인 방 찾기(모집중인 방)
-        LocalDate today = LocalDate.now();
-        return roomQueryPort.countRecruitingRoomsByBookAndStartDateAfter(book.getIsbn(), today);
+        // 모집 중인 방 개수
+        return roomQueryPort.countRecruitingRoomsByBookIsbn(book.getIsbn());
     }
 
     private int getReadCount(Book book) {

src/main/java/konkuk/thip/comment/application/service/policy/RoomPostCommentAccessPolicy.java

@@ -2,6 +2,7 @@
 
 import konkuk.thip.post.domain.CountUpdatable;
 import konkuk.thip.room.application.service.validator.RoomParticipantValidator;
+import konkuk.thip.room.application.service.validator.RoomValidator;
 import konkuk.thip.roompost.domain.RoomPost;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
@@ -11,11 +12,13 @@
 public class RoomPostCommentAccessPolicy implements CommentAccessPolicy {
 
     private final RoomParticipantValidator roomParticipantValidator;
+    private final RoomValidator roomValidator;
 
     @Override
     public void validateCommentAccess(CountUpdatable post, Long userId) {
         RoomPost roomPost = (RoomPost) post;
         roomParticipantValidator.validateUserIsRoomMember(roomPost.getRoomId(), userId);
+        roomValidator.validateRoomExpired(roomPost.getRoomId());
     }
 
 }

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

@@ -147,7 +147,8 @@ public enum SwaggerResponseDescription {
     RECORD_DELETE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
             RECORD_NOT_FOUND,
-            RECORD_ACCESS_FORBIDDEN
+            RECORD_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED
     ))),
     RECORD_PIN(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
@@ -158,7 +159,8 @@ public enum SwaggerResponseDescription {
     RECORD_UPDATE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
             RECORD_NOT_FOUND,
-            RECORD_ACCESS_FORBIDDEN
+            RECORD_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED
     ))),
 
     // Vote
@@ -175,7 +177,8 @@ public enum SwaggerResponseDescription {
             VOTE_ITEM_NOT_FOUND,
             VOTE_ITEM_ALREADY_VOTED,
             VOTE_ITEM_NOT_VOTED_CANNOT_CANCEL,
-            VOTE_ITEM_COUNT_CANNOT_BE_NEGATIVE
+            VOTE_ITEM_COUNT_CANNOT_BE_NEGATIVE,
+            ROOM_IS_EXPIRED
     ))),
     VOTE_DELETE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
@@ -251,8 +254,8 @@ public enum SwaggerResponseDescription {
             VOTE_NOT_FOUND,
             INVALID_COMMENT_CREATE,
             FEED_ACCESS_FORBIDDEN,
-            ROOM_ACCESS_FORBIDDEN
-
+            ROOM_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED
     ))),
     CHANGE_COMMENT_LIKE_STATE(new LinkedHashSet<>(Set.of(
             USER_NOT_FOUND,
@@ -264,7 +267,8 @@ public enum SwaggerResponseDescription {
             COMMENT_NOT_LIKED_CANNOT_CANCEL,
             COMMENT_LIKE_COUNT_UNDERFLOW,
             FEED_ACCESS_FORBIDDEN,
-            ROOM_ACCESS_FORBIDDEN
+            ROOM_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED
     ))),
     COMMENT_DELETE(new LinkedHashSet<>(Set.of(
             USER_NOT_FOUND,
@@ -275,7 +279,8 @@ public enum SwaggerResponseDescription {
             COMMENT_DELETE_FORBIDDEN,
             COMMENT_COUNT_UNDERFLOW,
             FEED_ACCESS_FORBIDDEN,
-            ROOM_ACCESS_FORBIDDEN
+            ROOM_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED
     ))),
 
     // Book
@@ -321,7 +326,8 @@ public enum SwaggerResponseDescription {
             ROOM_NOT_FOUND,
             USER_NOT_FOUND,
             ATTENDANCE_CHECK_WRITE_LIMIT_EXCEEDED,
-            ATTENDANCE_CHECK_NOT_FOUND
+            ATTENDANCE_CHECK_NOT_FOUND,
+            ROOM_IS_EXPIRED
     ))),
 
     ATTENDANCE_CHECK_SHOW(new LinkedHashSet<>(Set.of(

src/main/java/konkuk/thip/message/adapter/out/firebase/FirebaseAdapter.java

@@ -13,7 +13,7 @@
 
 @Slf4j
 @Component
-@Profile({"!test", "!local"})
+@Profile("!test & !local")
 @RequiredArgsConstructor
 public class FirebaseAdapter implements FirebaseMessagingPort {
 

src/main/java/konkuk/thip/room/adapter/out/jpa/RoomJpaEntity.java

@@ -100,4 +100,7 @@ public void updateIsPublic(boolean isPublic) {
 
     @VisibleForTesting
     public void updateRoomPercentage(double roomPercentage) {this.roomPercentage = roomPercentage;}
+
+    @VisibleForTesting
+    public void updateRoomStatus(RoomStatus roomStatus) {this.roomStatus = roomStatus;}
 }

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

@@ -25,8 +25,8 @@ public class RoomQueryPersistenceAdapter implements RoomQueryPort {
     private final RoomJpaRepository roomJpaRepository;
 
     @Override
-    public int countRecruitingRoomsByBookAndStartDateAfter(String isbn, LocalDate currentDate) {
-        return roomJpaRepository.countActiveRoomsByBookIdAndStartDateAfter(isbn, currentDate);
+    public int countRecruitingRoomsByBookIsbn(String isbn) {
+        return roomJpaRepository.countRecruitingRoomsByBookIsbn(isbn);
     }
 
     @Override

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

@@ -6,7 +6,6 @@
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
 
@@ -19,8 +18,8 @@ public interface RoomJpaRepository extends JpaRepository<RoomJpaEntity, Long>, R
 
     @Query("SELECT COUNT(r) FROM RoomJpaEntity r " +
             "WHERE r.bookJpaEntity.isbn = :isbn " +
-            "AND r.startDate > :currentDate")
-    int countActiveRoomsByBookIdAndStartDateAfter(@Param("isbn") String isbn, @Param("currentDate") LocalDate currentDate);
+            "AND r.roomStatus = 'RECRUITING'")
+    int countRecruitingRoomsByBookIsbn(@Param("isbn") String isbn);
 
     @Modifying(clearAutomatically = true, flushAutomatically = true)
     @Query("""

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

@@ -19,6 +19,7 @@
 import konkuk.thip.room.application.port.out.dto.RoomParticipantQueryDto;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
 import konkuk.thip.room.domain.value.Category;
+import konkuk.thip.room.domain.value.RoomStatus;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Repository;
 
@@ -35,9 +36,9 @@ public class RoomQueryRepositoryImpl implements RoomQueryRepository {
     private final QRoomParticipantJpaEntity participant = QRoomParticipantJpaEntity.roomParticipantJpaEntity;
 
     /** 모집중 + ACTIVE 공통 where */
-    private BooleanBuilder recruitingActiveWhere(LocalDate today) {
+    private BooleanBuilder recruitingActiveWhere() {
         BooleanBuilder where = new BooleanBuilder();
-        where.and(room.startDate.after(today));
+        where.and(room.roomStatus.eq(RoomStatus.RECRUITING));
         return where;
     }
 
@@ -91,10 +92,9 @@ private QRoomQueryDto projectionForRecruitingRoomSearch() {
      */
     @Override
     public List<RoomQueryDto> findRecruitingRoomsOrderByStartDateAsc(String keyword, LocalDate lastStartDate, Long roomId, int pageSize) {
-        final LocalDate today = LocalDate.now();
         DateExpression<LocalDate> cursorExpr = room.startDate; // 커서 비교는 startDate
 
-        BooleanBuilder where = recruitingActiveWhere(today);
+        BooleanBuilder where = recruitingActiveWhere();
         applyKeyword(where, keyword);
         applyCursorStartDateAsc(where, cursorExpr, lastStartDate, roomId);
 
@@ -110,10 +110,9 @@ public List<RoomQueryDto> findRecruitingRoomsOrderByStartDateAsc(String keyword,
 
     @Override
     public List<RoomQueryDto> findRecruitingRoomsWithCategoryOrderByStartDateAsc(String keyword, Category category, LocalDate lastStartDate, Long roomId, int pageSize) {
-        final LocalDate today = LocalDate.now();
         DateExpression<LocalDate> cursorExpr = room.startDate;
 
-        BooleanBuilder where = recruitingActiveWhere(today);
+        BooleanBuilder where = recruitingActiveWhere();
         applyCategory(where, category);
         applyKeyword(where, keyword);
         applyCursorStartDateAsc(where, cursorExpr, lastStartDate, roomId);
@@ -130,9 +129,7 @@ public List<RoomQueryDto> findRecruitingRoomsWithCategoryOrderByStartDateAsc(Str
 
     @Override
     public List<RoomQueryDto> findRecruitingRoomsOrderByMemberCountDesc(String keyword, Integer lastMemberCount, Long roomId, int pageSize) {
-        final LocalDate today = LocalDate.now();
-
-        BooleanBuilder where = recruitingActiveWhere(today);
+        BooleanBuilder where = recruitingActiveWhere();
         applyKeyword(where, keyword);
         applyCursorMemberCountDesc(where, lastMemberCount, roomId);
 
@@ -148,9 +145,7 @@ public List<RoomQueryDto> findRecruitingRoomsOrderByMemberCountDesc(String keywo
 
     @Override
     public List<RoomQueryDto> findRecruitingRoomsWithCategoryOrderByMemberCountDesc(String keyword, Category category, Integer lastMemberCount, Long roomId, int pageSize) {
-        final LocalDate today = LocalDate.now();
-
-        BooleanBuilder where = recruitingActiveWhere(today);
+        BooleanBuilder where = recruitingActiveWhere();
         applyCategory(where, category);
         applyKeyword(where, keyword);
         applyCursorMemberCountDesc(where, lastMemberCount, roomId);
@@ -174,7 +169,7 @@ public List<RoomRecruitingDetailViewResponse.RecommendRoom> findOtherRecruitingR
                 .join(room.bookJpaEntity, book)
                 .where(
                         room.category.eq(category)
-                                .and(room.startDate.after(LocalDate.now()))     // 모집 마감 시각 > 현재 시각
+                                .and(room.roomStatus.eq(RoomStatus.RECRUITING))     // 모집 중인 방
                                 .and(room.roomId.ne(roomId))// 현재 방 제외
                                 .and(room.isPublic.isTrue()) // 공개방 만
                 )
@@ -207,8 +202,9 @@ public List<RoomParticipantQueryDto> findHomeJoinedRoomsByUserPercentage(
         // 활동 기간 중인 방만: startDate ≤ today ≤ endDate
         BooleanBuilder where = new BooleanBuilder();
         where.and(participant.userJpaEntity.userId.eq(userId));
-        where.and(room.startDate.loe(LocalDate.now()));
-        where.and(room.endDate.goe(LocalDate.now()));
+//        where.and(room.startDate.loe(LocalDate.now()));
+//        where.and(room.endDate.goe(LocalDate.now()));
+        where.and(room.roomStatus.eq(RoomStatus.IN_PROGRESS)); // 활동 기간 중인 방만: IN_PROGRESS 상태
 
         // 커서 기반 추가 조건
         if (userPercentageCursor != null && startDateCursor != null && roomIdCursor != null) {
@@ -252,7 +248,8 @@ public List<RoomQueryDto> findRecruitingRoomsUserParticipated(
     ) {
         LocalDate today = LocalDate.now();
         BooleanExpression base = participant.userJpaEntity.userId.eq(userId)
-                .and(room.startDate.after(today));  // 유저가 참여한 방 && 모집중인 방
+//                .and(room.startDate.after(today));  // 유저가 참여한 방 && 모집중인 방
+                .and(room.roomStatus.eq(RoomStatus.RECRUITING));  // 유저가 참여한 방 && 모집중인 방
         DateExpression<LocalDate> cursorExpr = room.startDate;      // 커서 비교는 startDate(= 모집 마감일 - 1일)
         OrderSpecifier<?>[] orders = new OrderSpecifier<?>[]{
                 cursorExpr.asc(), room.roomId.asc()
@@ -268,8 +265,9 @@ public List<RoomQueryDto> findPlayingRoomsUserParticipated(
     ) {
         LocalDate today = LocalDate.now();
         BooleanExpression base = participant.userJpaEntity.userId.eq(userId)
-                .and(room.startDate.loe(today))
-                .and(room.endDate.goe(today));      // 유저가 참여한 방 && 현재 진행중인 방
+//                .and(room.startDate.loe(today))
+//                .and(room.endDate.goe(today));      // 유저가 참여한 방 && 현재 진행중인 방
+                .and(room.roomStatus.eq(RoomStatus.IN_PROGRESS)); // 유저가 참여한 방 && 현재 진행중인 방
         DateExpression<LocalDate> cursorExpr = room.endDate;        // 커서 비교는 endDate(= 진행 마감일)
         OrderSpecifier<?>[] orders = new OrderSpecifier<?>[]{
                 cursorExpr.asc(), room.roomId.asc()
@@ -284,8 +282,10 @@ public List<RoomQueryDto> findPlayingAndRecruitingRoomsUserParticipated(
             Long userId, Integer priorityCursor, LocalDate dateCursor, Long roomIdCursor, int pageSize
     ) {
         LocalDate today = LocalDate.now();
-        BooleanExpression playing   = room.startDate.loe(today).and(room.endDate.goe(today));
-        BooleanExpression recruiting = room.startDate.after(today);
+//        BooleanExpression playing   = room.startDate.loe(today).and(room.endDate.goe(today));
+//        BooleanExpression recruiting = room.startDate.after(today);
+        BooleanExpression playing   = room.roomStatus.eq(RoomStatus.IN_PROGRESS);
+        BooleanExpression recruiting = room.roomStatus.eq(RoomStatus.RECRUITING);
         BooleanExpression base = participant.userJpaEntity.userId.eq(userId)
                 .and(playing.or(recruiting));     // 유저가 참여한 방 && 현재 진행중인 방 + 모집중인 방
 
@@ -309,7 +309,8 @@ public List<RoomQueryDto> findExpiredRoomsUserParticipated(
     ) {
         LocalDate today = LocalDate.now();
         BooleanExpression base = participant.userJpaEntity.userId.eq(userId)
-                .and(room.endDate.before(today));       // 유저가 참여한 방 && 만료된 방
+//                .and(room.endDate.before(today));       // 유저가 참여한 방 && 만료된 방
+                .and(room.roomStatus.eq(RoomStatus.EXPIRED)); // 유저가 참여한 방 && 만료된 방
 
         DateExpression<LocalDate> cursorExpr = room.endDate;
         OrderSpecifier<?>[] orders = new OrderSpecifier<?>[]{
@@ -361,7 +362,8 @@ public List<RoomQueryDto> findRoomsByCategoryOrderByMemberCount(Category categor
     public List<RoomQueryDto> findRoomsByIsbnOrderByStartDateAsc(String isbn, LocalDate dateCursor, Long roomIdCursor, int pageSize) {
         DateExpression<LocalDate> cursorExpr = room.startDate; // 커서 비교는 startDate(= 모집 마감일 - 1일)
         BooleanExpression baseCondition = room.bookJpaEntity.isbn.eq(isbn)
-                .and(room.startDate.after(LocalDate.now()));    // 모집 마감 시각 > 현재 시각
+//                .and(room.startDate.after(LocalDate.now()));    // 모집 마감 시각 > 현재 시각
+                .and(room.roomStatus.eq(RoomStatus.RECRUITING)); // 모집중인 방
 
 
         if (dateCursor != null && roomIdCursor != null) { // 첫 페이지가 아닌 경우
@@ -389,7 +391,8 @@ public List<RoomQueryDto> findRoomsByIsbnOrderByStartDateAsc(String isbn, LocalD
 
     private BooleanExpression findDeadlinePopularRoomCondition(Category category, Long userId) {
         return room.category.eq(category)
-                .and(room.startDate.after(LocalDate.now())) // 모집 마감 시각 > 현재 시각
+//                .and(room.startDate.after(LocalDate.now())) // 모집 마감 시각 > 현재 시각
+                .and(room.roomStatus.eq(RoomStatus.RECRUITING)) // 모집중인 방
                 .and(room.isPublic.isTrue()) // 공개 방만 조회
                 .and(userJoinedRoom(userId).not()); // 유저가 참여하지 않은 방만 조회
     }

src/main/java/konkuk/thip/room/application/port/out/RoomQueryPort.java

@@ -5,15 +5,14 @@
 import konkuk.thip.room.adapter.in.web.response.RoomRecruitingDetailViewResponse;
 import konkuk.thip.room.application.port.out.dto.RoomParticipantQueryDto;
 import konkuk.thip.room.application.port.out.dto.RoomQueryDto;
-import konkuk.thip.room.domain.value.Category;
 import konkuk.thip.room.domain.Room;
+import konkuk.thip.room.domain.value.Category;
 
-import java.time.LocalDate;
 import java.util.List;
 
 public interface RoomQueryPort {
 
-    int countRecruitingRoomsByBookAndStartDateAfter(String isbn, LocalDate currentDate);
+    int countRecruitingRoomsByBookIsbn(String isbn);
 
     /**
      * 방 검색

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

@@ -34,11 +34,11 @@ public class RoomJoinService implements RoomJoinUseCase {
     public RoomJoinResult changeJoinState(RoomJoinCommand roomJoinCommand) {
         RoomJoinType type = roomJoinCommand.type();
 
-        // 방이 존재하지 않거나 만료된 경우
+        // 방이 존재하지 않거나 모집기간이 만료된 경우 예외 처리
         Room room = roomCommandPort.findById(roomJoinCommand.roomId())
                 .orElseThrow(() -> new BusinessException(ErrorCode.USER_CANNOT_JOIN_OR_CANCEL));
 
-        validateRoom(room);
+        room.validateRoomRecruitExpired();
 
         Optional<RoomParticipant> roomParticipantOptional = roomParticipantCommandPort.findByUserIdAndRoomIdOptional(roomJoinCommand.userId(), roomJoinCommand.roomId());
 
@@ -93,11 +93,6 @@ private void handleJoin(RoomJoinCommand roomJoinCommand, Optional<RoomParticipan
         room.increaseMemberCount();
     }
 
-    private void validateRoom(Room room) {
-        room.validateRoomRecruitExpired();
-        room.validateRoomExpired();
-    }
-
     // 방장이 참여 취소를 요청한 경우
     private void validateCancelable(RoomParticipant roomParticipant) {
         if (roomParticipant.isHost()) {

src/main/java/konkuk/thip/room/application/service/validator/RoomValidator.java

@@ -0,0 +1,19 @@
+package konkuk.thip.room.application.service.validator;
+
+import konkuk.thip.common.annotation.application.HelperService;
+import konkuk.thip.room.application.port.out.RoomCommandPort;
+import konkuk.thip.room.domain.Room;
+import lombok.RequiredArgsConstructor;
+
+@HelperService
+@RequiredArgsConstructor
+public class RoomValidator {
+
+    private final RoomCommandPort roomCommandPort;
+
+    public void validateRoomExpired(Long roomId) {
+        Room room = roomCommandPort.getByIdOrThrow(roomId);
+        room.validateRoomExpired();
+    }
+
+}