Skip to content

Commit

Permalink
fix: 사용자 식별을 닉네임에서 userId로 수정
Browse files Browse the repository at this point in the history
- MemberRepository에서 findByNickname -> findByUserId로 수정
- nickname으로 사용자 식별하여 member 객체를 가져오던 Deal, Dibs, Point, Subcribe, Member의 Service, Controller class 일괄 수정
  • Loading branch information
ah9mon committed Jul 31, 2023
1 parent e8d3805 commit 46f9af5
Show file tree
Hide file tree
Showing 11 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions src/main/java/com/anywayclear/controller/DealController.java
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public ResponseEntity<Void> createDeal(@Valid @RequestBody DealCreateRequest req
}

@GetMapping
public ResponseEntity<DealResponseList> getDealList(@RequestParam(name = "nickname") String nickname) {
return ResponseEntity.ok(dealService.getDealList(nickname));
public ResponseEntity<DealResponseList> getDealList(@RequestParam(name = "userId") String userId) {
return ResponseEntity.ok(dealService.getDealList(userId));
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/anywayclear/controller/DibController.java
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ public DibController(DibService dibService) {
}

@GetMapping
public ResponseEntity<DibResponseList> getDibList(@RequestParam(name = "nickname") String nickname) {
return ResponseEntity.ok(dibService.getDibList(nickname));
public ResponseEntity<DibResponseList> getDibList(@RequestParam(name = "userId") String userId) {
return ResponseEntity.ok(dibService.getDibList(userId));
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ResponseEntity<Void> getMember(@Valid @RequestBody MemberCreateRequest re
}

@GetMapping
public ResponseEntity<MemberResponse> getMemberDetail(@RequestParam(name = "nickname") String nickname) {
return ResponseEntity.ok(memberService.getMemberByNickname(nickname));
public ResponseEntity<MemberResponse> getMemberDetail(@RequestParam(name = "userId") String userId) {
return ResponseEntity.ok(memberService.getMemberByUserId(userId));
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/anywayclear/controller/PointController.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public PointController(PointService pointService) {
}

@GetMapping
public ResponseEntity<PointResponse> getPoint(@RequestParam(name = "nickname") String nickname) {
return ResponseEntity.ok(pointService.getPoint(nickname));
public ResponseEntity<PointResponse> getPoint(@RequestParam(name = "userId") String userId) {
return ResponseEntity.ok(pointService.getPoint(userId));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public SubscribeController(SubscribeService subscribeService) {
}

@GetMapping
public ResponseEntity<SubscribeResponseList> getSubscribeList(@RequestParam(name = "nickname") String nickname) {
return ResponseEntity.ok(subscribeService.getSubscribeList(nickname));
public ResponseEntity<SubscribeResponseList> getSubscribeList(@RequestParam(name = "userId") String userId) {
return ResponseEntity.ok(subscribeService.getSubscribeList(userId));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
public interface MemberRepository extends JpaRepository<Member, String> {
Optional<Member> findByEmailAddress(String emailAddress); // NullPointerException과 같은 예외를 방지하기 위해 Optional 사용

Optional<Member> findByNickname(String nickname); // 닉네임으로 멤버 객체 불러오기
Optional<Member> findByUserId(String userId); // 식별용 userId로 멤버 객체 불러오기

}
4 changes: 2 additions & 2 deletions src/main/java/com/anywayclear/service/DealService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Deal> dealList;
if (member.getRole() == "ROLE_SELLER") { // 판매자 일 경우
dealList = dealRepository.findAllBySeller(member);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/anywayclear/service/DibService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Dib> dibList = dibRepository.findAllByConsumer(member);
return new DibResponseList(dibList);
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/anywayclear/service/MemberService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions src/main/java/com/anywayclear/service/PointService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/anywayclear/service/SubscribeService.java
Original file line number Diff line number Diff line change
Expand Up @@ -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<Subscribe> subscribeList;
if (member.getRole() == "ROLE_SELLER") { // 판매자 일 경우
subscribeList = subscribeRepository.findAllBySeller(member);
Expand Down

0 comments on commit 46f9af5

Please sign in to comment.