Skip to content

RINGUS-74 fix: MentorDetail 필드 수정 #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wlgns12370 merged 5 commits into from
May 19, 2025
Merged

RINGUS-74 fix: MentorDetail 필드 수정 #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
768f1f5
RINGUS-74 fix: mentor category 한국어 테이블 수정
wlgns12370 May 15, 2025
183c0f2
RINGUS-74 fix: MentorDetail Email 필드 추가
wlgns12370 May 15, 2025
7df34dd
RINGUS-74 fix: MenteeDetail Email 필드 추가
wlgns12370 May 15, 2025
405c21c
RINGUS-74 fix: MentorDetail email 필드 제거 및 MyMentorDetail email 필드 추가
wlgns12370 May 19, 2025
f530217
Merge remote-tracking branch 'origin/develop' into fix/ringus-74
wlgns12370 May 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/main/java/es/princip/ringus/application/mentor/service/MentorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
);
Expand Down
10 changes: 9 additions & 1 deletion src/main/java/es/princip/ringus/application/mentor/service/MyMentorService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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()));
}
}
4 changes: 0 additions & 4 deletions src/main/java/es/princip/ringus/presentation/mentor/dto/MentorDetailResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -9,7 +8,6 @@
import java.util.List;

public record MentorDetailResponse(
String email,
String nickname,
EducationResponse education,
OrganizationResponse organization,
Expand All @@ -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()),
Expand Down
5 changes: 4 additions & 1 deletion src/main/java/es/princip/ringus/presentation/mentor/dto/MyMentorResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -8,6 +9,7 @@
import java.util.List;

public record MyMentorResponse(
String email,
String nickname,
EducationResponse education,
OrganizationResponse organization,
Expand All @@ -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()),
Expand Down