Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. Weโ€™ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/2 ๐Ÿ› ๋งˆ์ดํŽ˜์ด์ง€ ๊ด€๋ จ ์—๋Ÿฌ ์ˆ˜์ • #69

Merged
merged 1 commit into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading