diff --git a/src/main/java/es/princip/ringus/application/mentor/service/MentorService.java b/src/main/java/es/princip/ringus/application/mentor/service/MentorService.java index e274ece..1029bb5 100644 --- a/src/main/java/es/princip/ringus/application/mentor/service/MentorService.java +++ b/src/main/java/es/princip/ringus/application/mentor/service/MentorService.java @@ -75,11 +75,7 @@ public MentorDetailResponse getDetailBy(Long mentorId) { Mentor mentor = mentorRepository.findById(mentorId) .orElseThrow(() -> new CustomRuntimeException(MentorErrorCode.MENTOR_PROFILE_NOT_FOUND)); - Member member = memberRepository.findById(mentor.getMemberId()) - .orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND)); - return MentorDetailResponse.from( - member, mentor, mentoringRepository.findMentoringCountBy(mentorId) ); diff --git a/src/main/java/es/princip/ringus/application/mentor/service/MyMentorService.java b/src/main/java/es/princip/ringus/application/mentor/service/MyMentorService.java index f32fb16..d8e94ab 100644 --- a/src/main/java/es/princip/ringus/application/mentor/service/MyMentorService.java +++ b/src/main/java/es/princip/ringus/application/mentor/service/MyMentorService.java @@ -1,6 +1,9 @@ package es.princip.ringus.application.mentor.service; +import es.princip.ringus.domain.exception.MemberErrorCode; import es.princip.ringus.domain.exception.MentorErrorCode; +import es.princip.ringus.domain.member.Member; +import es.princip.ringus.domain.member.MemberRepository; import es.princip.ringus.domain.mentor.Mentor; import es.princip.ringus.domain.mentor.MentorRepository; import es.princip.ringus.domain.mentoring.MentoringRepository; @@ -15,11 +18,16 @@ @Transactional(readOnly = true) public class MyMentorService { private final MentorRepository mentorRepository; + private final MemberRepository memberRepository; private final MentoringRepository mentoringRepository; public MyMentorResponse getDetailBy(Long memberId) { Mentor mentor = mentorRepository.findByMemberId(memberId) .orElseThrow(() -> new CustomRuntimeException(MentorErrorCode.MENTOR_PROFILE_NOT_FOUND)); - return MyMentorResponse.from(mentor, mentoringRepository.findMentoringCountBy(mentor.getId())); + + Member member = memberRepository.findById(mentor.getMemberId()) + .orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND)); + + return MyMentorResponse.from(member, mentor, mentoringRepository.findMentoringCountBy(mentor.getId())); } } diff --git a/src/main/java/es/princip/ringus/presentation/mentor/dto/MentorDetailResponse.java b/src/main/java/es/princip/ringus/presentation/mentor/dto/MentorDetailResponse.java index 254a719..9283e18 100644 --- a/src/main/java/es/princip/ringus/presentation/mentor/dto/MentorDetailResponse.java +++ b/src/main/java/es/princip/ringus/presentation/mentor/dto/MentorDetailResponse.java @@ -1,6 +1,5 @@ package es.princip.ringus.presentation.mentor.dto; -import es.princip.ringus.domain.member.Member; import es.princip.ringus.domain.mentor.Mentor; import es.princip.ringus.domain.mentor.vo.Hashtag; import es.princip.ringus.domain.mentor.vo.MentoringField; @@ -9,7 +8,6 @@ import java.util.List; public record MentorDetailResponse( - String email, String nickname, EducationResponse education, OrganizationResponse organization, @@ -22,12 +20,10 @@ public record MentorDetailResponse( Long mentoringCount ) { public static MentorDetailResponse from( - final Member member, final Mentor mentor, Long mentoringCount ) { return new MentorDetailResponse( - member.getEmail(), mentor.getNickname(), EducationResponse.from(mentor.getEducation()), OrganizationResponse.from(mentor.getOrganization()), diff --git a/src/main/java/es/princip/ringus/presentation/mentor/dto/MyMentorResponse.java b/src/main/java/es/princip/ringus/presentation/mentor/dto/MyMentorResponse.java index 0b4f891..13173ff 100644 --- a/src/main/java/es/princip/ringus/presentation/mentor/dto/MyMentorResponse.java +++ b/src/main/java/es/princip/ringus/presentation/mentor/dto/MyMentorResponse.java @@ -1,5 +1,6 @@ package es.princip.ringus.presentation.mentor.dto; +import es.princip.ringus.domain.member.Member; import es.princip.ringus.domain.mentor.Mentor; import es.princip.ringus.domain.mentor.vo.Hashtag; import es.princip.ringus.domain.mentor.vo.MentoringField; @@ -8,6 +9,7 @@ import java.util.List; public record MyMentorResponse( + String email, String nickname, EducationResponse education, OrganizationResponse organization, @@ -19,8 +21,9 @@ public record MyMentorResponse( PortfolioResponse portfolio, Long mentoringCount ) { - public static MyMentorResponse from(final Mentor mentor, Long mentoringCount) { + public static MyMentorResponse from(final Member member, final Mentor mentor, Long mentoringCount) { return new MyMentorResponse( + member.getEmail(), mentor.getNickname(), EducationResponse.from(mentor.getEducation()), OrganizationResponse.from(mentor.getOrganization()),