Skip to content

Commit c8f35d1

Browse files
committed
refactor: 멘토 관련 id응답은 모두 site-user-id가 되도록 수정
1 parent 6e9ee44 commit c8f35d1

8 files changed

Lines changed: 17 additions & 13 deletions

File tree

src/main/java/com/example/solidconnection/mentor/controller/MentorController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ public class MentorController {
2525

2626
private final MentorQueryService mentorQueryService;
2727

28-
@GetMapping("/{mentor-id}")
28+
@GetMapping("/{site-user-id}")
2929
public ResponseEntity<MentorDetailResponse> getMentorDetails(
3030
@AuthorizedUser long siteUserId,
31-
@PathVariable("mentor-id") Long mentorId
31+
@PathVariable("site-user-id") Long mentorSiteUserId
3232
) {
33-
MentorDetailResponse response = mentorQueryService.getMentorDetails(mentorId, siteUserId);
33+
MentorDetailResponse response = mentorQueryService.getMentorDetails(mentorSiteUserId, siteUserId);
3434
return ResponseEntity.ok(response);
3535
}
3636

src/main/java/com/example/solidconnection/mentor/dto/MatchedMentorResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static MatchedMentorResponse of(Mentor mentor, SiteUser mentorUser,
3131
String termName
3232
) {
3333
return new MatchedMentorResponse(
34-
mentor.getId(),
34+
mentor.getSiteUserId(),
3535
roomId,
3636
mentorUser.getNickname(),
3737
mentorUser.getProfileImageUrl(),

src/main/java/com/example/solidconnection/mentor/dto/MentorDetailResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static MentorDetailResponse of(Mentor mentor, SiteUser mentorUser,
2525
String termName
2626
) {
2727
return new MentorDetailResponse(
28-
mentor.getId(),
28+
mentor.getSiteUserId(),
2929
mentorUser.getNickname(),
3030
mentorUser.getProfileImageUrl(),
3131
university.getCountry().getKoreanName(),

src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public record MentorMyPageResponse(
2121

2222
public static MentorMyPageResponse of(Mentor mentor, SiteUser siteUser, HostUniversity university, String termName) {
2323
return new MentorMyPageResponse(
24-
mentor.getId(),
24+
mentor.getSiteUserId(),
2525
siteUser.getProfileImageUrl(),
2626
siteUser.getNickname(),
2727
university.getCountry().getKoreanName(),

src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public static MentorPreviewResponse of(Mentor mentor, SiteUser mentorUser,
2424
String termName
2525
) {
2626
return new MentorPreviewResponse(
27-
mentor.getId(),
27+
mentor.getSiteUserId(),
2828
mentorUser.getNickname(),
2929
mentorUser.getProfileImageUrl(),
3030
university.getCountry().getKoreanName(),

src/main/java/com/example/solidconnection/mentor/dto/MentoringApplyRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
public record MentoringApplyRequest(
66
@NotNull(message = "멘토 id를 입력해주세요.")
7-
Long mentorId
7+
Long siteUserId
88
) {
99

1010
}

src/main/java/com/example/solidconnection/mentor/service/MentorQueryService.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ public class MentorQueryService {
4343
private final TermRepository termRepository;
4444

4545
@Transactional(readOnly = true)
46-
public MentorDetailResponse getMentorDetails(long mentorId, long currentUserId) {
47-
Mentor mentor = mentorRepository.findById(mentorId)
46+
public MentorDetailResponse getMentorDetails(long mentorSiteUserId, long currentUserId) {
47+
Mentor mentor = mentorRepository.findBySiteUserId(mentorSiteUserId)
4848
.orElseThrow(() -> new CustomException(MENTOR_NOT_FOUND));
4949
HostUniversity university = hostUniversityRepository.findById(mentor.getUniversityId())
5050
.orElseThrow(() -> new CustomException(UNIVERSITY_NOT_FOUND));
5151
SiteUser mentorUser = siteUserRepository.findById(mentor.getSiteUserId())
5252
.orElseThrow(() -> new CustomException(MENTOR_NOT_FOUND));
5353
Term term = termRepository.findById(mentor.getTermId())
5454
.orElseThrow(() -> new CustomException(TERM_NOT_FOUND));
55-
boolean isApplied = mentoringRepository.existsByMentorIdAndMenteeId(mentorId, currentUserId);
55+
boolean isApplied = mentoringRepository.existsByMentorIdAndMenteeId(mentor.getId(), currentUserId);
5656

5757
return MentorDetailResponse.of(mentor, mentorUser, university, isApplied, term.getName());
5858
}

src/main/java/com/example/solidconnection/mentor/service/MentoringCommandService.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,17 @@ public class MentoringCommandService {
3131

3232
@Transactional
3333
public MentoringApplyResponse applyMentoring(long siteUserId, MentoringApplyRequest mentoringApplyRequest) {
34-
long mentorId = mentoringApplyRequest.mentorId();
34+
long mentorSiteUserId = mentoringApplyRequest.siteUserId();
35+
36+
Mentor mentor = mentorRepository.findBySiteUserId(mentorSiteUserId)
37+
.orElseThrow(() -> new CustomException(MENTOR_NOT_FOUND));
38+
long mentorId = mentor.getId();
3539

3640
if (mentoringRepository.existsByMentorIdAndMenteeId(mentorId, siteUserId)) {
3741
throw new CustomException(ALREADY_EXIST_MENTORING);
3842
}
3943

40-
Mentoring mentoring = new Mentoring(mentoringApplyRequest.mentorId(), siteUserId, VerifyStatus.PENDING);
44+
Mentoring mentoring = new Mentoring(mentorId, siteUserId, VerifyStatus.PENDING);
4145
return MentoringApplyResponse.from(mentoringRepository.save(mentoring));
4246
}
4347

0 commit comments

Comments
 (0)