#71 [FIX] 개인 대시보드에서 hasReview값 로직 수정

Team-Puzzling · Jul 21, 2023 · 35815bd · 35815bd
1 parent 178c61e
commit 35815bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...rc/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java b/...rc/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java
@@ -90,7 +90,7 @@ public ProjectOwnPuzzleResponseDto getMyPuzzles(Long memberId, Long projectId, S
         }
 
         Boolean isReviewDay = checkTodayIsReviewDay(today, findProjectById(projectId).getReviewCycle());
-        Boolean hasTodayReview = reviewRepository.existsReviewByReviewDate(today);
+        Boolean hasTodayReview = reviewRepository.existsReviewByReviewDateAndMemberId(today, memberId);
 
         List<PuzzleObjectDto> result = new ArrayList<>();
         for (int idx = 1; idx <= pageSize; idx++) {
@@ -120,9 +120,10 @@ public ProjectTeamPuzzleResponseDto getTeamPuzzles(Principal principal, Long pro
         if (today.equals("") || today == null) {
             throw new BadRequestException(ErrorStatus.VALIDATION_REQUEST_MISSING_EXCEPTION.getMessage());
         }
+        Long memberId = MemberUtil.getMemberId(principal);
         Project findProject = findProjectById(projectId);
         Boolean isReviewDay = checkTodayIsReviewDay(today, findProjectById(projectId).getReviewCycle());
-        Boolean hasTodayReview = reviewRepository.existsReviewByReviewDate(today);
+        Boolean hasTodayReview = reviewRepository.existsReviewByReviewDateAndMemberId(today, memberId);
         List<Review> reviews = reviewRepository.findAllByProjectIdOrderByReviewDateAsc(projectId);
 
         // 날짜별 리뷰 개수를 카운트하기 위한 Map 생성

diff --git a/...ver/src/main/java/com/puzzling/puzzlingServer/api/review/repository/ReviewRepository.java b/...ver/src/main/java/com/puzzling/puzzlingServer/api/review/repository/ReviewRepository.java
@@ -18,7 +18,7 @@ public interface ReviewRepository extends JpaRepository<Review, Long> {
     @Query("SELECT r FROM Review r WHERE r.memberId = :memberId AND r.projectId = :projectId ORDER BY r.createdAt")
     Page<Review> findByMemberIdAndProjectIdOrderByCreatedAt(@Param("memberId") Long memberId, @Param("projectId") Long projectId, Pageable pageable);
 
-    boolean existsReviewByReviewDate(String date);
+    boolean existsReviewByReviewDateAndMemberId(String date, Long memberId);
 
     List<Review> findAllByProjectIdOrderByReviewDateAsc(Long projectId);