AYS-661 | Refactor email validation limits

src/main/java/org/ays/auth/model/request/AdminRegistrationApplicationCompleteRequest.java

@@ -39,7 +39,6 @@ public class AdminRegistrationApplicationCompleteRequest {
 
     @EmailAddress
     @NotBlank
-    @Size(min = 2, max = 255)
     private String emailAddress;
 
     @NotBlank

src/main/java/org/ays/auth/model/request/AysPasswordForgotRequest.java

@@ -12,7 +12,6 @@ public class AysPasswordForgotRequest {
 
     @EmailAddress
     @NotBlank
-    @Size(min = 2, max = 255)
     private String emailAddress;
 
 }

src/main/java/org/ays/auth/model/request/AysUserCreateRequest.java

@@ -38,7 +38,6 @@ public class AysUserCreateRequest {
 
     @EmailAddress
     @NotBlank
-    @Size(min = 2, max = 255)
     private String emailAddress;
 
     @Valid

src/main/java/org/ays/auth/model/request/AysUserUpdateRequest.java

@@ -36,7 +36,6 @@ public class AysUserUpdateRequest {
 
     @EmailAddress
     @NotBlank
-    @Size(min = 2, max = 255)
     private String emailAddress;
 
     @Valid

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

@@ -30,6 +30,7 @@ class EmailAddressValidator implements ConstraintValidator<EmailAddress, String>
      *     <li>u@[email protected]</li>
      *     <li>[email protected]</li>
      *     <li>user</li>
+     *     <li>[email protected]</li>
      * </ul>
      *
      * @param email object to validate

src/main/java/org/ays/emergency_application/model/EmergencyEvacuationApplication.java

@@ -12,7 +12,8 @@
 
 /**
  * Represents an emergency evacuation application.
- * Extends {@link BaseDomainModel} and includes details such as personal and contact information,
+ * Extends {@link BaseDomainModel} and includes details such as personal and
+ * contact information,
  * location details, and application status.
  */
 @Getter
@@ -42,7 +43,6 @@ public class EmergencyEvacuationApplication extends BaseDomainModel {
 
     private Institution institution;
 
-
     /**
      * Checks if the application does not have an associated institution.
      *
@@ -62,7 +62,6 @@ public boolean isInstitutionOwner(final String institutionId) {
         return this.institution.getId().equals(institutionId);
     }
 
-
     /**
      * Marks the emergency evacuation application as pending.
      * Generates a reference number and updates the status to pending.
@@ -72,12 +71,14 @@ public void pending() {
         this.referenceNumber = AysRandomUtil.generateNumber(10).toString();
         this.status = EmergencyEvacuationApplicationStatus.PENDING;
         this.isInPerson = this.applicantPhoneNumber == null;
+        this.hasObstaclePersonExist = null;
     }
 
     /**
      * Sets the institution ID for the application.
      *
-     * @param institutionId the ID of the institution to associate with the application.
+     * @param institutionId the ID of the institution to associate with the
+     *                      application.
      */
     public void setInstitutionId(final String institutionId) {
         this.institution = Institution.builder()

src/main/java/org/ays/emergency_application/model/entity/EmergencyEvacuationApplicationEntity.java

@@ -21,7 +21,8 @@
 
 /**
  * A JPA entity class that represents an emergency evacuation entity.
- * The emergency evacuation applications are defined in the AYS_EMERGENCY_EVACUATION_APPLICATION table in the database.
+ * The emergency evacuation applications are defined in the
+ * AYS_EMERGENCY_EVACUATION_APPLICATION table in the database.
  */
 @Entity
 @Getter
@@ -98,7 +99,6 @@ public class EmergencyEvacuationApplicationEntity extends BaseEntity {
     @Column(name = "NOTES")
     private String notes;
 
-
     @OneToOne
     @JoinColumn(name = "INSTITUTION_ID", insertable = false, updatable = false)
     private InstitutionEntity institution;

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

@@ -13,10 +13,11 @@
 import org.ays.common.util.validation.Name;
 import org.hibernate.validator.constraints.Range;
 
-
 /**
- * Represents a request to complete emergency evacuation request. The request includes fields for the required user
- * information, such as the user's phone number, as well as their first and last name.
+ * Represents a request to complete emergency evacuation request. The request
+ * includes fields for the required user
+ * information, such as the user's phone number, as well as their first and last
+ * name.
  */
 @Getter
 @Setter
@@ -64,7 +65,6 @@ public class EmergencyEvacuationApplicationRequest {
     @Size(min = 2, max = 100)
     private String targetDistrict;
 
-
     @Name
     @Size(min = 2, max = 100)
     private String applicantFirstName;
@@ -76,22 +76,24 @@ public class EmergencyEvacuationApplicationRequest {
     @Valid
     private AysPhoneNumberRequest applicantPhoneNumber;
 
+    private Boolean hasObstaclePersonExist;
 
     @JsonIgnore
     @AssertTrue(message = "all applicant fields must be filled")
     @SuppressWarnings("This method is unused by the application directly but Spring is using it in the background.")
     private boolean isAllApplicantFieldsFilled() {
 
-        if (StringUtils.isEmpty(this.applicantFirstName) && StringUtils.isEmpty(this.applicantLastName) && this.applicantPhoneNumber == null) {
+        if (StringUtils.isEmpty(this.applicantFirstName) && StringUtils.isEmpty(this.applicantLastName)
+                && this.applicantPhoneNumber == null) {
             return true;
         }
 
-
         return !StringUtils.isBlank(this.applicantFirstName) && !StringUtils.isBlank(this.applicantLastName)
                 &&
                 this.applicantPhoneNumber != null
                 &&
-                !(StringUtils.isBlank(this.applicantPhoneNumber.getCountryCode()) && StringUtils.isBlank(this.applicantPhoneNumber.getLineNumber()));
+                !(StringUtils.isBlank(this.applicantPhoneNumber.getCountryCode())
+                        && StringUtils.isBlank(this.applicantPhoneNumber.getLineNumber()));
     }
 
     @JsonIgnore
@@ -103,7 +105,8 @@ private boolean isPhoneNumberMustNotBeSameOne() {
             return true;
         }
 
-        if (StringUtils.isEmpty(this.applicantPhoneNumber.getLineNumber()) || StringUtils.isEmpty(this.phoneNumber.getLineNumber())) {
+        if (StringUtils.isEmpty(this.applicantPhoneNumber.getLineNumber())
+                || StringUtils.isEmpty(this.phoneNumber.getLineNumber())) {
             return true;
         }
 
@@ -115,11 +118,12 @@ private boolean isPhoneNumberMustNotBeSameOne() {
     @SuppressWarnings("This method is unused by the application directly but Spring is using it in the background.")
     private boolean isSourceCityAndDistrictDifferentFromTargetCityAndDistrict() {
 
-       if (this.sourceCity == null || this.sourceDistrict == null || this.targetCity == null || this.targetDistrict == null) {
+        if (this.sourceCity == null || this.sourceDistrict == null || this.targetCity == null
+                || this.targetDistrict == null) {
             return true;
-       }
+        }
 
-        if (!this.sourceCity.equalsIgnoreCase(this.targetCity)){
+        if (!this.sourceCity.equalsIgnoreCase(this.targetCity)) {
             return true;
         }
 

src/test/java/org/ays/emergency_application/model/request/EmergencyEvacuationRequestBuilder.java

@@ -12,10 +12,9 @@ public EmergencyEvacuationRequestBuilder() {
 
     public EmergencyEvacuationRequestBuilder withValidValues() {
         return this
-                .withSeatingCount(1)
                 .withPhoneNumber(new AysPhoneNumberRequestBuilder().withValidValues().build())
-                .withApplicantPhoneNumber(new AysPhoneNumberRequestBuilder().withValidValues().build())
-                .withAddress("Lorem Ipsum is simply dummy text of the printing and typesetting industry.");
+                .withAddress("Lorem Ipsum is simply dummy text of the printing and typesetting industry.")
+                .withApplicantPhoneNumber(new AysPhoneNumberRequestBuilder().withValidValues().build());
     }
 
     public EmergencyEvacuationRequestBuilder withFirstName(String firstName) {