[FIX]액션 플랜 조회 시 리뷰가 달린 액션플랜인지 포함하여 반환

Team-Growthook · Jan 15, 2024 · 747a33f · 747a33f
1 parent 860ac65
commit 747a33f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/...ava/com/example/growthookserver/api/actionplan/dto/response/ActionPlanGetResponseDto.java b/...ava/com/example/growthookserver/api/actionplan/dto/response/ActionPlanGetResponseDto.java
@@ -17,4 +17,6 @@ public class ActionPlanGetResponseDto {
     private Boolean isScraped;
 
     private Boolean isFinished;
+
+    private Boolean isReviewed;
 }
diff --git a/...om/example/growthookserver/api/actionplan/dto/response/DoingActionPlanGetResponseDto.java b/...om/example/growthookserver/api/actionplan/dto/response/DoingActionPlanGetResponseDto.java
@@ -16,4 +16,6 @@ public class DoingActionPlanGetResponseDto {
     private Boolean isScraped;
 
     private Long seedId;
+
+    private Boolean isReviewed;
 }
diff --git a/...example/growthookserver/api/actionplan/dto/response/FinishedActionPlanGetResponseDto.java b/...example/growthookserver/api/actionplan/dto/response/FinishedActionPlanGetResponseDto.java
@@ -16,4 +16,6 @@ public class FinishedActionPlanGetResponseDto {
     private Boolean isScraped;
 
     private Long seedId;
+
+    private Boolean isReviewed;
 }
diff --git a/...n/java/com/example/growthookserver/api/actionplan/service/Impl/ActionPlanServiceImpl.java b/...n/java/com/example/growthookserver/api/actionplan/service/Impl/ActionPlanServiceImpl.java
@@ -9,6 +9,7 @@
 import com.example.growthookserver.api.actionplan.repository.ActionPlanRepository;
 import com.example.growthookserver.api.actionplan.service.ActionPlanService;
 import com.example.growthookserver.api.member.domain.Member;
+import com.example.growthookserver.api.review.repository.ReviewRepository;
 import com.example.growthookserver.api.seed.domain.Seed;
 import com.example.growthookserver.api.seed.repository.SeedRepository;
 import com.example.growthookserver.common.exception.BadRequestException;
@@ -29,6 +30,7 @@ public class ActionPlanServiceImpl implements ActionPlanService {
 
     private final ActionPlanRepository actionPlanRepository;
     private final SeedRepository seedRepository;
+    private final ReviewRepository reviewRepository;
 
     @Override
     @Transactional
@@ -47,7 +49,7 @@ public List<ActionPlanGetResponseDto> getActionPlan(Long seedId) {
         List<ActionPlan> actionPlans = actionPlanRepository.findAllBySeedId(seedId);
 
         return actionPlans.stream()
-                .map(actionPlan -> ActionPlanGetResponseDto.of(actionPlan.getId(), actionPlan.getContent(), actionPlan.getIsScraped(), actionPlan.getIsFinished()))
+                .map(actionPlan -> ActionPlanGetResponseDto.of(actionPlan.getId(), actionPlan.getContent(), actionPlan.getIsScraped(), actionPlan.getIsFinished(),reviewRepository.existsByActionPlan(actionPlan)))
                 .collect(Collectors.toList());
     }
 
@@ -98,7 +100,7 @@ public List<DoingActionPlanGetResponseDto> getDoingActionPlan(Long memberId) {
         List<ActionPlan> doingActionPlans = actionPlanRepository.findAllBySeedCaveMemberIdAndIsFinished(memberId,false);
 
         return doingActionPlans.stream()
-                .map(actionPlan -> DoingActionPlanGetResponseDto.of(actionPlan.getId(), actionPlan.getContent(), actionPlan.getIsScraped(),actionPlan.getSeed().getId()))
+                .map(actionPlan -> DoingActionPlanGetResponseDto.of(actionPlan.getId(), actionPlan.getContent(), actionPlan.getIsScraped(),actionPlan.getSeed().getId(),reviewRepository.existsByActionPlan(actionPlan)))
                 .collect(Collectors.toList());
     }
 
@@ -107,7 +109,7 @@ public List<FinishedActionPlanGetResponseDto> getFinishedActionPlan(Long memberI
         List<ActionPlan> finishedActionPlans = actionPlanRepository.findAllBySeedCaveMemberIdAndIsFinished(memberId,true);
 
         return finishedActionPlans.stream()
-                .map(actionPlan -> FinishedActionPlanGetResponseDto.of(actionPlan.getId(), actionPlan.getContent(), actionPlan.getIsScraped(),actionPlan.getSeed().getId()))
+                .map(actionPlan -> FinishedActionPlanGetResponseDto.of(actionPlan.getId(), actionPlan.getContent(), actionPlan.getIsScraped(),actionPlan.getSeed().getId(),reviewRepository.existsByActionPlan(actionPlan)))
                 .collect(Collectors.toList());
     }
 }
diff --git a/...ver/src/main/java/com/example/growthookserver/api/review/repository/ReviewRepository.java b/...ver/src/main/java/com/example/growthookserver/api/review/repository/ReviewRepository.java
@@ -1,5 +1,6 @@
 package com.example.growthookserver.api.review.repository;
 
+import com.example.growthookserver.api.actionplan.domain.ActionPlan;
 import com.example.growthookserver.api.cave.domain.Cave;
 import com.example.growthookserver.api.review.domain.Review;
 import com.example.growthookserver.common.exception.NotFoundException;
@@ -15,5 +16,6 @@ default Review findReviewByActionPlanIdOrThrow(Long actionPlanId) {
     return findReviewByActionPlanId(actionPlanId)
         .orElseThrow(() -> new NotFoundException(ErrorStatus.NOT_FOUND_REVIEW.getMessage()));
   }
+  boolean existsByActionPlan(ActionPlan actionPlan);
 
 }