From 8e23d038ec5575037a3575bad7abdb918ab0c453 Mon Sep 17 00:00:00 2001
From: yeseul106 <20191037@sungshin.ac.kr>
Date: Wed, 19 Jul 2023 23:35:27 +0900
Subject: [PATCH] =?UTF-8?q?#62=20[FEAT]=20=EA=B0=9C=EC=9D=B8=20=EB=B0=8F?=
 =?UTF-8?q?=20=ED=8C=80=20=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20=ED=8D=BC?=
 =?UTF-8?q?=EC=A6=90=ED=8C=90=20=EB=B9=88=20=ED=8D=BC=EC=A6=90=EA=B9=8C?=
 =?UTF-8?q?=EC=A7=80=20=EB=82=B4=EB=A0=A4=EC=A3=BC=EB=8A=94=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/Impl/ProjectServiceImpl.java      | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java
index a897789..d1fe9c4 100644
--- a/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java
+++ b/puzzlingServer/src/main/java/com/puzzling/puzzlingServer/api/project/service/Impl/ProjectServiceImpl.java
@@ -93,16 +93,21 @@ public ProjectOwnPuzzleResponseDto getMyPuzzles(Long memberId, Long projectId, S
         Boolean hasTodayReview = reviewRepository.existsReviewByReviewDate(today);
 
         List<PuzzleObjectDto> result = new ArrayList<>();
-        for (int idx = 1; idx <= reviews.size(); idx++) {
-            Review review = reviews.get(idx - 1);
-            result.add(PuzzleObjectDto.of(review.getReviewDate(), review.getId(), ("puzzlea" + idx)));
-        }
-
-        if (isReviewDay) {
-            if (!hasTodayReview) {
-                result.add(PuzzleObjectDto.of(today, null, "puzzled" + (result.size() + 1)));
+        for (int idx = 1; idx <= pageSize; idx++) {
+            if (idx <= reviews.size()) {
+                Review review = reviews.get(idx - 1);
+                result.add(PuzzleObjectDto.of(review.getReviewDate(), review.getId(), ("puzzlea" + idx)));
+            } else {
+                if (idx == reviews.size() + 1) {
+                    if (isReviewDay && !hasTodayReview) {
+                        result.add(PuzzleObjectDto.of(today, null, "puzzled" + (result.size() + 1)));
+                    }
+                } else {
+                    result.add(PuzzleObjectDto.of(null, null, ("puzzlee" + idx)));
+                }
             }
         }
+
         return ProjectOwnPuzzleResponseDto.of(mapperMyPuzzleObject(memberId, projectId), result,
                 pageReviews.getTotalPages() - 1, isReviewDay, hasTodayReview);
     }
@@ -156,6 +161,8 @@ public ProjectTeamPuzzleResponseDto getTeamPuzzles(Principal principal, Long pro
             int endIndex = teamPuzzleBoard.size();
 
             lastPageValues.addAll(teamPuzzleBoard.subList(startIndex, endIndex));
+        } else {
+            lastPageValues.addAll(teamPuzzleBoard);
         }
 
         if (isReviewDay) {
@@ -163,6 +170,10 @@ public ProjectTeamPuzzleResponseDto getTeamPuzzles(Principal principal, Long pro
                 lastPageValues.add(TeamPuzzleObjectDto.of(null, null, "puzzled" + (lastPageValues.size() + 1)));
             }
         }
+
+        for (int i = lastPageValues.size() + 1; i <= pageSize ; i++) {
+            lastPageValues.add(TeamPuzzleObjectDto.of(null, null, ("puzzlee" + i)));
+        }
         return ProjectTeamPuzzleResponseDto.of(mapperMyPuzzleObject(memberId, projectId), lastPageValues,
                 lastPageNumber, isReviewDay, hasTodayReview);
     }
@@ -216,9 +227,9 @@ public ProjectJoinResponseDto joinProject(Long memberId, ProjectJoinRequestDto p
         if (userProjectRepository.existsByProjectIdAndNickname(projectJoinRequestDto.getProjectId(),projectJoinRequestDto.getMemberProjectNickname())){
             throw new BadRequestException(("이미 프로젝트에 있는 닉네임입니다."));
         }
-        if (userProjectRepository.existsByMemberIdAndProjectId(memberId, projectJoinRequestDto.getProjectId())){
-            throw new BadRequestException(("이미 프로젝트에 참여한 팀원입니다."));
-        }
+//        if (userProjectRepository.existsByMemberIdAndProjectId(memberId, projectJoinRequestDto.getProjectId())){
+//            throw new BadRequestException(("이미 프로젝트에 참여한 팀원입니다."));
+//        }
         Member member = findMemberById(memberId);
         Project project = findProjectById(projectJoinRequestDto.getProjectId());