Skip to content

Commit

Permalink
Merge pull request #61 from Central-MakeUs/fix/2
Browse files Browse the repository at this point in the history
Fix/2 ๐Ÿ”จ โœจ ํ”ผ์–ดํ…Œ์ŠคํŠธ ๊ด€๋ จ api ํ˜•์‹ ์ˆ˜์ •, uuid๋กœ ์œ ์ € ์ด๋ฆ„ ์กฐํšŒ API ๊ตฌํ˜„
  • Loading branch information
HyoBN authored Jan 23, 2024
2 parents facab2c + 3b47002 commit 0e74b7c
Show file tree
Hide file tree
Showing 8 changed files with 43 additions and 8 deletions.
2 changes: 2 additions & 0 deletions src/main/java/cmc/peerna/apiResponse/code/ResponseStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ public enum ResponseStatus implements BaseCode {
// member ์—๋Ÿฌ
MEMBER_NOT_FOUND(OK, 2200, "์กด์žฌํ•˜์ง€ ์•Š๋Š” ์œ ์ €์ž…๋‹ˆ๋‹ค."),

// test ์—๋Ÿฌ
UUID_NOT_FOUND(OK, 2250, "์ž˜๋ชป๋œ UUID ๊ฐ’์ž…๋‹ˆ๋‹ค."),

// 400๋ฒˆ๋Œ€ ์—๋Ÿฌ

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
import org.springframework.data.jpa.repository.JpaRepository;

import java.util.List;
import java.util.Optional;
import java.util.UUID;

public interface PeerFeedbackRepository extends JpaRepository<PeerFeedback, Long> {

PeerFeedback findByNonMemberUuid(String nonMemberUuid);
Optional<PeerFeedback> findByNonMemberUuid(String nonMemberUuid);

List<PeerFeedback> findTop3ByTargetOrderByCreatedAtDesc(Member target);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public void updateTotalScore(Member member) {

@Override
public Member findMemberByUuid(String uuid) {
Member member = memberRepository.findByUuid(uuid).orElseThrow(() -> new MemberException(ResponseStatus.MEMBER_NOT_FOUND));
Member member = memberRepository.findByUuid(uuid).orElseThrow(() -> new MemberException(ResponseStatus.UUID_NOT_FOUND));
return member;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

@Service
Expand Down Expand Up @@ -163,7 +164,8 @@ public void savePeerGradeResult(Member writer, Member target, PeerGrade peerGrad
@Transactional
public void updatePeerTestMemberId(Member member, String uuid) {

PeerFeedback peerFeedback = peerFeedbackRepository.findByNonMemberUuid(uuid);
PeerFeedback peerFeedback = peerFeedbackRepository.findByNonMemberUuid(uuid).orElseThrow(() -> new TestException(ResponseStatus.UUID_NOT_FOUND));

peerFeedback.updateWriter(member);

PeerGradeResult peerGradeResult = peerGradeResultRepository.findByNonMemberUuid(uuid);
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/cmc/peerna/web/controller/MemberController.java
Original file line number Diff line number Diff line change
Expand Up @@ -182,5 +182,18 @@ else if (page < 1)
public ResponseDto<MemberRequestDto.profileUpdateDto> updateMemberProfile(@AuthMember Member member, @RequestBody MemberRequestDto.profileUpdateDto request) {
return ResponseDto.of(memberService.updateMemberProfile(member, request));
}

@Operation(summary = "UUID๋กœ ์œ ์ € ์ด๋ฆ„ ์กฐํšŒ API โœ”๏ธ๐Ÿ”‘", description = "UUID๋กœ ์œ ์ € ์ด๋ฆ„ ์กฐํšŒ API์ž…๋‹ˆ๋‹ค.")
@ApiResponses({
@ApiResponse(responseCode = "2250", description = "BAD_REQUEST, ์ž˜๋ชป๋œ UUID ๊ฐ’์ž…๋‹ˆ๋‹ค."),
})
@Parameters({
@Parameter(name = "member", hidden = true)
})
@GetMapping("member/name")
public ResponseDto<MemberResponseDto.memberNameResponseDto> getUserNameByUuid(@RequestParam(name = "uuid") String uuid) {
Member memberByUuid = memberService.findMemberByUuid(uuid);
return ResponseDto.of(MemberResponseDto.memberNameResponseDto.builder().name(memberByUuid.getName()).build());
}
}

11 changes: 6 additions & 5 deletions src/main/java/cmc/peerna/web/controller/TestController.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ public ResponseDto<TestResponseDto.selfTestResultResponseDto> getSelfTestResult(

@Operation(summary = "๋น„ํšŒ์› ํ”ผ์–ด ํ…Œ์ŠคํŠธ ์ž‘์„ฑ API โœ”๏ธ", description = "๋น„ํšŒ์› ํ”ผ์–ด ํ…Œ์ŠคํŠธ ์ž‘์„ฑ API์ž…๋‹ˆ๋‹ค.")
@ApiResponses({
@ApiResponse(responseCode = "2200", description = "BAD_REQUEST, ์กด์žฌํ•˜์ง€ ์•Š๋Š” ์œ ์ €์ž…๋‹ˆ๋‹ค."),
@ApiResponse(responseCode = "2250", description = "BAD_REQUEST, ์ž˜๋ชป๋œ UUID ๊ฐ’์ž…๋‹ˆ๋‹ค."),
@ApiResponse(responseCode = "4200", description = "BAD_REQUEST, ์ž˜๋ชป๋œ ๋‹ต๋ณ€ ID ๊ฐ’์„ ์ „๋‹ฌํ–ˆ์Šต๋‹ˆ๋‹ค."),
@ApiResponse(responseCode = "4201", description = "BAD_REQUEST, ๋‹ต๋ณ€ ๊ฐœ์ˆ˜๊ฐ€ ์ •ํ™•ํ•˜๊ฒŒ 18๊ฐœ๊ฐ€ ์•„๋‹™๋‹ˆ๋‹ค.")
})
@PostMapping("/review/peer-test/{target-uuid}")
@PostMapping("/review/peer-test")
public ResponseDto<TestResponseDto.peerTestIdResponseDto> savePeerTest(@RequestParam(name = "target-uuid") String targetUuid, @RequestBody TestRequestDto.peerTestRequestDto requestDto) {
Member target = memberService.findMemberByUuid(targetUuid);
testService.savePeerTest(null, target, requestDto);
Expand All @@ -103,11 +103,12 @@ public ResponseDto<TestResponseDto.peerTestIdResponseDto> savePeerTest(@RequestP

@Operation(summary = "๋น„ํšŒ์› ์œ ์ € ํšŒ์›๊ฐ€์ž… ํ›„ id๊ฐ’ ๊ฐฑ์‹ ์šฉ API โœ”๏ธ๐Ÿ”‘", description = "๋น„ํšŒ์› ์œ ์ € ํšŒ์›๊ฐ€์ž… ํ›„ id๊ฐ’ ๊ฐฑ์‹ ์šฉ API์ž…๋‹ˆ๋‹ค.")
@ApiResponses({
@ApiResponse(responseCode = "2200", description = "BAD_REQUEST, ์กด์žฌํ•˜์ง€ ์•Š๋Š” ์œ ์ €์ž…๋‹ˆ๋‹ค.")
@ApiResponse(responseCode = "2200", description = "BAD_REQUEST, ์กด์žฌํ•˜์ง€ ์•Š๋Š” ์œ ์ €์ž…๋‹ˆ๋‹ค."),
@ApiResponse(responseCode = "2250", description = "BAD_REQUEST, ํ•ด๋‹น UUID๋กœ ์ž‘์„ฑ๋œ ์ •๋ณด๊ฐ€ ์กด์žฌํ•˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ์ž˜๋ชป๋œ UUID ๊ฐ’ ์ž…๋‹ˆ๋‹ค."),
})
@PostMapping("/review/update-member-id")
public ResponseDto<MemberResponseDto.MemberStatusDto> updateMemberId(@AuthMember Member member, @RequestBody String uuid) {
testService.updatePeerTestMemberId(member, uuid);
public ResponseDto<MemberResponseDto.MemberStatusDto> updateMemberId(@AuthMember Member member, @RequestBody MemberRequestDto.uuidRequestDto uuid) {
testService.updatePeerTestMemberId(member, uuid.getUuid());
return ResponseDto.of(MemberConverter.toMemberStatusDto(member.getId(), "UpdatePeerTestWriterId"));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,12 @@ public static class profileUpdateDto{
private Part part;
private String oneLiner;
}

@Builder
@Getter
@AllArgsConstructor(access = AccessLevel.PROTECTED)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public static class uuidRequestDto{
private String uuid;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,12 @@ public static class memberBasicInfoDto{
private String uuid;
}

@Builder
@Getter
@AllArgsConstructor(access = AccessLevel.PROTECTED)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public static class memberNameResponseDto{
private String name;
}

}

0 comments on commit 0e74b7c

Please sign in to comment.