refactor: API 명세에 맞게 응답 수정

Author: whqtker

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

@@ -1,10 +1,10 @@
 package com.example.solidconnection.mentor.dto;
 
 public record MentoringCountResponse(
-        int mentoringCount
+        int uncheckedCount
 ) {
 
-    public static MentoringCountResponse from(int mentoringCount) {
-        return new MentoringCountResponse(mentoringCount);
+    public static MentoringCountResponse from(int uncheckedCount) {
+        return new MentoringCountResponse(uncheckedCount);
     }
 }

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

@@ -3,9 +3,9 @@
 import java.util.List;
 
 public record MentoringListResponse(
-        List<MentoringResponse> mentoringResponseList
+        List<MentoringResponse> requests
 ) {
-    public static MentoringListResponse from(List<MentoringResponse> mentoringResponseList) {
-        return new MentoringListResponse(mentoringResponseList);
+    public static MentoringListResponse from(List<MentoringResponse> requests) {
+        return new MentoringListResponse(requests);
     }
 }

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

@@ -1,28 +1,24 @@
 package com.example.solidconnection.mentor.dto;
 
-import com.example.solidconnection.common.VerifyStatus;
 import com.example.solidconnection.mentor.domain.Mentoring;
+import com.example.solidconnection.siteuser.domain.SiteUser;
 
 import java.time.ZonedDateTime;
 
 public record MentoringResponse(
-        long id,
-        long mentorId,
-        long menteeId,
-        ZonedDateTime createdAt,
-        ZonedDateTime confirmedAt,
-        VerifyStatus verifyStatus,
-        String rejectedReason
+        long mentoringId,
+        String profileImageUrl,
+        String nickname,
+        boolean isChecked,
+        ZonedDateTime createAt
 ) {
-    public static MentoringResponse from(Mentoring mentoring) {
+    public static MentoringResponse from(Mentoring mentoring, SiteUser mentee) {
         return new MentoringResponse(
                 mentoring.getId(),
-                mentoring.getMentorId(),
-                mentoring.getMenteeId(),
-                mentoring.getCreatedAt(),
-                mentoring.getConfirmedAt(),
-                mentoring.getVerifyStatus(),
-                mentoring.getRejectedReason()
+                mentee.getProfileImageUrl(),
+                mentee.getNickname(),
+                mentoring.getCheckedAt() != null,
+                mentoring.getCreatedAt()
         );
     }
 }

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

@@ -1,13 +1,16 @@
 package com.example.solidconnection.mentor.service;
 
 import com.example.solidconnection.common.exception.CustomException;
+import com.example.solidconnection.common.exception.ErrorCode;
 import com.example.solidconnection.mentor.domain.Mentor;
 import com.example.solidconnection.mentor.domain.Mentoring;
 import com.example.solidconnection.mentor.dto.MentoringCountResponse;
 import com.example.solidconnection.mentor.dto.MentoringListResponse;
 import com.example.solidconnection.mentor.dto.MentoringResponse;
 import com.example.solidconnection.mentor.repository.MentorRepository;
 import com.example.solidconnection.mentor.repository.MentoringRepository;
+import com.example.solidconnection.siteuser.domain.SiteUser;
+import com.example.solidconnection.siteuser.repository.SiteUserRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,6 +25,7 @@ public class MentoringQueryService {
 
     private final MentoringRepository mentoringRepository;
     private final MentorRepository mentorRepository;
+    private final SiteUserRepository siteUserRepository;
 
     @Transactional(readOnly = true)
     public MentoringListResponse getMentorings(long siteUserId) {
@@ -30,7 +34,12 @@ public MentoringListResponse getMentorings(long siteUserId) {
 
         List<Mentoring> mentorings = mentoringRepository.findAllByMentorId(mentor.getId());
         List<MentoringResponse> mentoringResponses = mentorings.stream()
-                .map(MentoringResponse::from)
+                .map(mentoring -> {
+                    SiteUser mentee = siteUserRepository.findById(mentoring.getMenteeId())
+                            .orElseThrow(() -> new CustomException(ErrorCode.USER_NOT_FOUND));
+
+                    return MentoringResponse.from(mentoring, mentee);
+                })
                 .toList();
 
         return MentoringListResponse.from(mentoringResponses);

src/test/java/com/example/solidconnection/mentor/service/MentoringQueryServiceTest.java

@@ -61,8 +61,8 @@ class 멘토링_목록_조회_테스트 {
 
             // then
             assertAll(
-                    () -> assertThat(responses.mentoringResponseList()).hasSize(3),
-                    () -> assertThat(responses.mentoringResponseList()).extracting(MentoringResponse::id)
+                    () -> assertThat(responses.requests()).hasSize(3),
+                    () -> assertThat(responses.requests()).extracting(MentoringResponse::mentoringId)
                             .containsExactlyInAnyOrder(
                                     mentoring1.getId(),
                                     mentoring2.getId(),
@@ -77,7 +77,7 @@ class 멘토링_목록_조회_테스트 {
             MentoringListResponse responses = mentoringQueryService.getMentorings(mentorUser.getId());
 
             // then
-            assertThat(responses.mentoringResponseList()).isEmpty();
+            assertThat(responses.requests()).isEmpty();
         }
     }
 
@@ -95,7 +95,7 @@ class 새_멘토링_개수_조회_테스트 {
             MentoringCountResponse response = mentoringQueryService.getNewMentoringsCount(mentorUser.getId());
 
             // then
-            assertThat(response.mentoringCount()).isEqualTo(2);
+            assertThat(response.uncheckedCount()).isEqualTo(2);
         }
 
         @Test
@@ -107,7 +107,7 @@ class 새_멘토링_개수_조회_테스트 {
             MentoringCountResponse response = mentoringQueryService.getNewMentoringsCount(mentorUser.getId());
 
             // then
-            assertThat(response.mentoringCount()).isZero();
+            assertThat(response.uncheckedCount()).isZero();
         }
     }
 }