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.

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

Be/#95 user 생성 로직 지역 삭제 #96

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open
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
Expand Up @@ -18,7 +18,5 @@ public class UserCreateRequest {
private String password;
@NotNull
private String email;
@NotNull
private String location;

}
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,5 @@ public class UserUpdateRequest {
@NotBlank
private String password;
private String email;
private String location;

}
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@ public class User implements Auditable {
@Column(nullable = false)
private String email;

@Column(nullable = false)
private String location;

private String refreshToken;

Expand All @@ -53,19 +51,17 @@ public class User implements Auditable {
private boolean isDeleted = false;

@Builder
public User(String username, String password, String email, String location, String refreshToken){
public User(String username, String password, String email, String refreshToken){
this.username = username;
this.password = password;
this.email = email;
this.location = location;
this.refreshToken = refreshToken;
}

public void update(UserUpdateRequest request){
this.username = request.getUsername();
this.password = request.getPassword();
this.email = request.getEmail();
this.location = request.getLocation();
}

public void refreshTokenUpdate(UserRefreshTokenRequest request){
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ public User toEntity(UserCreateRequest request) {
.username(request.getUsername())
.password(request.getPassword())
.email(request.getEmail())
.location(request.getLocation())
.build();
}

Expand All @@ -38,7 +37,6 @@ public UserResponse toResponse(User user) {
.id(user.getId())
.username(user.getUsername())
.email(user.getEmail())
.location(user.getLocation())
.build();
}

Expand Down