Merge pull request #367 from DDD-Community/feat/366/user

Feat/366/user

Author: dyno-jun

app/src/main/java/com/growit/app/user/controller/dto/request/SignUpRequest.java

@@ -20,6 +20,8 @@ public class SignUpRequest {
   @Size(min = 2, message = "{validation.user.name.size}")
   private String name;
 
+  private String lastName;
+
   @NotBlank(message = "{validation.user.job-role.required}")
   private String jobRoleId;
 

app/src/main/java/com/growit/app/user/controller/dto/request/UpdateUserRequest.java

@@ -15,6 +15,8 @@ public class UpdateUserRequest {
   @Size(min = 2, message = "{validation.user.name.size}")
   private String name;
 
+  private String lastName;
+
   @NotBlank(message = "{validation.user.job-role.required}")
   private String jobRoleId;
 

app/src/main/java/com/growit/app/user/controller/mapper/RequestMapper.java

@@ -13,6 +13,7 @@ public SignUpCommand toSignUpCommand(SignUpRequest request) {
         new Email(request.getEmail()),
         request.getPassword(),
         request.getName(),
+        request.getLastName(),
         request.getJobRoleId(),
         request.getCareerYear(),
         null);
@@ -41,6 +42,10 @@ public RequiredConsentCommand toRequiredConsentCommand(RequiredConsentRequest re
 
   public UpdateUserCommand toUpdateUserCommand(User user, UpdateUserRequest request) {
     return new UpdateUserCommand(
-        user, request.getName(), request.getJobRoleId(), request.getCareerYear());
+        user,
+        request.getName(),
+        request.getLastName(),
+        request.getJobRoleId(),
+        request.getCareerYear());
   }
 }

app/src/main/java/com/growit/app/user/domain/user/User.java

@@ -24,6 +24,8 @@ public class User {
 
   private String name;
 
+  private String lastName;
+
   private String jobRoleId;
 
   private CareerYear careerYear;
@@ -43,6 +45,7 @@ public static User from(SignUpCommand command) {
         .email(command.email())
         .password(command.password())
         .name(command.name())
+        .lastName(command.lastName())
         .jobRoleId(command.jobRoleId())
         .careerYear(command.careerYear())
         .isOnboarding(false)
@@ -55,6 +58,7 @@ public static User from(SignUpCommand command) {
 
   public void updateByCommand(UpdateUserCommand command) {
     this.name = command.name();
+    this.lastName = command.lastName();
     this.jobRoleId = command.jobRoleId();
     this.careerYear = command.careerYear();
   }

app/src/main/java/com/growit/app/user/domain/user/dto/SignUpCommand.java

@@ -11,11 +11,12 @@ public record SignUpCommand(
     Email email,
     String password,
     String name,
+    String lastName,
     String jobRoleId,
     CareerYear careerYear,
     OAuth oAuth) {
   public SignUpCommand encodePassword(String password) {
-    return new SignUpCommand(email, password, name, jobRoleId, careerYear, oAuth);
+    return new SignUpCommand(email, password, name, lastName, jobRoleId, careerYear, oAuth);
   }
 
   public void checkOAuth() {

app/src/main/java/com/growit/app/user/domain/user/dto/UpdateUserCommand.java

@@ -3,4 +3,5 @@
 import com.growit.app.user.domain.user.User;
 import com.growit.app.user.domain.user.vo.CareerYear;
 
-public record UpdateUserCommand(User user, String name, String jobRoleId, CareerYear careerYear) {}
+public record UpdateUserCommand(
+    User user, String name, String lastName, String jobRoleId, CareerYear careerYear) {}

app/src/main/java/com/growit/app/user/usecase/SignUpKaKaoUseCase.java

@@ -43,6 +43,7 @@ public void execute(
             new Email(emailFromToken),
             null,
             signUpCommand.name(),
+            null,
             signUpCommand.jobRoleId(),
             signUpCommand.careerYear(),
             oAuth);

app/src/main/resources/db/migration/V27__add_last_name_to_users.sql

@@ -0,0 +1,2 @@
+ALTER TABLE users
+ADD COLUMN last_name VARCHAR(255);

app/src/test/java/com/growit/app/fake/user/UserFixture.java

@@ -46,18 +46,19 @@ public static ReIssueCommand defaultReIssueCommand() {
   }
 
   public static UpdateUserCommand defaultUpdateUserCommand(User user) {
-    return new UpdateUserCommand(user, "updatedName", "jobRoleId-1", CareerYear.JUNIOR);
+    return new UpdateUserCommand(user, "updatedName", null, "jobRoleId-1", CareerYear.JUNIOR);
   }
 
   public static UpdateUserRequest defaultUpdateUserRequest() {
-    return new UpdateUserRequest("updatedName", "jobRoleId-1", CareerYear.JUNIOR);
+    return new UpdateUserRequest("updatedName", null, "jobRoleId-1", CareerYear.JUNIOR);
   }
 
   public static SignUpRequest defaultSignUpRequest() {
     return new SignUpRequest(
         "test@example.com",
         "securePass123",
         "홍길동",
+        null,
         "6rOg7Zmp7IOd",
         CareerYear.JUNIOR,
         new RequiredConsentRequest(true, true));
@@ -125,6 +126,7 @@ public User build() {
         .email(new Email(email))
         .password(password)
         .name(name)
+        .lastName(null)
         .jobRoleId(jobRoleId)
         .careerYear(careerYear)
         .isDeleted(false)

app/src/test/java/com/growit/app/user/controller/AuthControllerTest.java

@@ -90,6 +90,7 @@ void signupTest() throws Exception {
                             fieldWithPath("email").type(STRING).description("사용자 이메일"),
                             fieldWithPath("password").type(STRING).description("사용자 비밀번호"),
                             fieldWithPath("name").type(STRING).description("사용자 이름"),
+                            fieldWithPath("lastName").type(STRING).description("사용자 성").optional(),
                             fieldWithPath("jobRoleId").type(STRING).description("직무 ID"),
                             fieldWithPath("careerYear")
                                 .type(STRING)