Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Refactor] 멤버 필드 수정 #91

Merged
merged 2 commits into from
Jan 19, 2024
Merged

[Refactor] 멤버 필드 수정 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f616ad
refactor: 회원가입 시 이메일 중복 커스텀 익셉션 적용
tjdtn0219 Jan 18, 2024
748dfd6
refatcor: memberName 필드 제거
tjdtn0219 Jan 18, 2024
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
2 changes: 0 additions & 2 deletions src/main/java/kr/co/fastcampus/yanabada/common/security/PrincipalDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@
public record PrincipalDetails(
String email,
String password,
String memberName,
ProviderType provider
) implements UserDetails {

public static PrincipalDetails of(Member member) {
return new PrincipalDetails(member.getEmail(),
member.getPassword(),
member.getMemberName(),
member.getProviderType()
);
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/kr/co/fastcampus/yanabada/domain/auth/dto/request/OauthSignUpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ public record OauthSignUpRequest(
message = "이메일 형식으로 입력해주세요."
)
String email,
@NotEmpty(message = "사용자 이름이 비어있을 수 없습니다")
String memberName,
@NotEmpty(message = "닉네임이 비어있을 수 없습니다")
String nickName,
@NotEmpty(message = "휴대 전화 번호가 비어있을 수 없습니다")
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/kr/co/fastcampus/yanabada/domain/auth/dto/request/SignUpRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ public record SignUpRequest(
message = "패스워드는 영문+숫자+특수문자 8~20 자리이어야 합니다."
)
String password,
@NotEmpty(message = "사용자 이름이 비어있을 수 없습니다")
String memberName,
@NotEmpty(message = "닉네임이 비어있을 수 없습니다")
String nickName,
@NotEmpty(message = "휴대 전화 번호가 비어있을 수 없습니다")
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/kr/co/fastcampus/yanabada/domain/auth/service/AuthService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import static kr.co.fastcampus.yanabada.domain.member.entity.ProviderType.EMAIL;
import static kr.co.fastcampus.yanabada.domain.member.entity.RoleType.ROLE_USER;

import kr.co.fastcampus.yanabada.common.exception.EmailDuplicatedException;
import kr.co.fastcampus.yanabada.common.jwt.dto.TokenIssueResponse;
import kr.co.fastcampus.yanabada.common.jwt.dto.TokenRefreshResponse;
import kr.co.fastcampus.yanabada.common.jwt.service.TokenService;
Expand Down Expand Up @@ -38,13 +39,12 @@ public class AuthService {
@Transactional
public Long signUp(SignUpRequest signUpRequest) {
if (memberRepository.existsByEmailAndProviderType(signUpRequest.email(), EMAIL)) {
throw new RuntimeException("이미 존재하는 이메일"); //todo custom + 닉네임도 중복 체크
throw new EmailDuplicatedException();
}

String encodedPassword = passwordEncoder.encode(signUpRequest.password());
Member member = Member.builder()
.email(signUpRequest.email())
.memberName(signUpRequest.memberName())
.nickName(signUpRequest.nickName())
.password(encodedPassword)
.phoneNumber(signUpRequest.phoneNumber())
Expand All @@ -63,7 +63,6 @@ public Long oauthSignUp(OauthSignUpRequest signUpRequest) {
//todo: 패스워드 환경변수 분리
Member member = Member.builder()
.email(signUpRequest.email())
.memberName(signUpRequest.memberName())
.nickName(signUpRequest.nickName())
.password(encodedPassword)
.phoneNumber(signUpRequest.phoneNumber())
Expand Down
1 change: 0 additions & 1 deletion src/main/java/kr/co/fastcampus/yanabada/domain/member/entity/Member.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public class Member extends BaseEntity {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String email;
private String memberName;
private String nickName;
private String password;
private String phoneNumber;
Expand Down
Loading