Merge pull request #74 from Team-Puzzling/fix/#73-my-and-team-dashboa…

…rd-nickname #73 [FIX] 개인 대시보드에서 나오는 닉네임은 프로젝트 내 닉네임으로 수정
Team-Puzzling · Jul 21, 2023 · 6a29ea3 · 6a29ea3
2 parents afa7d44 + 8fb7880
commit 6a29ea3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 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.existsReviewByReviewDateAndMemberId(today, memberId);
+        Boolean hasTodayReview = reviewRepository.existsReviewByReviewDateAndMemberIdAndProjectId(today, memberId, projectId);
 
         List<PuzzleObjectDto> result = new ArrayList<>();
         for (int idx = 1; idx <= pageSize; idx++) {
@@ -123,7 +123,7 @@ public ProjectTeamPuzzleResponseDto getTeamPuzzles(Principal principal, Long pro
         Long memberId = MemberUtil.getMemberId(principal);
         Project findProject = findProjectById(projectId);
         Boolean isReviewDay = checkTodayIsReviewDay(today, findProjectById(projectId).getReviewCycle());
-        Boolean hasTodayReview = reviewRepository.existsReviewByReviewDateAndMemberId(today, memberId);
+        Boolean hasTodayReview = reviewRepository.existsReviewByReviewDateAndMemberIdAndProjectId(today, memberId, projectId);
         List<Review> reviews = reviewRepository.findAllByProjectIdOrderByReviewDateAsc(projectId);
 
         // 날짜별 리뷰 개수를 카운트하기 위한 Map 생성
@@ -284,10 +284,15 @@ private Project findProjectById(Long projectId) {
                 .orElseThrow(() -> new NotFoundException(ErrorStatus.NOT_FOUND_PROJECT.getMessage()));
     }
 
+    private UserProject findUserProjectByMemberIdAndProjectId (Long memberId, Long projectId) {
+        return userProjectRepository.findByMemberIdAndProjectId(memberId,projectId)
+                .orElseThrow(() -> new NotFoundException("해당하는 멤버가 참여하는 프로젝트가 아닙니다."));
+    }
+
     private ProjectMyPuzzleObjectDto mapperMyPuzzleObject(Long memberId, Long projectId) {
-        Member findMember = findMemberById(memberId);
+        UserProject findUserProject = findUserProjectByMemberIdAndProjectId(memberId, projectId);
         int puzzleCount = reviewRepository.findByMemberIdAndProjectId(memberId, projectId).size();
-        return ProjectMyPuzzleObjectDto.of(findMember.getName(), puzzleCount % 15);
+        return ProjectMyPuzzleObjectDto.of(findUserProject.getNickname(), puzzleCount % 15);
     }
 
     // 10자리의 UUID 생성

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 existsReviewByReviewDateAndMemberId(String date, Long memberId);
+    boolean existsReviewByReviewDateAndMemberIdAndProjectId(String date, Long memberId, Long projectId);
 
     List<Review> findAllByProjectIdOrderByReviewDateAsc(Long projectId);