Skip to content

Commit 063dd08

Browse files
dooongdaengdooongdaeng
committed
feat:회원탈퇴
2 parents f5f0437 + 0861ed2 commit 063dd08

File tree

6 files changed

+34
-45
lines changed

6 files changed

+34
-45
lines changed

‎back/src/main/java/com/back/global/init/PostInitData.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@ public void run(ApplicationArguments args) throws Exception {
3838
@Transactional
3939
protected void initPostData() {
4040
if (postRepository.count() > 0) return;
41-
Member member2 = memberService.joinMentee("user2", "사용자1", "닉네임1","password123","");
42-
Member member3 = memberService.joinMentee("user3", "사용자1", "닉네임2","password123", "");
43-
Member member4 = memberService.joinMentee("user4", "사용자1", "닉네임3","password123", "");
44-
Member member5 = memberService.joinMentee("user5", "사용자1", "닉네임4","password123", "");
41+
42+
Member member2 = memberService.joinMentee("user2", "사용자1", "nickname1","password123","");
43+
Member member3 = memberService.joinMentee("user3", "사용자1", "nickname2","password123", "");
44+
Member member4 = memberService.joinMentee("user4", "사용자1", "nickname3","password123", "");
45+
4546
// 여러 종류의 게시글 생성
4647
createPost("정보글 제목", "정보글 내용", member2, Post.PostType.INFORMATIONPOST);
4748
createPost("연습글 제목", "연습글 내용", member3, Post.PostType.PRACTICEPOST);

‎back/src/test/java/com/back/domain/mentoring/mentoring/controller/MentoringControllerTest.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.back.domain.mentoring.mentoring.controller;
22

33
import com.back.domain.member.member.entity.Member;
4+
import com.back.domain.member.member.service.AuthTokenService;
45
import com.back.domain.member.mentee.entity.Mentee;
56
import com.back.domain.member.mentor.entity.Mentor;
67
import com.back.domain.mentoring.mentoring.dto.request.MentoringRequest;
@@ -45,7 +46,7 @@ class MentoringControllerTest {
4546
@Autowired private MentoringRepository mentoringRepository;
4647
@Autowired private MentorSlotRepository mentorSlotRepository;
4748
@Autowired private ReservationRepository reservationRepository;
48-
49+
@Autowired private AuthTokenService authTokenService;
4950

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

6869
// JWT 발급
69-
mentorToken = memberFixture.getAccessToken(mentorMember);
70-
menteeToken = memberFixture.getAccessToken(menteeMember);
70+
mentorToken = authTokenService.genAccessToken(mentorMember);
71+
menteeToken = authTokenService.genAccessToken(menteeMember);
7172
}
7273

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

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

287288
performUpdateMentoring(nonId, mentorToken)
288289
.andExpect(status().isNotFound())
@@ -298,7 +299,7 @@ void updateMentoringFailNotOwner() throws Exception {
298299
// 다른 멘토
299300
Member otherMentor = memberFixture.createMentorMember();
300301
memberFixture.createMentor(otherMentor);
301-
String token = memberFixture.getAccessToken(otherMentor);
302+
String token = authTokenService.genAccessToken(otherMentor);
302303

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

377378
performDeleteMentoring(nonId, mentorToken)
378379
.andExpect(status().isNotFound())
@@ -388,7 +389,7 @@ void deleteMentoringFailNotOwner() throws Exception {
388389
// 다른 멘토
389390
Member otherMentor = memberFixture.createMentorMember();
390391
memberFixture.createMentor(otherMentor);
391-
String token = memberFixture.getAccessToken(otherMentor);
392+
String token = authTokenService.genAccessToken(otherMentor);
392393

393394
performDeleteMentoring(mentoring.getId(), token)
394395
.andExpect(status().isForbidden())

‎back/src/test/java/com/back/domain/post/comment/PostCommentControllerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,15 @@ public class PostCommentControllerTest {
4949

5050
@BeforeEach
5151
void setUp() {
52-
Member member = memberService.joinMentee("user1", "사용자1", "password123", "" );
52+
Member member = memberService.joinMentee("user1", "사용자1", "nickname4","password123", "" );
5353

5454
// SecurityContext에 인증 정보 설정
5555
SecurityUser securityUser = new SecurityUser(
5656
member.getId(),
5757
member.getEmail(),
5858
member.getPassword(),
5959
member.getName(),
60+
member.getNickname(),
6061
List.of(new SimpleGrantedAuthority("ROLE_" + member.getRole().name()))
6162
);
6263

‎back/src/test/java/com/back/domain/post/post/controller/InformationPostControllerTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,15 @@ public class InformationPostControllerTest {
4545

4646
@BeforeEach
4747
void setUp() {
48-
Member member = memberService.joinMentee("user1", "사용자1", "password123", "");
48+
Member member = memberService.joinMentee("user1", "사용자1", "nickname19","password123", "");
4949

5050
// SecurityContext에 인증 정보 설정
5151
SecurityUser securityUser = new SecurityUser(
5252
member.getId(),
5353
member.getEmail(),
5454
member.getPassword(),
5555
member.getName(),
56+
member.getNickname(),
5657
List.of(new SimpleGrantedAuthority("ROLE_" + member.getRole().name()))
5758
);
5859

‎back/src/test/java/com/back/fixture/MemberFixture.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class MemberFixture {
66
private String email = "[email protected]";
77
private String password = "password123";
88
private String name = "Test User";
9+
private String nickname = "Test Nickname";
910
private Member.Role role = Member.Role.MENTEE;
1011
private Long id = null;
1112

@@ -60,10 +61,15 @@ public MemberFixture withId(Long id) {
6061
return this;
6162
}
6263

64+
public MemberFixture withNickname(String nickname) {
65+
this.nickname = nickname;
66+
return this;
67+
}
68+
6369
public Member build() {
6470
if (id != null) {
65-
return new Member(id, email, name, role);
71+
return new Member(id, email, name, nickname, role);
6672
}
67-
return new Member(email, password, name, role);
73+
return new Member(email, password, name, nickname, role);
6874
}
6975
}

‎back/src/test/java/com/back/fixture/MemberTestFixture.java‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,10 @@
66
import com.back.domain.member.mentee.repository.MenteeRepository;
77
import com.back.domain.member.mentor.entity.Mentor;
88
import com.back.domain.member.mentor.repository.MentorRepository;
9-
import com.back.standard.util.Ut;
109
import org.springframework.beans.factory.annotation.Autowired;
11-
import org.springframework.beans.factory.annotation.Value;
1210
import org.springframework.security.crypto.password.PasswordEncoder;
1311
import org.springframework.stereotype.Component;
1412

15-
import java.util.Map;
16-
1713
@Component
1814
public class MemberTestFixture {
1915
@Autowired
@@ -22,40 +18,35 @@ public class MemberTestFixture {
2218
@Autowired private MenteeRepository menteeRepository;
2319
@Autowired private PasswordEncoder passwordEncoder;
2420

25-
@Value("${custom.jwt.secretKey}")
26-
private String jwtSecretKey;
27-
28-
@Value("${custom.accessToken.expirationSeconds}")
29-
private int accessTokenExpiration;
30-
3121
private int counter = 0;
3222

3323
// ===== Member =====
3424

35-
public Member createMember(String email, String name, Member.Role role) {
25+
public Member createMember(String email, String name, String nickName, Member.Role role) {
3626
Member member = new Member(
3727
email,
3828
passwordEncoder.encode("password123"),
3929
name,
30+
nickName,
4031
role
4132
);
4233
return memberRepository.save(member);
4334
}
4435

45-
public Member createMentorMember(String email, String name) {
46-
return createMember(email, name, Member.Role.MENTOR);
36+
public Member createMentorMember(String email, String name, String nickName) {
37+
return createMember(email, name, nickName, Member.Role.MENTOR);
4738
}
4839

4940
public Member createMentorMember() {
50-
return createMentorMember("mentor" + (++counter) + "@test.com", "멘토" + counter);
41+
return createMentorMember("mentor" + (++counter) + "@test.com", "멘토" + counter, "멘토 닉네임" + counter);
5142
}
5243

53-
public Member createMenteeMember(String email, String name) {
54-
return createMember(email, name, Member.Role.MENTEE);
44+
public Member createMenteeMember(String email, String name, String nickName) {
45+
return createMember(email, name, nickName, Member.Role.MENTEE);
5546
}
5647

5748
public Member createMenteeMember() {
58-
return createMenteeMember("mentee" + (++counter) + "@test.com", "멘티" + counter);
49+
return createMenteeMember("mentee" + (++counter) + "@test.com", "멘티" + counter, "멘티 닉네임" + counter);
5950
}
6051

6152

@@ -89,16 +80,4 @@ public Mentee createMentee(Member member, Long jobId) {
8980
public Mentee createMentee(Member member) {
9081
return createMentee(member, 1L);
9182
}
92-
93-
94-
// ===== Token =====
95-
96-
public String getAccessToken(Member member) {
97-
return Ut.jwt.toString(jwtSecretKey, accessTokenExpiration, Map.of(
98-
"id", member.getId(),
99-
"email", member.getEmail(),
100-
"name", member.getName(),
101-
"role", member.getRole().name()
102-
));
103-
}
10483
}

0 commit comments

Comments
 (0)