refactor: 멘토 도메인 응답의 사용자 id를 siteUserId로 통일 (#665)

Gyuhyeok99 · web-flow · commit 26f5a76ea239 · 2026-02-14T22:21:22.000+09:00
* refactor: 멘토 관련 id응답은 모두 site-user-id가 되도록 수정

* test: 멘토 관련 테스트 코드 수정
diff --git a/src/main/java/com/example/solidconnection/mentor/controller/MentorController.java b/src/main/java/com/example/solidconnection/mentor/controller/MentorController.java
@@ -25,12 +25,12 @@ public class MentorController {
 
     private final MentorQueryService mentorQueryService;
 
-    @GetMapping("/{mentor-id}")
+    @GetMapping("/{site-user-id}")
     public ResponseEntity<MentorDetailResponse> getMentorDetails(
             @AuthorizedUser long siteUserId,
-            @PathVariable("mentor-id") Long mentorId
+            @PathVariable("site-user-id") Long mentorSiteUserId
     ) {
-        MentorDetailResponse response = mentorQueryService.getMentorDetails(mentorId, siteUserId);
+        MentorDetailResponse response = mentorQueryService.getMentorDetails(mentorSiteUserId, siteUserId);
         return ResponseEntity.ok(response);
     }
 
diff --git a/src/main/java/com/example/solidconnection/mentor/dto/MatchedMentorResponse.java b/src/main/java/com/example/solidconnection/mentor/dto/MatchedMentorResponse.java
@@ -31,7 +31,7 @@ public static MatchedMentorResponse of(Mentor mentor, SiteUser mentorUser,
                                            String termName
     ) {
         return new MatchedMentorResponse(
-                mentor.getId(),
+                mentor.getSiteUserId(),
                 roomId,
                 mentorUser.getNickname(),
                 mentorUser.getProfileImageUrl(),
diff --git a/src/main/java/com/example/solidconnection/mentor/dto/MentorDetailResponse.java b/src/main/java/com/example/solidconnection/mentor/dto/MentorDetailResponse.java
@@ -25,7 +25,7 @@ public static MentorDetailResponse of(Mentor mentor, SiteUser mentorUser,
                                           String termName
     ) {
         return new MentorDetailResponse(
-                mentor.getId(),
+                mentor.getSiteUserId(),
                 mentorUser.getNickname(),
                 mentorUser.getProfileImageUrl(),
                 university.getCountry().getKoreanName(),
diff --git a/src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageResponse.java b/src/main/java/com/example/solidconnection/mentor/dto/MentorMyPageResponse.java
@@ -21,7 +21,7 @@ public record MentorMyPageResponse(
 
     public static MentorMyPageResponse of(Mentor mentor, SiteUser siteUser, HostUniversity university, String termName) {
         return new MentorMyPageResponse(
-                mentor.getId(),
+                mentor.getSiteUserId(),
                 siteUser.getProfileImageUrl(),
                 siteUser.getNickname(),
                 university.getCountry().getKoreanName(),
diff --git a/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewResponse.java b/src/main/java/com/example/solidconnection/mentor/dto/MentorPreviewResponse.java
@@ -24,7 +24,7 @@ public static MentorPreviewResponse of(Mentor mentor, SiteUser mentorUser,
                                            String termName
     ) {
         return new MentorPreviewResponse(
-                mentor.getId(),
+                mentor.getSiteUserId(),
                 mentorUser.getNickname(),
                 mentorUser.getProfileImageUrl(),
                 university.getCountry().getKoreanName(),
diff --git a/src/main/java/com/example/solidconnection/mentor/service/MentorQueryService.java b/src/main/java/com/example/solidconnection/mentor/service/MentorQueryService.java
@@ -43,16 +43,16 @@ public class MentorQueryService {
     private final TermRepository termRepository;
 
     @Transactional(readOnly = true)
-    public MentorDetailResponse getMentorDetails(long mentorId, long currentUserId) {
-        Mentor mentor = mentorRepository.findById(mentorId)
+    public MentorDetailResponse getMentorDetails(long mentorSiteUserId, long currentUserId) {
+        Mentor mentor = mentorRepository.findBySiteUserId(mentorSiteUserId)
                 .orElseThrow(() -> new CustomException(MENTOR_NOT_FOUND));
         HostUniversity university = hostUniversityRepository.findById(mentor.getUniversityId())
                 .orElseThrow(() -> new CustomException(UNIVERSITY_NOT_FOUND));
         SiteUser mentorUser = siteUserRepository.findById(mentor.getSiteUserId())
                 .orElseThrow(() -> new CustomException(MENTOR_NOT_FOUND));
         Term term = termRepository.findById(mentor.getTermId())
                 .orElseThrow(() -> new CustomException(TERM_NOT_FOUND));
-        boolean isApplied = mentoringRepository.existsByMentorIdAndMenteeId(mentorId, currentUserId);
+        boolean isApplied = mentoringRepository.existsByMentorIdAndMenteeId(mentor.getId(), currentUserId);
 
         return MentorDetailResponse.of(mentor, mentorUser, university, isApplied, term.getName());
     }
diff --git a/src/main/java/com/example/solidconnection/mentor/service/MentoringCommandService.java b/src/main/java/com/example/solidconnection/mentor/service/MentoringCommandService.java
@@ -31,13 +31,17 @@ public class MentoringCommandService {
 
     @Transactional
     public MentoringApplyResponse applyMentoring(long siteUserId, MentoringApplyRequest mentoringApplyRequest) {
-        long mentorId = mentoringApplyRequest.mentorId();
+        long mentorSiteUserId = mentoringApplyRequest.mentorId();
+
+        Mentor mentor = mentorRepository.findBySiteUserId(mentorSiteUserId)
+                .orElseThrow(() -> new CustomException(MENTOR_NOT_FOUND));
+        long mentorId = mentor.getId();
 
         if (mentoringRepository.existsByMentorIdAndMenteeId(mentorId, siteUserId)) {
             throw new CustomException(ALREADY_EXIST_MENTORING);
         }
 
-        Mentoring mentoring = new Mentoring(mentoringApplyRequest.mentorId(), siteUserId, VerifyStatus.PENDING);
+        Mentoring mentoring = new Mentoring(mentorId, siteUserId, VerifyStatus.PENDING);
         return MentoringApplyResponse.from(mentoringRepository.save(mentoring));
     }
 
diff --git a/src/test/java/com/example/solidconnection/mentor/service/MentorQueryServiceTest.java b/src/test/java/com/example/solidconnection/mentor/service/MentorQueryServiceTest.java
@@ -77,11 +77,11 @@ class 멘토_단일_조회_성공 {
             Channel channel2 = channelFixture.채널(2, mentor);
 
             // when
-            MentorDetailResponse response = mentorQueryService.getMentorDetails(mentor.getId(), siteUser.getId());
+            MentorDetailResponse response = mentorQueryService.getMentorDetails(mentor.getSiteUserId(), siteUser.getId());
 
             // then
             assertAll(
-                    () -> assertThat(response.id()).isEqualTo(mentor.getId()),
+                    () -> assertThat(response.id()).isEqualTo(mentor.getSiteUserId()),
                     () -> assertThat(response.nickname()).isEqualTo(mentorUser.getNickname()),
                     () -> assertThat(response.universityName()).isEqualTo(university.getKoreanName()),
                     () -> assertThat(response.country()).isEqualTo(university.getCountry().getKoreanName()),
@@ -101,8 +101,8 @@ class 멘토_단일_조회_성공 {
             mentoringFixture.대기중_멘토링(mentor.getId(), appliedUser.getId());
 
             // when
-            MentorDetailResponse notAppliedResponse = mentorQueryService.getMentorDetails(mentor.getId(), notAppliedUser.getId());
-            MentorDetailResponse appliedResponse = mentorQueryService.getMentorDetails(mentor.getId(), appliedUser.getId());
+            MentorDetailResponse notAppliedResponse = mentorQueryService.getMentorDetails(mentor.getSiteUserId(), notAppliedUser.getId());
+            MentorDetailResponse appliedResponse = mentorQueryService.getMentorDetails(mentor.getSiteUserId(), appliedUser.getId());
 
             // then
             assertAll(
@@ -159,8 +159,8 @@ void setUp() {
             // then
             Map<Long, MentorPreviewResponse> mentorPreviewMap = response.content().stream()
                     .collect(Collectors.toMap(MentorPreviewResponse::id, Function.identity()));
-            MentorPreviewResponse mentor1Response = mentorPreviewMap.get(mentor1.getId());
-            MentorPreviewResponse mentor2Response = mentorPreviewMap.get(mentor2.getId());
+            MentorPreviewResponse mentor1Response = mentorPreviewMap.get(mentor1.getSiteUserId());
+            MentorPreviewResponse mentor2Response = mentorPreviewMap.get(mentor2.getSiteUserId());
             assertAll(
                     () -> assertThat(mentor1Response.nickname()).isEqualTo(mentorUser1.getNickname()),
                     () -> assertThat(mentor1Response.universityName()).isEqualTo(university1.getKoreanName()),
@@ -225,10 +225,10 @@ void setUp() {
             assertAll(
                     () -> assertThat(asiaFilteredResponse.content()).hasSize(1)
                             .extracting(MentorPreviewResponse::id)
-                            .containsExactly(asiaMentor.getId()),
+                            .containsExactly(asiaMentor.getSiteUserId()),
                     () -> assertThat(europeFilteredResponse.content()).hasSize(1)
                             .extracting(MentorPreviewResponse::id)
-                            .containsExactly(europeMentor.getId())
+                            .containsExactly(europeMentor.getSiteUserId())
             );
         }
 
@@ -240,7 +240,7 @@ void setUp() {
             // then
             assertThat(response.content()).hasSize(2)
                     .extracting(MentorPreviewResponse::id)
-                    .containsExactlyInAnyOrder(asiaMentor.getId(), europeMentor.getId());
+                    .containsExactlyInAnyOrder(asiaMentor.getSiteUserId(), europeMentor.getSiteUserId());
         }
     }
 }
diff --git a/src/test/java/com/example/solidconnection/mentor/service/MentoringCommandServiceTest.java b/src/test/java/com/example/solidconnection/mentor/service/MentoringCommandServiceTest.java
@@ -83,7 +83,7 @@ class 멘토링_신청_테스트 {
         @Test
         void 멘토링을_성공적으로_신청한다() {
             // given
-            MentoringApplyRequest request = new MentoringApplyRequest(mentor1.getId());
+            MentoringApplyRequest request = new MentoringApplyRequest(mentor1.getSiteUserId());
 
             // when
             MentoringApplyResponse response = mentoringCommandService.applyMentoring(menteeUser.getId(), request);
@@ -102,7 +102,7 @@ class 멘토링_신청_테스트 {
         void 동일_멘티_멘토끼리는_재신청되지않는다() {
             // given
             mentoringFixture.대기중_멘토링(mentor1.getId(), menteeUser.getId());
-            MentoringApplyRequest request = new MentoringApplyRequest(mentor1.getId());
+            MentoringApplyRequest request = new MentoringApplyRequest(mentor1.getSiteUserId());
 
             // when & then
             assertThatThrownBy(() -> mentoringCommandService.applyMentoring(menteeUser.getId(), request))
diff --git a/src/test/java/com/example/solidconnection/mentor/service/MentoringQueryServiceTest.java b/src/test/java/com/example/solidconnection/mentor/service/MentoringQueryServiceTest.java
@@ -290,8 +290,8 @@ void setUp() {
             // then
             Map<Long, MatchedMentorResponse> matchMentorMap = response.content().stream()
                     .collect(Collectors.toMap(MatchedMentorResponse::id, Function.identity()));
-            MatchedMentorResponse mentor1Response = matchMentorMap.get(mentor1.getId());
-            MatchedMentorResponse mentor2Response = matchMentorMap.get(mentor2.getId());
+            MatchedMentorResponse mentor1Response = matchMentorMap.get(mentor1.getSiteUserId());
+            MatchedMentorResponse mentor2Response = matchMentorMap.get(mentor2.getSiteUserId());
             assertAll(
                     () -> assertThat(mentor1Response.roomId()).isEqualTo(chatRoom1.getId()),
                     () -> assertThat(mentor1Response.nickname()).isEqualTo(mentorUser1.getNickname()),
