🔀 :: (#574) isStudent 추가 (#575)

* ♻️ :: isStudent 추가

* ♻️ :: isStudent에 따라 이름, 전화번호 저장 코드 리팩토링

* ♻️ :: message 내용 수정

src/main/java/kr/hs/entrydsm/rollsroyce/domain/application/presentation/dto/request/ChangeInformationRequest.java

@@ -23,6 +23,12 @@ public class ChangeInformationRequest {
 
     @NotNull(message = "birthday는 Null을 허용하지 않습니다.") private LocalDate birthday;
 
+    @Length(max = 5, message = "TOO LONG NAME") private String name;
+
+    @NotEmpty(message = "telephone_number은 Null 또는 공백을 허용하지 않습니다.")
+    @Length(max = 11) @Pattern(regexp = TEL_REGEXP, message = "INVALID TEL")
+    private String telephoneNumber;
+
     @Length(max = 5, message = "TOO LONG NAME") private String parentName;
 
     @NotEmpty(message = "parent_tel은 Null 또는 공백을 허용하지 않습니다.")
@@ -32,7 +38,7 @@ public class ChangeInformationRequest {
     @NotEmpty(message = "address는 Null 또는 공백을 허용하지 않습니다.")
     @Length(max = 300, message = "TOO LONG ADDRESS") private String address;
 
-    @NotEmpty(message = "detailAddress는 Null 또는 공백을 허용하지 않습니다.")
+    @NotEmpty(message = "detail_address는 Null 또는 공백을 허용하지 않습니다.")
     @Length(max = 100, message = "TOO LONG DETAIL_ADDRESS") private String detailAddress;
 
     @Length(min = 5, max = 5, message = "INVALID POST_CODE") private String postCode;

src/main/java/kr/hs/entrydsm/rollsroyce/domain/application/presentation/dto/response/QueryUserInfoResponse.java

@@ -8,4 +8,5 @@
 public class QueryUserInfoResponse {
     private final String name;
     private final String telephoneNumber;
+    private final Boolean isStudent;
 }

src/main/java/kr/hs/entrydsm/rollsroyce/domain/application/service/ChangeInformationService.java

@@ -42,6 +42,8 @@ public void execute(ChangeInformationRequest request) {
         if (distance.getFeatures().isEmpty()) throw RequestFailToTmapServerException.EXCEPTION;
 
         entryInfo.updateEntryInformation(UpdateUserInformationDto.builder()
+                .name(request.getName())
+                .telephoneNumber(request.getTelephoneNumber())
                 .sex(EnumUtil.getEnum(Sex.class, request.getSex()))
                 .birthday(request.getBirthday())
                 .parentName(request.getParentName())

src/main/java/kr/hs/entrydsm/rollsroyce/domain/application/service/QueryUserInfoService.java

@@ -17,6 +17,6 @@ public class QueryUserInfoService {
     @Transactional(readOnly = true)
     public QueryUserInfoResponse execute() {
         User user = userFacade.getCurrentUser();
-        return new QueryUserInfoResponse(user.getName(), user.getTelephoneNumber());
+        return new QueryUserInfoResponse(user.getName(), user.getTelephoneNumber(), user.getIsStudent());
     }
 }

src/main/java/kr/hs/entrydsm/rollsroyce/domain/entryinfo/domain/EntryInfo.java

@@ -1,12 +1,23 @@
 package kr.hs.entrydsm.rollsroyce.domain.entryinfo.domain;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 
 import org.hibernate.annotations.DynamicInsert;
 
 import java.time.LocalDate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToOne;
 
 import kr.hs.entrydsm.rollsroyce.domain.application.domain.Application;
 import kr.hs.entrydsm.rollsroyce.domain.application.domain.Graduation;
@@ -30,6 +41,12 @@ public class EntryInfo {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long receiptCode;
 
+    @Column(columnDefinition = "char(5)")
+    private String name;
+
+    @Column(columnDefinition = "char(11)")
+    private String telephoneNumber;
+
     @Enumerated(EnumType.STRING)
     @Column(columnDefinition = "char(7)")
     private ApplicationType applicationType;
@@ -91,6 +108,16 @@ public EntryInfo(User user) {
         this.user = user;
     }
 
+    public void updateUserNameAndTel(String name, String telephoneNumber) {
+        this.name = name;
+        this.telephoneNumber = telephoneNumber;
+    }
+
+    public void updateParentNameAndTel(String parentName, String parentTel) {
+        this.parentName = parentTel;
+        this.parentTel = parentTel;
+    }
+
     public void updateUserApplication(ChangeTypeRequest request) {
         this.educationalStatus = EnumUtil.getEnum(EducationalStatus.class, request.getEducationalStatus());
         this.applicationType = EnumUtil.getEnum(ApplicationType.class, request.getApplicationType());
@@ -100,6 +127,8 @@ public void updateUserApplication(ChangeTypeRequest request) {
     }
 
     public void updateEntryInformation(UpdateUserInformationDto information) {
+        this.name = information.getName();
+        this.telephoneNumber = information.getTelephoneNumber();
         this.sex = information.getSex();
         this.birthday = information.getBirthday();
         this.parentName = information.getParentName();

src/main/java/kr/hs/entrydsm/rollsroyce/domain/entryinfo/service/CreateEntryInfoService.java

@@ -30,6 +30,12 @@ public void execute() {
         EntryInfo entryInfo =
                 entryInfoRepository.save(EntryInfo.builder().user(user).build());
 
+        if (user.getIsStudent()) {
+            entryInfo.updateUserNameAndTel(user.getName(), user.getTelephoneNumber());
+        } else {
+            entryInfo.updateParentNameAndTel(user.getName(), user.getTelephoneNumber());
+        }
+
         statusRepository.save(Status.builder()
                 .entryInfo(entryInfo)
                 .isPrintsArrived(false)

src/main/java/kr/hs/entrydsm/rollsroyce/domain/user/domain/User.java

@@ -35,14 +35,18 @@ public class User extends BaseTimeEntity {
     @Column(columnDefinition = "char(5)", nullable = false)
     private String name;
 
+    @Column(columnDefinition = "bit(1) default 1", nullable = false)
+    private Boolean isStudent;
+
     @OneToOne(fetch = FetchType.LAZY, mappedBy = "user", cascade = CascadeType.ALL)
     private EntryInfo entryInfo;
 
     @Builder
-    public User(String telephoneNumber, String password, String name, EntryInfo entryInfo) {
+    public User(String telephoneNumber, String password, String name, Boolean isStudent, EntryInfo entryInfo) {
         this.telephoneNumber = telephoneNumber;
         this.password = password;
         this.name = name;
+        this.isStudent = isStudent;
         this.entryInfo = entryInfo;
     }
 

src/main/java/kr/hs/entrydsm/rollsroyce/domain/user/presentation/dto/request/SignupRequest.java

@@ -5,6 +5,7 @@
 import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
 
 @Getter
@@ -20,4 +21,6 @@ public class SignupRequest {
                     "(?=.*[a-z])(?=.*[0-9])(?=.*[!#$%&'()*+,./:;<=>?@＼^_`{|}~])[a-zA-Z0-9!#$%&'()*+,./:;<=>?@＼^_`{|}~]{8,32}$",
             message = "password는 소문자, 숫자, 특수문자가 포함되어야 합니다.")
     private String password;
+
+    @NotNull private Boolean isStudent;
 }

src/main/java/kr/hs/entrydsm/rollsroyce/domain/user/service/UserSignupService.java

@@ -46,6 +46,7 @@ public TokenResponse execute(SignupRequest request) {
                 .name(passInfo.getName())
                 .telephoneNumber(telephoneNumber)
                 .password(password)
+                .isStudent(request.getIsStudent())
                 .build());
 
         return tokenProvider.generateToken(user.getTelephoneNumber(), Role.USER.toString());