fix: BearEats에 대한 리뷰 작성 가능 조건 추가 및 리뷰 작성 서비스 구조 변경

kjungw1025 · Jan 5, 2024 · 88c6642 · 88c6642
1 parent f26c999
commit 88c6642
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 13 deletions.
diff --git a/...va/com/dku/council/domain/with_dankook/repository/with_dankook/WithDankookRepository.java b/...va/com/dku/council/domain/with_dankook/repository/with_dankook/WithDankookRepository.java
@@ -61,5 +61,10 @@ public interface WithDankookRepository<T extends WithDankook> extends JpaReposit
     @Query(value = "select COUNT(*) from with_dankook w " +
             "where w.with_dankook_id = :withDankookId and " +
             "((w.with_dankook_status in ('FULL', 'CLOSED')) or (w.with_dankook_status = 'ACTIVE' and w.end_time <= CURRENT_TIMESTAMP())) ", nativeQuery = true)
-    int findWithClosedOrFullOrActiveByIdToCreateReview(@Param("withDankookId") Long withDankookId);
+    int findWithClosedOrFullOrActiveEndTimeByIdToCreateReview(@Param("withDankookId") Long withDankookId);
+
+    @Query(value = "select COUNT(*) from with_dankook w " +
+            "where w.with_dankook_id = :withDankookId and " +
+            "((w.with_dankook_status in ('FULL', 'CLOSED')) or (w.with_dankook_status = 'ACTIVE' and w.delivery_time <= CURRENT_TIMESTAMP())) ", nativeQuery = true)
+    int findWithClosedOrFullOrActiveDeliveryTimeByIdToCreateReview(@Param("withDankookId") Long withDankookId);
 }
diff --git a/src/main/java/com/dku/council/domain/with_dankook/service/WithDankookService.java b/src/main/java/com/dku/council/domain/with_dankook/service/WithDankookService.java
@@ -213,18 +213,28 @@ public interface PostResultMapper<T, D, E extends WithDankook> {
     public void isPossibleCreateReview(Long withDankookId) {
         String withDankookType = withDankookRepository.findWithDankookType(withDankookId);
 
-        if (withDankookType.equals("Trade")) {
-            if (withDankookRepository.findWithClosedByIdToCreateReview(withDankookId) != 1) {
-                throw new InvalidStatusException();
-            }
-//        } else if (withDankookType.equals("Study") || withDankookType.equals("Dormitory")) {
-//            if (withDankookRepository.findWithClosedOrFullOrActiveByIdToCreateReview(withDankookId) != 1) {
-//                throw new InvalidStatusException();
-//            }
-        } else if (withDankookType.equals("BearEats") || withDankookType.equals("EatingAlong")) {
-            if (withDankookRepository.findWithClosedOrFullByIdToCreateReview(withDankookId) != 1) {
-                throw new InvalidStatusException();
-            }
+        switch (withDankookType) {
+            case "Trade":
+            case "Roommate":
+                if (withDankookRepository.findWithClosedByIdToCreateReview(withDankookId) != 1) {
+                    throw new InvalidStatusException();
+                }
+                break;
+            case "Study":
+                if (withDankookRepository.findWithClosedOrFullOrActiveEndTimeByIdToCreateReview(withDankookId) != 1) {
+                    throw new InvalidStatusException();
+                }
+                break;
+            case "EatingAlong":
+                if (withDankookRepository.findWithClosedOrFullByIdToCreateReview(withDankookId) != 1) {
+                    throw new InvalidStatusException();
+                }
+                break;
+            case "BearEats":
+                if (withDankookRepository.findWithClosedOrFullOrActiveDeliveryTimeByIdToCreateReview(withDankookId) != 1) {
+                    throw new InvalidStatusException();
+                }
+                break;
         }
     }
 }