Skip to content

Commit 2731c87

Browse files
authored
Merge pull request #34 from MT-TEAM-Org/feat/PH-108
feat : 로컬 회원 가입시 상태 ACTIVE 로 지정 되도록 변경
2 parents ba6a4d0 + 0bc49ae commit 2731c87

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

src/main/java/org/myteam/server/member/service/MemberService.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55
import org.myteam.server.global.exception.ErrorCode;
66
import org.myteam.server.global.exception.PlayHiveException;
77
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;
99
import org.myteam.server.member.domain.MemberStatus;
1010
import org.myteam.server.member.dto.*;
11-
import org.myteam.server.member.controller.response.MemberResponse;
1211
import org.myteam.server.member.entity.Member;
1312
import org.myteam.server.member.repository.MemberJpaRepository;
1413
import org.myteam.server.member.repository.MemberRepository;
@@ -50,6 +49,7 @@ public MemberResponse create(MemberSaveRequest memberSaveRequest) throws PlayHiv
5049

5150
// 2. 패스워드인코딩 + 회원 가입
5251
Member member = memberJpaRepository.save(new Member(memberSaveRequest, passwordEncoder));
52+
member.updateStatus(MemberStatus.ACTIVE);
5353

5454
// 4. dto 응답
5555
return new MemberResponse(member);
@@ -133,7 +133,7 @@ public MemberResponse updateRole(MemberRoleUpdateRequest memberRoleUpdateRequest
133133
log.info("playHive updateRole isValid: {}", isValid);
134134

135135
if (!isValid) {
136-
// 빈 Response 객체 반환
136+
// 빈 Response 객체 반환
137137
throw new PlayHiveException(NO_PERMISSION, "인증 키와 패스워드가 일치하지 않습니다");
138138
}
139139

@@ -179,7 +179,8 @@ public void updateStatus(String targetEmail, MemberStatusUpdateRequest memberSta
179179
// 1. 요청자가 본인의 상태를 변경하려는 경우
180180
if (requester.verifyOwnEmail(memberStatusUpdateRequest.getEmail())) {
181181
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 인 경우에만 본인의 상태 변경 가능하도록 처리
183184
requester.updateStatus(memberStatusUpdateRequest.getStatus());
184185
return;
185186
}

0 commit comments

Comments
 (0)