Skip to content

Commit e4a0f7d

Browse files
authored
Merge pull request #272 from prgrms-web-devcourse-final-project/develop
fix:fetch join (#271)
2 parents 50854a1 + 07c9f2f commit e4a0f7d

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ public void updateMentee(Member currentUser, MenteeUpdateRequest request) {
235235
}
236236

237237
public MentorMyPageResponse getMentorMyPage(Member currentUser) {
238-
Mentor mentor = mentorRepository.findByMemberId(currentUser.getId())
238+
Mentor mentor = mentorRepository.findByMemberIdWithMember(currentUser.getId())
239239
.orElseThrow(() -> new ServiceException("404-3", "멘토 정보를 찾을 수 없습니다."));
240240

241241
return MentorMyPageResponse.from(currentUser, mentor);

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

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import com.back.domain.member.member.entity.Member;
55
import com.back.domain.member.member.service.MemberService;
66
import com.back.domain.member.member.verification.EmailVerificationService;
7+
import com.back.domain.member.mentee.entity.Mentee;
8+
import com.back.domain.member.mentee.repository.MenteeRepository;
79
import jakarta.servlet.http.Cookie;
810
import org.junit.jupiter.api.DisplayName;
911
import org.junit.jupiter.api.Test;
@@ -35,33 +37,50 @@ public class MemberAuthControllerTest {
3537
@Autowired
3638
private EmailVerificationService emailVerificationService;
3739

40+
@Autowired
41+
private MenteeRepository menteeRepository;
42+
3843
@Test
39-
@DisplayName("멘티 회원가입")
44+
@DisplayName("멘티 회원가입 - Job이 정상적으로 저장되는지 확인")
4045
void t1() throws Exception {
46+
String email = "[email protected]";
47+
String interestedField = "Backend";
48+
4149
ResultActions resultActions = mvc
4250
.perform(
4351
post("/auth/signup/mentee")
4452
.contentType(MediaType.APPLICATION_JSON)
45-
.content("""
53+
.content(String.format("""
4654
{
47-
"email": "[email protected]",
55+
"email": "%s",
4856
"password": "password123",
4957
"name": "사용자1",
5058
"nickname": "유저1",
51-
"interestedField": "Backend"
59+
"interestedField": "%s"
5260
}
53-
""".stripIndent())
61+
""", email, interestedField).stripIndent())
5462

5563
)
5664
.andDo(print());
57-
Member member = memberService.findByEmail("[email protected]").get();
5865

66+
// 회원가입 성공 확인
5967
resultActions
6068
.andExpect(handler().handlerType(MemberAuthController.class))
6169
.andExpect(handler().methodName("signupMentee"))
6270
.andExpect(status().is2xxSuccessful())
6371
.andExpect(jsonPath("$.resultCode").value("200-1"))
6472
.andExpect(jsonPath("$.msg").value("멘티 회원가입 성공"));
73+
74+
// Member와 Mentee가 정상적으로 생성되었는지 확인
75+
Member member = memberService.findByEmail(email).get();
76+
assertThat(member).isNotNull();
77+
assertThat(member.getRole()).isEqualTo(Member.Role.MENTEE);
78+
79+
// Mentee에 Job이 정상적으로 들어갔는지 확인
80+
Mentee mentee = menteeRepository.findByMemberId(member.getId()).get();
81+
assertThat(mentee).isNotNull();
82+
assertThat(mentee.getJob()).isNotNull();
83+
assertThat(mentee.getJob().getName()).isEqualTo(interestedField);
6584
}
6685

6786
@Test

0 commit comments

Comments
 (0)