Merge pull request #284 from prgrms-web-devcourse-final-project/develop

Fix/274 (#283)

Author: tlswltjq

back/src/main/java/com/back/domain/file/video/controller/VideoController.java

@@ -31,7 +31,7 @@ public RsData<UploadUrlGetResponse> getUploadUrl(@RequestParam String filename)
             uuid = matcher.group(1);
         }
 
-        UploadUrlGetResponse response = new UploadUrlGetResponse(uuid, uploadUrl.expiresAt());
+        UploadUrlGetResponse response = new UploadUrlGetResponse(uploadUrl.url().toString(), uuid, uploadUrl.expiresAt());
         return new RsData<>("200", "업로드용 URL 요청완료", response);
     }
 

back/src/main/java/com/back/domain/file/video/dto/controller/UploadUrlGetResponse.java

@@ -3,6 +3,7 @@
 import java.time.LocalDateTime;
 
 public record UploadUrlGetResponse(
+        String url,
         String uuid,
         LocalDateTime expiresAt
 ) {

back/src/main/java/com/back/domain/member/member/dto/MemberMeResponse.java

@@ -10,9 +10,10 @@ public record MemberMeResponse(
     String nickname,
     String role,
     Long mentorId,
-    Long menteeId
+    Long menteeId,
+    String job  // 직업명 추가
 ) {
-    public static MemberMeResponse of(Member member, Long mentorId, Long menteeId) {
+    public static MemberMeResponse of(Member member, Long mentorId, Long menteeId, String job) {
         return new MemberMeResponse(
             member.getId(),
             member.getPublicId(),
@@ -21,7 +22,8 @@ public static MemberMeResponse of(Member member, Long mentorId, Long menteeId) {
             member.getNickname(),
             member.getRole().name(),
             mentorId,
-            menteeId
+            menteeId,
+            job
         );
     }
 }

back/src/main/java/com/back/domain/member/member/service/MemberService.java

@@ -162,18 +162,23 @@ public MemberMeResponse getMemberMe(Member actor) {
 
         Long mentorId = null;
         Long menteeId = null;
+        String job = null;
 
         if (actor.getRole() == Member.Role.MENTOR) {
-            mentorId = mentorRepository.findByMemberId(actor.getId())
-                    .map(Mentor::getId)
-                    .orElse(null);
+            Mentor mentor = mentorRepository.findByMemberIdWithMember(actor.getId()).orElse(null);
+            if (mentor != null) {
+                mentorId = mentor.getId();
+                job = mentor.getJob() != null ? mentor.getJob().getName() : null;
+            }
         } else if (actor.getRole() == Member.Role.MENTEE) {
-            menteeId = menteeRepository.findByMemberId(actor.getId())
-                    .map(Mentee::getId)
-                    .orElse(null);
+            Mentee mentee = menteeRepository.findByMemberId(actor.getId()).orElse(null);
+            if (mentee != null) {
+                menteeId = mentee.getId();
+                job = mentee.getJob() != null ? mentee.getJob().getName() : null;
+            }
         }
 
-        return MemberMeResponse.of(actor, mentorId, menteeId);
+        return MemberMeResponse.of(actor, mentorId, menteeId, job);
     }
 
     public Member refreshAccessToken(String refreshToken) {
@@ -203,7 +208,7 @@ public Member refreshAccessToken(String refreshToken) {
     }
 
     public MenteeMyPageResponse getMenteeMyPage(Member currentUser) {
-        Mentee mentee = menteeRepository.findByMemberId(currentUser.getId())
+        Mentee mentee = menteeRepository.findByMemberIdWithMember(currentUser.getId())
                 .orElseThrow(() -> new ServiceException("404-2", "멘티 정보를 찾을 수 없습니다."));
 
         return MenteeMyPageResponse.from(currentUser, mentee);
@@ -223,7 +228,7 @@ public void updateMentee(Member currentUser, MenteeUpdateRequest request) {
 
         // Mentee 정보 업데이트 (interestedField)
         if (request.interestedField() != null) {
-            Mentee mentee = menteeRepository.findByMemberId(currentUser.getId())
+            Mentee mentee = menteeRepository.findByMemberIdWithMember(currentUser.getId())
                     .orElseThrow(() -> new ServiceException("404-2", "멘티 정보를 찾을 수 없습니다."));
 
             Job job = jobRepository.findByName(request.interestedField())

back/src/main/java/com/back/domain/member/mentee/repository/MenteeRepository.java

@@ -12,7 +12,7 @@ public interface MenteeRepository extends JpaRepository<Mentee, Long> {
     @Query("SELECT m FROM Mentee m WHERE m.member.id = :memberId AND m.isDeleted = false")
     Optional<Mentee> findByMemberId(@Param("memberId") Long memberId);
 
-    @Query("SELECT m FROM Mentee m JOIN FETCH m.member WHERE m.member.id = :memberId AND m.isDeleted = false")
+    @Query("SELECT m FROM Mentee m JOIN FETCH m.member LEFT JOIN FETCH m.job WHERE m.member.id = :memberId AND m.isDeleted = false")
     Optional<Mentee> findByMemberIdWithMember(@Param("memberId") Long memberId);
 
     @Query("SELECT m FROM Mentee m WHERE m.id = :id AND m.isDeleted = false")

back/src/test/java/com/back/domain/member/member/controller/MemberAuthControllerTest.java

@@ -282,7 +282,9 @@ void t5() throws Exception {
                 .andExpect(jsonPath("$.data.email").value(email))
                 .andExpect(jsonPath("$.data.nickname").value("멘티닉네임"))
                 .andExpect(jsonPath("$.data.mentorId").isEmpty())
-                .andExpect(jsonPath("$.data.menteeId").isNotEmpty());
+                .andExpect(jsonPath("$.data.menteeId").isNotEmpty())
+                .andExpect(jsonPath("$.data.job").isNotEmpty());
+
     }
 
     @Test
@@ -320,7 +322,9 @@ void t5_1() throws Exception {
                 .andExpect(jsonPath("$.data.email").value(email))
                 .andExpect(jsonPath("$.data.nickname").value("멘토닉네임"))
                 .andExpect(jsonPath("$.data.mentorId").isNotEmpty())
-                .andExpect(jsonPath("$.data.menteeId").isEmpty());
+                .andExpect(jsonPath("$.data.menteeId").isEmpty())
+                .andExpect(jsonPath("$.data.job").isNotEmpty());
+
     }
 
     @Test