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
@@ -42,6 +43,10 @@ public boolean isValid(String email, ConstraintValidatorContext constraintValida
             return true;
         }
 
+        if (email.length() <= 6 || email.length() >= 254) {
+            return this.buildViolation(constraintValidatorContext, "length must be between 6 and 254 characters");
+        }
+
         if (email.startsWith(" ") || email.endsWith(" ")) {
             return this.buildViolation(constraintValidatorContext, "email must not start or end with whitespace");
         }

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

@@ -39,10 +39,8 @@ public class EmergencyEvacuationApplication extends BaseDomainModel {
     private Boolean isInPerson;
     private Boolean hasObstaclePersonExist;
     private String notes;
-
     private Institution institution;
 
-
     /**
      * Checks if the application does not have an associated institution.
      *
@@ -62,7 +60,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.

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

@@ -98,7 +98,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,7 +13,6 @@
 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.
@@ -64,7 +63,6 @@ public class EmergencyEvacuationApplicationRequest {
     @Size(min = 2, max = 100)
     private String targetDistrict;
 
-
     @Name
     @Size(min = 2, max = 100)
     private String applicantFirstName;
@@ -86,7 +84,6 @@ private boolean isAllApplicantFieldsFilled() {
             return true;
         }
 
-
         return !StringUtils.isBlank(this.applicantFirstName) && !StringUtils.isBlank(this.applicantLastName)
                 &&
                 this.applicantPhoneNumber != null
@@ -115,11 +112,11 @@ 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

@@ -17,7 +17,6 @@ public EmergencyEvacuationRequestBuilder withValidValues() {
                 .withApplicantPhoneNumber(new AysPhoneNumberRequestBuilder().withValidValues().build())
                 .withAddress("Lorem Ipsum is simply dummy text of the printing and typesetting industry.");
     }
-
     public EmergencyEvacuationRequestBuilder withFirstName(String firstName) {
         data.setFirstName(firstName);
         return this;
@@ -85,4 +84,4 @@ public EmergencyEvacuationRequestBuilder withoutApplicant() {
         return this;
     }
 
-}
+}