Skip to content

Commit 756dac0

Browse files
authored
RINGUS-74 fix: MentorDetail 필드 수정 (#70)
* RINGUS-74 fix: mentor category 한국어 테이블 수정 * RINGUS-74 fix: MentorDetail Email 필드 추가 * RINGUS-74 fix: MenteeDetail Email 필드 추가 * RINGUS-74 fix: MentorDetail email 필드 제거 및 MyMentorDetail email 필드 추가
1 parent 7409136 commit 756dac0

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

src/main/java/es/princip/ringus/application/mentor/service/MentorService.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,7 @@ public MentorDetailResponse getDetailBy(Long mentorId) {
7575
Mentor mentor = mentorRepository.findById(mentorId)
7676
.orElseThrow(() -> new CustomRuntimeException(MentorErrorCode.MENTOR_PROFILE_NOT_FOUND));
7777

78-
Member member = memberRepository.findById(mentor.getMemberId())
79-
.orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND));
80-
8178
return MentorDetailResponse.from(
82-
member,
8379
mentor,
8480
mentoringRepository.findMentoringCountBy(mentorId)
8581
);

src/main/java/es/princip/ringus/application/mentor/service/MyMentorService.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
package es.princip.ringus.application.mentor.service;
22

3+
import es.princip.ringus.domain.exception.MemberErrorCode;
34
import es.princip.ringus.domain.exception.MentorErrorCode;
5+
import es.princip.ringus.domain.member.Member;
6+
import es.princip.ringus.domain.member.MemberRepository;
47
import es.princip.ringus.domain.mentor.Mentor;
58
import es.princip.ringus.domain.mentor.MentorRepository;
69
import es.princip.ringus.domain.mentoring.MentoringRepository;
@@ -15,11 +18,16 @@
1518
@Transactional(readOnly = true)
1619
public class MyMentorService {
1720
private final MentorRepository mentorRepository;
21+
private final MemberRepository memberRepository;
1822
private final MentoringRepository mentoringRepository;
1923

2024
public MyMentorResponse getDetailBy(Long memberId) {
2125
Mentor mentor = mentorRepository.findByMemberId(memberId)
2226
.orElseThrow(() -> new CustomRuntimeException(MentorErrorCode.MENTOR_PROFILE_NOT_FOUND));
23-
return MyMentorResponse.from(mentor, mentoringRepository.findMentoringCountBy(mentor.getId()));
27+
28+
Member member = memberRepository.findById(mentor.getMemberId())
29+
.orElseThrow(() -> new CustomRuntimeException(MemberErrorCode.MEMBER_NOT_FOUND));
30+
31+
return MyMentorResponse.from(member, mentor, mentoringRepository.findMentoringCountBy(mentor.getId()));
2432
}
2533
}

src/main/java/es/princip/ringus/presentation/mentor/dto/MentorDetailResponse.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package es.princip.ringus.presentation.mentor.dto;
22

3-
import es.princip.ringus.domain.member.Member;
43
import es.princip.ringus.domain.mentor.Mentor;
54
import es.princip.ringus.domain.mentor.vo.Hashtag;
65
import es.princip.ringus.domain.mentor.vo.MentoringField;
@@ -9,7 +8,6 @@
98
import java.util.List;
109

1110
public record MentorDetailResponse(
12-
String email,
1311
String nickname,
1412
EducationResponse education,
1513
OrganizationResponse organization,
@@ -22,12 +20,10 @@ public record MentorDetailResponse(
2220
Long mentoringCount
2321
) {
2422
public static MentorDetailResponse from(
25-
final Member member,
2623
final Mentor mentor,
2724
Long mentoringCount
2825
) {
2926
return new MentorDetailResponse(
30-
member.getEmail(),
3127
mentor.getNickname(),
3228
EducationResponse.from(mentor.getEducation()),
3329
OrganizationResponse.from(mentor.getOrganization()),

src/main/java/es/princip/ringus/presentation/mentor/dto/MyMentorResponse.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package es.princip.ringus.presentation.mentor.dto;
22

3+
import es.princip.ringus.domain.member.Member;
34
import es.princip.ringus.domain.mentor.Mentor;
45
import es.princip.ringus.domain.mentor.vo.Hashtag;
56
import es.princip.ringus.domain.mentor.vo.MentoringField;
@@ -8,6 +9,7 @@
89
import java.util.List;
910

1011
public record MyMentorResponse(
12+
String email,
1113
String nickname,
1214
EducationResponse education,
1315
OrganizationResponse organization,
@@ -19,8 +21,9 @@ public record MyMentorResponse(
1921
PortfolioResponse portfolio,
2022
Long mentoringCount
2123
) {
22-
public static MyMentorResponse from(final Mentor mentor, Long mentoringCount) {
24+
public static MyMentorResponse from(final Member member, final Mentor mentor, Long mentoringCount) {
2325
return new MyMentorResponse(
26+
member.getEmail(),
2427
mentor.getNickname(),
2528
EducationResponse.from(mentor.getEducation()),
2629
OrganizationResponse.from(mentor.getOrganization()),

0 commit comments

Comments
 (0)