[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.validateRoomInProgress(roomPost.getRoomId());
     }
 
 }

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

@@ -101,6 +101,7 @@ public enum ErrorCode implements ResponseCode {
     ROOM_MEMBER_COUNT_UNDERFLOW(HttpStatus.BAD_REQUEST, 100007, "방의 인원 수가 1 이하(방장 포함)입니다."),
     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, "진행 중인 방이 아닙니다."),
 
     /**
      * 110000 : vote error

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

@@ -136,7 +136,8 @@ public enum SwaggerResponseDescription {
             BOOK_NOT_FOUND,
             ROOM_IS_EXPIRED,
             RECORD_CANNOT_BE_OVERVIEW,
-            INVALID_RECORD_PAGE_RANGE
+            INVALID_RECORD_PAGE_RANGE,
+            ROOM_NOT_IN_PROGRESS
     ))),
     RECORD_SEARCH(new LinkedHashSet<>(Set.of(
             USER_NOT_FOUND,
@@ -147,7 +148,9 @@ public enum SwaggerResponseDescription {
     RECORD_DELETE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
             RECORD_NOT_FOUND,
-            RECORD_ACCESS_FORBIDDEN
+            RECORD_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED,
+            ROOM_NOT_IN_PROGRESS
     ))),
     RECORD_PIN(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
@@ -158,7 +161,9 @@ public enum SwaggerResponseDescription {
     RECORD_UPDATE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
             RECORD_NOT_FOUND,
-            RECORD_ACCESS_FORBIDDEN
+            RECORD_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED,
+            ROOM_NOT_IN_PROGRESS
     ))),
 
     // Vote
@@ -168,24 +173,31 @@ public enum SwaggerResponseDescription {
             BOOK_NOT_FOUND,
             ROOM_IS_EXPIRED,
             VOTE_CANNOT_BE_OVERVIEW,
-            INVALID_VOTE_PAGE_RANGE
+            INVALID_VOTE_PAGE_RANGE,
+            ROOM_NOT_IN_PROGRESS
     ))),
     VOTE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
             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,
+            ROOM_NOT_IN_PROGRESS
     ))),
     VOTE_DELETE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
             VOTE_NOT_FOUND,
-            VOTE_ACCESS_FORBIDDEN
+            VOTE_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED,
+            ROOM_NOT_IN_PROGRESS
     ))),
     VOTE_UPDATE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
             VOTE_NOT_FOUND,
-            VOTE_ACCESS_FORBIDDEN
+            VOTE_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED,
+            ROOM_NOT_IN_PROGRESS
     ))),
 
 
@@ -251,8 +263,9 @@ public enum SwaggerResponseDescription {
             VOTE_NOT_FOUND,
             INVALID_COMMENT_CREATE,
             FEED_ACCESS_FORBIDDEN,
-            ROOM_ACCESS_FORBIDDEN
-
+            ROOM_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED,
+            ROOM_NOT_IN_PROGRESS
     ))),
     CHANGE_COMMENT_LIKE_STATE(new LinkedHashSet<>(Set.of(
             USER_NOT_FOUND,
@@ -264,7 +277,9 @@ public enum SwaggerResponseDescription {
             COMMENT_NOT_LIKED_CANNOT_CANCEL,
             COMMENT_LIKE_COUNT_UNDERFLOW,
             FEED_ACCESS_FORBIDDEN,
-            ROOM_ACCESS_FORBIDDEN
+            ROOM_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED,
+            ROOM_NOT_IN_PROGRESS
     ))),
     COMMENT_DELETE(new LinkedHashSet<>(Set.of(
             USER_NOT_FOUND,
@@ -275,7 +290,9 @@ public enum SwaggerResponseDescription {
             COMMENT_DELETE_FORBIDDEN,
             COMMENT_COUNT_UNDERFLOW,
             FEED_ACCESS_FORBIDDEN,
-            ROOM_ACCESS_FORBIDDEN
+            ROOM_ACCESS_FORBIDDEN,
+            ROOM_IS_EXPIRED,
+            ROOM_NOT_IN_PROGRESS
     ))),
 
     // Book
@@ -321,7 +338,9 @@ 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,
+            ROOM_NOT_IN_PROGRESS
     ))),
 
     ATTENDANCE_CHECK_SHOW(new LinkedHashSet<>(Set.of(
@@ -331,7 +350,9 @@ public enum SwaggerResponseDescription {
     ATTENDANCE_CHECK_DELETE(new LinkedHashSet<>(Set.of(
             ROOM_ACCESS_FORBIDDEN,
             ATTENDANCE_CHECK_NOT_FOUND,
-            ATTENDANCE_CHECK_CAN_NOT_DELETE
+            ATTENDANCE_CHECK_CAN_NOT_DELETE,
+            ROOM_IS_EXPIRED,
+            ROOM_NOT_IN_PROGRESS
     ))),
 
     // Notiification

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("""