AYS-221 | Validations of EmergencyEvacuationApplicationRequest Have Been Fixed (#324)

Author: agitrubard

src/main/java/org/ays/common/model/request/AysPhoneNumberRequest.java

@@ -3,6 +3,7 @@
 import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
+import org.apache.commons.lang3.StringUtils;
 import org.ays.common.util.AysJsonUtil;
 import org.ays.common.util.validation.PhoneNumber;
 
@@ -34,8 +35,8 @@ public String toString() {
         return AysJsonUtil.toJson(this);
     }
 
-    public boolean isEmpty() {
-        return this.countryCode == null && this.lineNumber == null;
+    public boolean isBlank() {
+        return StringUtils.isBlank(this.countryCode) && StringUtils.isBlank(this.lineNumber);
     }
 
 }

src/main/java/org/ays/common/util/validation/NameValidator.java

@@ -24,7 +24,7 @@ class NameValidator implements ConstraintValidator<Name, String> {
      * </p>
      * <p>
      */
-    private static final String NAME_REGEX = "^(?![^a-zA-ZÇçĞğİıÖöŞşÜü]).*[a-zA-ZÇçĞğİıÖöŞşÜü ,.'-]+$";
+    private static final String NAME_REGEX = "^(?![^a-zA-ZÇçĞğİıÖöŞşÜü])[a-zA-ZÇçĞğİıÖöŞşÜü ,.'-]*$";
     private static final Integer NAME_MIN_LENGTH = 2;
     private static final Integer NAME_MAX_LENGTH = 100;
 
@@ -45,6 +45,8 @@ class NameValidator implements ConstraintValidator<Name, String> {
      *     <li>Ahmet?*</li>
      *     <li>Mehmet!</li>
      *     <li>A</li>
+     *     <li>123</li>
+     *     <li>Mary*land</li>
      * </ul>
      *
      * @param value   object to validate

src/main/java/org/ays/emergency_application/model/request/EmergencyEvacuationApplicationRequest.java

@@ -78,9 +78,9 @@ private boolean isAllApplicantFieldsFilled() {
             return true;
         }
 
-        return !StringUtils.isEmpty(this.applicantFirstName) && !StringUtils.isEmpty(this.applicantLastName)
+        return !StringUtils.isBlank(this.applicantFirstName) && !StringUtils.isBlank(this.applicantLastName)
                 &&
-                this.applicantPhoneNumber != null && !this.applicantPhoneNumber.isEmpty();
+                this.applicantPhoneNumber != null && !this.applicantPhoneNumber.isBlank();
     }
 
     @JsonIgnore

src/test/java/org/ays/emergency_application/controller/EmergencyEvacuationApplicationControllerTest.java

@@ -571,6 +571,9 @@ void givenInvalidEmergencyEvacuationApplicationRequest_whenPhoneNumberIsNotValid
     @ParameterizedTest
     @ValueSource(strings = {
             "",
+            "Mary*land",
+            "Mary$land",
+            "CityName$",
             "Invalid with special characters: #$%",
             "#$½#$£#$£#$$#½#£$£#$#£½#$½#$½$£#$#£$$#½#$$½",
             ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,",
@@ -606,6 +609,9 @@ void givenInvalidEmergencyEvacuationApplicationRequest_whenSourceCityIsNotValid_
     @ParameterizedTest
     @ValueSource(strings = {
             "",
+            "Mary*land",
+            "Mary$land",
+            "CityName$",
             "Invalid with special characters: #$%",
             "#$½#$£#$£#$$#½#£$£#$#£½#$½#$½$£#$#£$$#½#$$½",
             ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,",
@@ -697,6 +703,9 @@ void givenInvalidEmergencyEvacuationApplicationRequest_whenAddressIsNotValid_the
     @ParameterizedTest
     @ValueSource(strings = {
             "",
+            "Mary*land",
+            "Mary$land",
+            "CityName$",
             "Invalid with special characters: #$%",
             "#$½#$£#$£#$$#½#£$£#$#£½#$½#$½$£#$#£$$#½#$$½",
             ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,",
@@ -732,6 +741,9 @@ void givenInvalidEmergencyEvacuationApplicationRequest_whenTargetCityIsNotValid_
     @ParameterizedTest
     @ValueSource(strings = {
             "",
+            "Mary*land",
+            "Mary$land",
+            "CityName$",
             "Invalid with special characters: #$%",
             "#$½#$£#$£#$$#½#£$£#$#£½#$½#$½$£#$#£$$#½#$$½",
             ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,",
@@ -740,7 +752,7 @@ void givenInvalidEmergencyEvacuationApplicationRequest_whenTargetCityIsNotValid_
             "151201485621548562154851458614125461254125412",
             "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam In hac habitasse platea dictumst. Nullam in turpis at nunc ultrices.",
     })
-    void givenInvalidEmergencyEvacuationApplicationRequest_whenSourceTargetIsNotValid_thenReturnValidationError(String targetDistrict) throws Exception {
+    void givenInvalidEmergencyEvacuationApplicationRequest_whenTargetDistrictIsNotValid_thenReturnValidationError(String targetDistrict) throws Exception {
         // Given
         EmergencyEvacuationApplicationRequest mockApplicationRequest = new EmergencyEvacuationRequestBuilder()
                 .withValidValues()
@@ -766,6 +778,7 @@ void givenInvalidEmergencyEvacuationApplicationRequest_whenSourceTargetIsNotVali
 
     @ParameterizedTest
     @ValueSource(strings = {
+            "    ",
             "Invalid with special characters: #$%",
             "#$½#$£#$£#$$#½#£$£#$#£½#$½#$½$£#$#£$$#½#$$½",
             ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,",
@@ -800,6 +813,7 @@ void givenInvalidEmergencyEvacuationApplicationRequest_whenApplicantFirstNameIsN
 
     @ParameterizedTest
     @ValueSource(strings = {
+            "    ",
             "Invalid with special characters: #$%",
             "#$½#$£#$£#$$#½#£$£#$#£½#$½#$½$£#$#£$$#½#$$½",
             ".,..,.,.,.,.,,.,.,.,.,.,.,.,.,..,.,.,,.,.,.,",