|
5 | 5 | import org.myteam.server.global.exception.ErrorCode; |
6 | 6 | import org.myteam.server.global.exception.PlayHiveException; |
7 | 7 | import org.myteam.server.global.security.jwt.JwtProvider; |
8 | | -import org.myteam.server.member.domain.MemberRole; |
| 8 | +import org.myteam.server.member.controller.response.MemberResponse; |
9 | 9 | import org.myteam.server.member.domain.MemberStatus; |
10 | 10 | import org.myteam.server.member.dto.*; |
11 | | -import org.myteam.server.member.controller.response.MemberResponse; |
12 | 11 | import org.myteam.server.member.entity.Member; |
13 | 12 | import org.myteam.server.member.repository.MemberJpaRepository; |
14 | 13 | import org.myteam.server.member.repository.MemberRepository; |
@@ -50,6 +49,7 @@ public MemberResponse create(MemberSaveRequest memberSaveRequest) throws PlayHiv |
50 | 49 |
|
51 | 50 | // 2. 패스워드인코딩 + 회원 가입 |
52 | 51 | Member member = memberJpaRepository.save(new Member(memberSaveRequest, passwordEncoder)); |
| 52 | + member.updateStatus(MemberStatus.ACTIVE); |
53 | 53 |
|
54 | 54 | // 4. dto 응답 |
55 | 55 | return new MemberResponse(member); |
@@ -133,7 +133,7 @@ public MemberResponse updateRole(MemberRoleUpdateRequest memberRoleUpdateRequest |
133 | 133 | log.info("playHive updateRole isValid: {}", isValid); |
134 | 134 |
|
135 | 135 | if (!isValid) { |
136 | | - // 빈 Response 객체 반환 |
| 136 | + // 빈 Response 객체 반환 |
137 | 137 | throw new PlayHiveException(NO_PERMISSION, "인증 키와 패스워드가 일치하지 않습니다"); |
138 | 138 | } |
139 | 139 |
|
@@ -179,7 +179,8 @@ public void updateStatus(String targetEmail, MemberStatusUpdateRequest memberSta |
179 | 179 | // 1. 요청자가 본인의 상태를 변경하려는 경우 |
180 | 180 | if (requester.verifyOwnEmail(memberStatusUpdateRequest.getEmail())) { |
181 | 181 | log.info("사용자가 자신의 상태를 변경 중: {}", targetEmail); |
182 | | - if (!requester.getStatus().equals(MemberStatus.PENDING)) throw new PlayHiveException(NO_PERMISSION); // PENDING 인 경우에만 본인의 상태 변경 가능하도록 처리 |
| 182 | + if (!requester.getStatus().equals(MemberStatus.PENDING)) |
| 183 | + throw new PlayHiveException(NO_PERMISSION); // PENDING 인 경우에만 본인의 상태 변경 가능하도록 처리 |
183 | 184 | requester.updateStatus(memberStatusUpdateRequest.getStatus()); |
184 | 185 | return; |
185 | 186 | } |
|
0 commit comments