Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.back.domain.mentoring.mentoring.controller;

import com.back.domain.member.member.entity.Member;
import com.back.domain.member.member.service.AuthTokenService;
import com.back.domain.member.mentee.entity.Mentee;
import com.back.domain.member.mentor.entity.Mentor;
import com.back.domain.mentoring.mentoring.dto.request.MentoringRequest;
Expand Down Expand Up @@ -45,7 +46,7 @@ class MentoringControllerTest {
@Autowired private MentoringRepository mentoringRepository;
@Autowired private MentorSlotRepository mentorSlotRepository;
@Autowired private ReservationRepository reservationRepository;

@Autowired private AuthTokenService authTokenService;

private static final String TOKEN = "accessToken";
private static final String MENTORING_URL = "/mentoring";
Expand All @@ -66,8 +67,8 @@ void setUp() {
mentee = memberFixture.createMentee(menteeMember);

// JWT 발급
mentorToken = memberFixture.getAccessToken(mentorMember);
menteeToken = memberFixture.getAccessToken(menteeMember);
mentorToken = authTokenService.genAccessToken(mentorMember);
menteeToken = authTokenService.genAccessToken(menteeMember);
}

// ===== 멘토링 다건 조회 ====
Expand Down Expand Up @@ -221,7 +222,7 @@ void createMentoringFailNotMentorRole() throws Exception {
@DisplayName("멘토링 생성 실패 - Mentor 권한이지만 Mentor 엔티티가 없는 경우")
void createMentoringFailNotMentor() throws Exception {
Member mentorMember = memberFixture.createMentorMember();
String token = memberFixture.getAccessToken(mentorMember);
String token = authTokenService.genAccessToken(mentorMember);

performCreateMentoring(token)
.andExpect(status().isNotFound())
Expand Down Expand Up @@ -282,7 +283,7 @@ void updateMentoringSuccess() throws Exception {
@Test
@DisplayName("멘토링 수정 실패 - 멘토링 존재하지 않는 경우")
void updateMentoringFailNotMentoring() throws Exception {
long nonId = -1;
long nonId = Long.MAX_VALUE;

performUpdateMentoring(nonId, mentorToken)
.andExpect(status().isNotFound())
Expand All @@ -298,7 +299,7 @@ void updateMentoringFailNotOwner() throws Exception {
// 다른 멘토
Member otherMentor = memberFixture.createMentorMember();
memberFixture.createMentor(otherMentor);
String token = memberFixture.getAccessToken(otherMentor);
String token = authTokenService.genAccessToken(otherMentor);

performUpdateMentoring(mentoring.getId(), token)
.andExpect(status().isForbidden())
Expand Down Expand Up @@ -372,7 +373,7 @@ void deleteMentoringSuccessExistsMentorSlot() throws Exception {
@Test
@DisplayName("멘토링 삭제 실패 - 멘토링 존재하지 않는 경우")
void deleteMentoringFailNotMentoring() throws Exception {
long nonId = -1;
long nonId = Long.MAX_VALUE;

performDeleteMentoring(nonId, mentorToken)
.andExpect(status().isNotFound())
Expand All @@ -388,7 +389,7 @@ void deleteMentoringFailNotOwner() throws Exception {
// 다른 멘토
Member otherMentor = memberFixture.createMentorMember();
memberFixture.createMentor(otherMentor);
String token = memberFixture.getAccessToken(otherMentor);
String token = authTokenService.genAccessToken(otherMentor);

performDeleteMentoring(mentoring.getId(), token)
.andExpect(status().isForbidden())
Expand Down
37 changes: 8 additions & 29 deletions back/src/test/java/com/back/fixture/MemberTestFixture.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,10 @@
import com.back.domain.member.mentee.repository.MenteeRepository;
import com.back.domain.member.mentor.entity.Mentor;
import com.back.domain.member.mentor.repository.MentorRepository;
import com.back.standard.util.Ut;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Component;

import java.util.Map;

@Component
public class MemberTestFixture {
@Autowired
Expand All @@ -22,40 +18,35 @@ public class MemberTestFixture {
@Autowired private MenteeRepository menteeRepository;
@Autowired private PasswordEncoder passwordEncoder;

@Value("${custom.jwt.secretKey}")
private String jwtSecretKey;

@Value("${custom.accessToken.expirationSeconds}")
private int accessTokenExpiration;

private int counter = 0;

// ===== Member =====

public Member createMember(String email, String name, Member.Role role) {
public Member createMember(String email, String name, String nickName, Member.Role role) {
Member member = new Member(
email,
passwordEncoder.encode("password123"),
name,
nickName,
role
);
return memberRepository.save(member);
}

public Member createMentorMember(String email, String name) {
return createMember(email, name, Member.Role.MENTOR);
public Member createMentorMember(String email, String name, String nickName) {
return createMember(email, name, nickName, Member.Role.MENTOR);
}

public Member createMentorMember() {
return createMentorMember("mentor" + (++counter) + "@test.com", "멘토" + counter);
return createMentorMember("mentor" + (++counter) + "@test.com", "멘토" + counter, "멘토 닉네임" + counter);
}

public Member createMenteeMember(String email, String name) {
return createMember(email, name, Member.Role.MENTEE);
public Member createMenteeMember(String email, String name, String nickName) {
return createMember(email, name, nickName, Member.Role.MENTEE);
}

public Member createMenteeMember() {
return createMenteeMember("mentee" + (++counter) + "@test.com", "멘티" + counter);
return createMenteeMember("mentee" + (++counter) + "@test.com", "멘티" + counter, "멘티 닉네임" + counter);
}


Expand Down Expand Up @@ -89,16 +80,4 @@ public Mentee createMentee(Member member, Long jobId) {
public Mentee createMentee(Member member) {
return createMentee(member, 1L);
}


// ===== Token =====

public String getAccessToken(Member member) {
return Ut.jwt.toString(jwtSecretKey, accessTokenExpiration, Map.of(
"id", member.getId(),
"email", member.getEmail(),
"name", member.getName(),
"role", member.getRole().name()
));
}
}