Skip to content

Commit

Permalink
🐛 Bug: 마이페이지 관련 에러 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
HyoBN committed Jan 25, 2024
1 parent 7207291 commit cdfb864
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 16 deletions.
1 change: 1 addition & 0 deletions src/main/java/cmc/peerna/converter/TestConverter.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public static TestResponseDto.selfTestResultResponseDto toSelfTestResultDto(Self
}

public static List<PeerCard> selfTestResultToPeerCardList(SelfTestResult selfTestResult) {
if(selfTestResult==null) return null;
List<PeerCard> peerCardList = new ArrayList<>();
peerCardList.add(selfTestResult.getGroup1());
peerCardList.add(selfTestResult.getGroup2());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ public interface PeerFeedbackRepository extends JpaRepository<PeerFeedback, Long
List<PeerFeedback> findAllByWriter(Member writer);

void deleteAllByTarget(Member target);

boolean existsByTarget(Member target);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<PeerFeedback> 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);
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/cmc/peerna/utils/TestResultCalculator.java
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public List<PeerCard> getSelfTestCard(List<SelfTest> selfTestList) {


public List<PeerCard> getPeerTestPeerCard(List<PeerTest> peerTestList) {
if(peerTestList.size()==0) return null;
List<PeerCard> peerCardList = new ArrayList<>(4);
if (peerCardList.size() % 18 != 0) {
throw new TestException(ResponseStatus.WRONG_TOTAL_ANSWER_COUNT);
Expand Down Expand Up @@ -176,6 +177,7 @@ public List<PeerCard> getPeerTestPeerCard(List<PeerTest> peerTestList) {
}

public TestType peerTestPeerType(List<PeerTest> peerTestList) {
if(peerTestList.size()==0) return null;
Long DCount = 0L;
Long ICount = 0L;
Long SCount = 0L;
Expand Down
17 changes: 1 addition & 16 deletions src/main/java/cmc/peerna/web/controller/MemberController.java
Original file line number Diff line number Diff line change
Expand Up @@ -171,21 +171,6 @@ public ResponseDto<RootResponseDto.MypageDto> 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<RootResponseDto.TotalEvaluationSeeMoreDto> seeMoreEvaluation(@AuthMember Member member) {
List<TestResponseDto.totalEvaluation> 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, 존재하지 않는 유저를 조회한 경우."),
Expand Down Expand Up @@ -218,7 +203,7 @@ public ResponseDto<MemberRequestDto.profileUpdateDto> 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 값입니다."),
})
Expand Down

0 comments on commit cdfb864

Please sign in to comment.