From cdfb86438050a1552e34978738fadef1644b9508 Mon Sep 17 00:00:00 2001 From: HyoBN Date: Thu, 25 Jan 2024 17:47:21 +0900 Subject: [PATCH] =?UTF-8?q?:bug:=20Bug:=20=EB=A7=88=EC=9D=B4=ED=8E=98?= =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EA=B4=80=EB=A0=A8=20=EC=97=90=EB=9F=AC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cmc/peerna/converter/TestConverter.java | 1 + .../repository/PeerFeedbackRepository.java | 2 ++ .../service/serviceImpl/RootServiceImpl.java | 1 + .../cmc/peerna/utils/TestResultCalculator.java | 2 ++ .../peerna/web/controller/MemberController.java | 17 +---------------- 5 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/main/java/cmc/peerna/converter/TestConverter.java b/src/main/java/cmc/peerna/converter/TestConverter.java index c132176..cfaaaa0 100644 --- a/src/main/java/cmc/peerna/converter/TestConverter.java +++ b/src/main/java/cmc/peerna/converter/TestConverter.java @@ -25,6 +25,7 @@ public static TestResponseDto.selfTestResultResponseDto toSelfTestResultDto(Self } public static List selfTestResultToPeerCardList(SelfTestResult selfTestResult) { + if(selfTestResult==null) return null; List peerCardList = new ArrayList<>(); peerCardList.add(selfTestResult.getGroup1()); peerCardList.add(selfTestResult.getGroup2()); diff --git a/src/main/java/cmc/peerna/repository/PeerFeedbackRepository.java b/src/main/java/cmc/peerna/repository/PeerFeedbackRepository.java index 98b6342..eb5fee3 100644 --- a/src/main/java/cmc/peerna/repository/PeerFeedbackRepository.java +++ b/src/main/java/cmc/peerna/repository/PeerFeedbackRepository.java @@ -21,4 +21,6 @@ public interface PeerFeedbackRepository extends JpaRepository findAllByWriter(Member writer); void deleteAllByTarget(Member target); + + boolean existsByTarget(Member target); } diff --git a/src/main/java/cmc/peerna/service/serviceImpl/RootServiceImpl.java b/src/main/java/cmc/peerna/service/serviceImpl/RootServiceImpl.java index e8d5cb6..d7397cb 100644 --- a/src/main/java/cmc/peerna/service/serviceImpl/RootServiceImpl.java +++ b/src/main/java/cmc/peerna/service/serviceImpl/RootServiceImpl.java @@ -123,6 +123,7 @@ public RootResponseDto.MypageDto getMyPageDto(Member member) { @Override public RootResponseDto.AllFeedbackDto getFeedbackList(Member member, Integer page) { + if(!peerFeedbackRepository.existsByTarget(member)) return null; Page peerFeedbacks = peerFeedbackRepository.findAllByTarget(member, PageRequest.of(page, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"))); if(peerFeedbacks.getTotalPages() <= page) throw new MemberException(ResponseStatus.OVER_PAGE_INDEX_ERROR); diff --git a/src/main/java/cmc/peerna/utils/TestResultCalculator.java b/src/main/java/cmc/peerna/utils/TestResultCalculator.java index c9d3ccd..40ab5d6 100644 --- a/src/main/java/cmc/peerna/utils/TestResultCalculator.java +++ b/src/main/java/cmc/peerna/utils/TestResultCalculator.java @@ -112,6 +112,7 @@ public List getSelfTestCard(List selfTestList) { public List getPeerTestPeerCard(List peerTestList) { + if(peerTestList.size()==0) return null; List peerCardList = new ArrayList<>(4); if (peerCardList.size() % 18 != 0) { throw new TestException(ResponseStatus.WRONG_TOTAL_ANSWER_COUNT); @@ -176,6 +177,7 @@ public List getPeerTestPeerCard(List peerTestList) { } public TestType peerTestPeerType(List peerTestList) { + if(peerTestList.size()==0) return null; Long DCount = 0L; Long ICount = 0L; Long SCount = 0L; diff --git a/src/main/java/cmc/peerna/web/controller/MemberController.java b/src/main/java/cmc/peerna/web/controller/MemberController.java index f7f1bba..2ddfd85 100644 --- a/src/main/java/cmc/peerna/web/controller/MemberController.java +++ b/src/main/java/cmc/peerna/web/controller/MemberController.java @@ -171,21 +171,6 @@ public ResponseDto getMyPage(@AuthMember Member membe return ResponseDto.of(myPageDto); } - @Operation(summary = "종합 평가 더보기 API ✔️🔑", description = "종합 평가 더보기 API입니다.") - @ApiResponses({ - @ApiResponse(responseCode = "2200", description = "BAD_REQUEST, 존재하지 않는 유저를 조회한 경우.") - }) - @Parameters({ - @Parameter(name = "member", hidden = true) - }) - @GetMapping("/member/mypage/total-evaluation") - public ResponseDto seeMoreEvaluation(@AuthMember Member member) { - List totalEvaluationList = rootService.getTotalEvaluationList(member); - return ResponseDto.of(RootResponseDto.TotalEvaluationSeeMoreDto.builder() - .totalEvaluationList(totalEvaluationList) - .build()); - } - @Operation(summary = "피드백 더보기 API ✔️🔑", description = "피드백 더보기 API입니다.") @ApiResponses({ @ApiResponse(responseCode = "2200", description = "BAD_REQUEST, 존재하지 않는 유저를 조회한 경우."), @@ -218,7 +203,7 @@ public ResponseDto updateMemberProfile(@AuthM return ResponseDto.of(memberService.updateMemberProfile(member, request)); } - @Operation(summary = "UUID로 유저 이름 조회 API ✔️🔑", description = "UUID로 유저 이름 조회 API입니다.") + @Operation(summary = "UUID로 유저 이름 조회 API ✔️", description = "UUID로 유저 이름 조회 API입니다.") @ApiResponses({ @ApiResponse(responseCode = "2250", description = "BAD_REQUEST, 잘못된 UUID 값입니다."), })