Merge pull request #101 from Bamdoliro/fix/#100

[버그] 고입 검정 학생의 학교, 선생님 정보에 대한 null 값 처리
Bamdoliro · Jul 12, 2024 · b76fbbc · b76fbbc
2 parents d95685e + 06fdfda
commit b76fbbc
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 26 deletions.
diff --git a/src/main/java/com/bamdoliro/maru/domain/form/domain/value/PhoneNumber.java b/src/main/java/com/bamdoliro/maru/domain/form/domain/value/PhoneNumber.java
@@ -16,6 +16,9 @@ public class PhoneNumber {
 
     @Override
     public String toString() {
+        if (value == null) {
+            return "";
+        }
         if (value.length() == 10) {
             return value.substring(0, 3) + "-" + value.substring(3, 6) + "-" + value.substring(6);
         } else if (value.length() == 11) {

diff --git a/src/main/java/com/bamdoliro/maru/domain/form/domain/value/School.java b/src/main/java/com/bamdoliro/maru/domain/form/domain/value/School.java
@@ -13,16 +13,16 @@
 @Embeddable
 public class School {
 
-    @Column(name = "school_name", nullable = false, length = 20)
+    @Column(name = "school_name", nullable = true, length = 20)
     private String name;
 
-    @Column(name = "school_location", nullable = false, length = 20)
+    @Column(name = "school_location", nullable = true, length = 20)
     private String location;
 
-    @Column(name = "school_address", nullable = false, length = 40)
+    @Column(name = "school_address", nullable = true, length = 40)
     private String address;
 
-    @Column(name = "school_code", nullable = false, length = 10)
+    @Column(name = "school_code", nullable = true, length = 10)
     private String code;
 
     public boolean isBusan() {

diff --git a/src/main/java/com/bamdoliro/maru/presentation/form/dto/request/EducationRequest.java b/src/main/java/com/bamdoliro/maru/presentation/form/dto/request/EducationRequest.java
@@ -25,19 +25,19 @@ public class EducationRequest {
     @Size(min = 4, max = 4, message = "4자여야 합니다.")
     private String graduationYear;
 
-    @NotBlank(message = "필수값입니다.")
+    @Nullable
     @Size(max = 20, message = "20자 이하여야 합니다.")
     private String schoolName;
 
-    @NotBlank(message = "필수값입니다.")
+    @Nullable
     @Size(max = 20, message = "20자 이하여야 합니다.")
     private String schoolLocation;
 
-    @NotBlank(message = "필수값입니다.")
+    @Nullable
     @Size(max = 40, message = "40자 이하여야 합니다.")
     private String schoolAddress;
 
-    @NotBlank(message = "필수값입니다.")
+    @Nullable
     @Size(min = 7, max = 7, message = "7자여야 합니다.")
     private String schoolCode;
 

diff --git a/src/main/java/com/bamdoliro/maru/presentation/form/dto/response/EducationResponse.java b/src/main/java/com/bamdoliro/maru/presentation/form/dto/response/EducationResponse.java
@@ -26,8 +26,8 @@ public EducationResponse(Education education) {
         this.schoolLocation = education.getSchool().getLocation();
         this.schoolAddress = education.getSchool().getAddress();
         this.schoolCode = education.getSchool().getCode();
-        this.schoolPhoneNumber = education.getTeacher().getPhoneNumber().toString();
+        this.schoolPhoneNumber = education.getTeacher().getPhoneNumber().toString().isEmpty() ? null : education.getTeacher().getPhoneNumber().toString();
         this.teacherName = education.getTeacher().getName();
-        this.teacherMobilePhoneNumber = education.getTeacher().getMobilePhoneNumber().toString();
+        this.teacherMobilePhoneNumber = education.getTeacher().getMobilePhoneNumber().toString().isEmpty() ? null : education.getTeacher().getMobilePhoneNumber().toString();
     }
 }
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -8,6 +8,8 @@ spring:
     properties:
       hibernate:
         format_sql: true
+        create_empty_composites:
+          enabled: true
 
     generate-ddl: true
     hibernate:

diff --git a/src/test/java/com/bamdoliro/maru/presentation/form/FormControllerTest.java b/src/test/java/com/bamdoliro/maru/presentation/form/FormControllerTest.java
@@ -134,19 +134,19 @@ class FormControllerTest extends RestDocsTestSupport {
                                         .description("<<graduation-type,졸업 유형>>"),
                                 fieldWithPath("education.graduationYear")
                                         .type(JsonFieldType.STRING)
-                                        .description("졸업 연도"),
+                                        .description("졸업 연도, 합격 연도"),
                                 fieldWithPath("education.schoolName")
                                         .type(JsonFieldType.STRING)
-                                        .description("출신 학교 이름"),
+                                        .description("출신 학교 이름  (없는 경우 null)"),
                                 fieldWithPath("education.schoolLocation")
                                         .type(JsonFieldType.STRING)
-                                        .description("출신 학교 지역"),
+                                        .description("출신 학교 지역 (없는 경우 null)"),
                                 fieldWithPath("education.schoolAddress")
                                         .type(JsonFieldType.STRING)
-                                        .description("출신 학교 주소지"),
+                                        .description("출신 학교 주소지 (없는 경우 null)"),
                                 fieldWithPath("education.schoolCode")
                                         .type(JsonFieldType.STRING)
-                                        .description("출신 학교 코드"),
+                                        .description("출신 학교 코드 (없는 경우 null)"),
                                 fieldWithPath("education.teacherName")
                                         .type(JsonFieldType.STRING)
                                         .description("작성 교사 (없는 경우 null)"),

diff --git a/src/test/java/com/bamdoliro/maru/shared/fixture/FormFixture.java b/src/test/java/com/bamdoliro/maru/shared/fixture/FormFixture.java
@@ -218,7 +218,7 @@ public static Form createRandomQualificationExaminationForm(User user) {
                 new Education(
                         GraduationType.QUALIFICATION_EXAMINATION,
                         "2021",
-                        new School("비전중학교", "경기도", "경기도 비전시 비전구 비전로 1", "7631003"),
+                        null,
                         null
                 ),
                 new Grade(
@@ -286,12 +286,7 @@ public static Form createQualificationExaminationForm(FormType type) {
                 new Education(
                         GraduationType.QUALIFICATION_EXAMINATION,
                         "2021",
-                        new School(
-                                "비전중학교",
-                                "경기도",
-                                "경기도 비전시 비전구 비전로 1",
-                                "7631003"
-                        ),
+                        null,
                         null
                 ),
                 new Grade(
@@ -369,10 +364,10 @@ public static SubmitFormRequest createQualificationExaminationFormRequest(FormTy
                 new EducationRequest(
                         GraduationType.QUALIFICATION_EXAMINATION,
                         "2021",
-                        "비전중학교",
-                        "경기도",
-                        "경기도 비전시 비전구 비전로 1",
-                        "7631003",
+                        null,
+                        null,
+                        null,
+                        null,
                         null,
                         null,
                         null