diff --git a/src/main/java/com/anywayclear/controller/DealController.java b/src/main/java/com/anywayclear/controller/DealController.java index 99245f7..dc4dfa9 100644 --- a/src/main/java/com/anywayclear/controller/DealController.java +++ b/src/main/java/com/anywayclear/controller/DealController.java @@ -25,7 +25,7 @@ public ResponseEntity createDeal(@Valid @RequestBody DealCreateRequest req } @GetMapping - public ResponseEntity getDealList(@RequestParam(name = "nickname") String nickname) { - return ResponseEntity.ok(dealService.getDealList(nickname)); + public ResponseEntity getDealList(@RequestParam(name = "userId") String userId) { + return ResponseEntity.ok(dealService.getDealList(userId)); } } diff --git a/src/main/java/com/anywayclear/controller/DibController.java b/src/main/java/com/anywayclear/controller/DibController.java index 669db03..df979ad 100644 --- a/src/main/java/com/anywayclear/controller/DibController.java +++ b/src/main/java/com/anywayclear/controller/DibController.java @@ -15,8 +15,8 @@ public DibController(DibService dibService) { } @GetMapping - public ResponseEntity getDibList(@RequestParam(name = "nickname") String nickname) { - return ResponseEntity.ok(dibService.getDibList(nickname)); + public ResponseEntity getDibList(@RequestParam(name = "userId") String userId) { + return ResponseEntity.ok(dibService.getDibList(userId)); } } diff --git a/src/main/java/com/anywayclear/controller/MemberController.java b/src/main/java/com/anywayclear/controller/MemberController.java index b0ace0a..130d703 100644 --- a/src/main/java/com/anywayclear/controller/MemberController.java +++ b/src/main/java/com/anywayclear/controller/MemberController.java @@ -27,7 +27,7 @@ public ResponseEntity getMember(@Valid @RequestBody MemberCreateRequest re } @GetMapping - public ResponseEntity getMemberDetail(@RequestParam(name = "nickname") String nickname) { - return ResponseEntity.ok(memberService.getMemberByNickname(nickname)); + public ResponseEntity getMemberDetail(@RequestParam(name = "userId") String userId) { + return ResponseEntity.ok(memberService.getMemberByUserId(userId)); } } diff --git a/src/main/java/com/anywayclear/controller/PointController.java b/src/main/java/com/anywayclear/controller/PointController.java index 4ae2802..1e3b2dc 100644 --- a/src/main/java/com/anywayclear/controller/PointController.java +++ b/src/main/java/com/anywayclear/controller/PointController.java @@ -19,7 +19,7 @@ public PointController(PointService pointService) { } @GetMapping - public ResponseEntity getPoint(@RequestParam(name = "nickname") String nickname) { - return ResponseEntity.ok(pointService.getPoint(nickname)); + public ResponseEntity getPoint(@RequestParam(name = "userId") String userId) { + return ResponseEntity.ok(pointService.getPoint(userId)); } } diff --git a/src/main/java/com/anywayclear/controller/SubscribeController.java b/src/main/java/com/anywayclear/controller/SubscribeController.java index 358d2f5..5590a24 100644 --- a/src/main/java/com/anywayclear/controller/SubscribeController.java +++ b/src/main/java/com/anywayclear/controller/SubscribeController.java @@ -18,7 +18,7 @@ public SubscribeController(SubscribeService subscribeService) { } @GetMapping - public ResponseEntity getSubscribeList(@RequestParam(name = "nickname") String nickname) { - return ResponseEntity.ok(subscribeService.getSubscribeList(nickname)); + public ResponseEntity getSubscribeList(@RequestParam(name = "userId") String userId) { + return ResponseEntity.ok(subscribeService.getSubscribeList(userId)); } } diff --git a/src/main/java/com/anywayclear/repository/MemberRepository.java b/src/main/java/com/anywayclear/repository/MemberRepository.java index f3c66fa..eb601b6 100644 --- a/src/main/java/com/anywayclear/repository/MemberRepository.java +++ b/src/main/java/com/anywayclear/repository/MemberRepository.java @@ -8,6 +8,6 @@ public interface MemberRepository extends JpaRepository { Optional findByEmailAddress(String emailAddress); // NullPointerException과 같은 예외를 방지하기 위해 Optional 사용 - Optional findByNickname(String nickname); // 닉네임으로 멤버 객체 불러오기 + Optional findByUserId(String userId); // 식별용 userId로 멤버 객체 불러오기 } diff --git a/src/main/java/com/anywayclear/service/DealService.java b/src/main/java/com/anywayclear/service/DealService.java index d8193e3..dc491e9 100644 --- a/src/main/java/com/anywayclear/service/DealService.java +++ b/src/main/java/com/anywayclear/service/DealService.java @@ -30,8 +30,8 @@ public DealResponse getDeal(Long id) { return DealResponse.toResponse(deal); } - public DealResponseList getDealList(String nickname) { - Member member = memberRepository.findByNickname(nickname).orElseThrow(() -> new RuntimeException("해당 닉네임의 유저가 없습니다.")); + public DealResponseList getDealList(String userId) { + Member member = memberRepository.findByUserId(userId).orElseThrow(() -> new RuntimeException("해당 userId의 유저가 없습니다.")); List dealList; if (member.getRole() == "ROLE_SELLER") { // 판매자 일 경우 dealList = dealRepository.findAllBySeller(member); diff --git a/src/main/java/com/anywayclear/service/DibService.java b/src/main/java/com/anywayclear/service/DibService.java index feb1820..48e6b6f 100644 --- a/src/main/java/com/anywayclear/service/DibService.java +++ b/src/main/java/com/anywayclear/service/DibService.java @@ -31,8 +31,8 @@ public DibResponse getDib(Long id) { return DibResponse.toResponse(dib); } - public DibResponseList getDibList(String nickname) { // 찜 중인 농산물 리스트 반환 - Member member = memberRepository.findByNickname(nickname).orElseThrow(() -> new RuntimeException("해당 닉네임의 유저가 없습니다.")); + public DibResponseList getDibList(String userId) { // 찜 중인 농산물 리스트 반환 + Member member = memberRepository.findByUserId(userId).orElseThrow(() -> new RuntimeException("해당 userId의 유저가 없습니다.")); List dibList = dibRepository.findAllByConsumer(member); return new DibResponseList(dibList); } diff --git a/src/main/java/com/anywayclear/service/MemberService.java b/src/main/java/com/anywayclear/service/MemberService.java index 3e2a7fa..08be1de 100644 --- a/src/main/java/com/anywayclear/service/MemberService.java +++ b/src/main/java/com/anywayclear/service/MemberService.java @@ -25,8 +25,8 @@ public MemberResponse getMember(String id) { return MemberResponse.toResponse(member); } - public MemberResponse getMemberByNickname(String nickname) { - Member member = memberRepository.findByNickname(nickname).orElseThrow(() -> new RuntimeException("해당 닉네임의 유저가 없습니다.")); + public MemberResponse getMemberByUserId(String userId) { + Member member = memberRepository.findByUserId(userId).orElseThrow(() -> new RuntimeException("해당 userId의 유저가 없습니다.")); return MemberResponse.toResponse(member); } } diff --git a/src/main/java/com/anywayclear/service/PointService.java b/src/main/java/com/anywayclear/service/PointService.java index 590d63b..e599b7e 100644 --- a/src/main/java/com/anywayclear/service/PointService.java +++ b/src/main/java/com/anywayclear/service/PointService.java @@ -18,9 +18,9 @@ public PointService(PointRepository pointRepository, MemberRepository memberRepo this.memberRepository = memberRepository; } - public PointResponse getPoint(String nickname) { + public PointResponse getPoint(String userId) { // 닉네임으로 검색해야 하기 때문에 멤버 리포지토리에서 멤버 객체를 불러옴 - Member member = memberRepository.findByNickname(nickname).orElseThrow(() -> new RuntimeException("해당 닉네임의 유저가 없습니다.")); + Member member = memberRepository.findByUserId(userId).orElseThrow(() -> new RuntimeException("해당 userId의 유저가 없습니다.")); // 불러온 멤버 객체에서 포인트 객체 가져오기 Point point = member.getPoint(); return PointResponse.toResponse(point); diff --git a/src/main/java/com/anywayclear/service/SubscribeService.java b/src/main/java/com/anywayclear/service/SubscribeService.java index 6f3f377..4d225a0 100644 --- a/src/main/java/com/anywayclear/service/SubscribeService.java +++ b/src/main/java/com/anywayclear/service/SubscribeService.java @@ -30,8 +30,8 @@ public SubscribeResponse getSubscribe(Long id) { return SubscribeResponse.toResponse(subscribe); } - public SubscribeResponseList getSubscribeList(String nickname) { - Member member = memberRepository.findByNickname(nickname).orElseThrow(() -> new RuntimeException("해당 닉네임의 유저가 없습니다.")); + public SubscribeResponseList getSubscribeList(String userId) { + Member member = memberRepository.findByUserId(userId).orElseThrow(() -> new RuntimeException("해당 userId의 유저가 없습니다.")); List subscribeList; if (member.getRole() == "ROLE_SELLER") { // 판매자 일 경우 subscribeList = subscribeRepository.findAllBySeller(member);