Divorce certificate Validate dates

src/main/java/scot/carricksoftware/grants/constants/ValidationConstants.java

@@ -44,6 +44,8 @@ public class ValidationConstants {
     public static final String FATHER_USUAL_RESIDENCE_AND_UNTRACKED_FATHER_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence must be specified.";
     public static final String FIELD_NOT_NEGATIVE_INTEGER = "Not a non negative integer.";
     public static final String FIRST_PARTY_IS_NULL = "The first party cannot be null.";
+    public static final String FIRST_PARTY_DATE_IS_NULL = "The first party date cannot be null.";
+    public static final String FIRST_PARTY_DATE_INVALID_FORMAT = "The format should be dd/MM/yyyy.";
     public static final String GROOM_IS_NULL = "The groom cannot be null.";
     public static final String GROOM_AGE_IS_NULL = "The groom age cannot be null.";
     public static final String GROOM_FATHER_RANK_IS_NULL = "The groom's father's rank cannot be null.";
@@ -64,11 +66,15 @@ public class ValidationConstants {
     public static final String PERSON_IS_NULL = "The person cannot be null.";
     public static final String PLACE_IS_NULL = "Place must exist.";
     public static final String REGION_IS_NULL = "Region must exist.";
+    public static final String REGISTERED_DATE_IS_NULL = "The registered date cannot be null.";
+    public static final String REGISTERED_DATE_INVALID_FORMAT = "The format should be dd/MM/yyyy.";
     public static final String REGISTRATION_AUTHORITY_IS_NULL = "The registration authority cannot be null.";
     public static final String REGISTRATION_VOLUME_IS_NULL = "The volume cannot be null.";
     public static final String SAME_BRIDE_AND_GROOM = "The bride and groom cannot be the same person.";
     public static final String SAME_TWO_PARTIES = "The two parties cannot be the same person.";
     public static final String SECOND_PARTY_IS_NULL = "The second party cannot be null.";
+    public static final String SECOND_PARTY_DATE_IS_NULL = "The second party date cannot be null.";
+    public static final String SECOND_PARTY_DATE_INVALID_FORMAT = "The format should be dd/MM/yyyy.";
     public static final String SEX_IS_NULL = "Sex cannot be null.";
     public static final String SPOUSE_AND_UNTRACKED_SPOUSE = "One and only one spouse and untracked spouse may be specified.";
     public static final String TOTAL_ROOMS_AND_INHABITED_ROOMS_CANNOT_COEXIST =  "Total Rooms and Inhabited Rooms cannot coexist.";

src/main/java/scot/carricksoftware/grants/validators/certificates/divorcecertificate/DivorceCertificateCommandDatesValidator.java

@@ -8,7 +8,6 @@ package scot.carricksoftware.grants.validators.certificates.divorcecertificate;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.divorcecertificates.DivorceCertificateCommand;
-import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 
 
 @Component

src/main/java/scot/carricksoftware/grants/validators/certificates/divorcecertificate/DivorceCertificateCommandDatesValidatorImpl.java

@@ -10,6 +10,8 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.divorcecertificates.DivorceCertificateCommand;
+import scot.carricksoftware.grants.constants.ValidationConstants;
+import scot.carricksoftware.grants.validators.helpers.ValidateDateTypes;
 
 
 @Component
@@ -17,9 +19,48 @@ public class DivorceCertificateCommandDatesValidatorImpl implements DivorceCerti
 
     private static final Logger logger = LogManager.getLogger(DivorceCertificateCommandDatesValidatorImpl.class);
 
+    private final ValidateDateTypes validateDateTypes;
+
+    public DivorceCertificateCommandDatesValidatorImpl(ValidateDateTypes validateDateTypes) {
+        this.validateDateTypes = validateDateTypes;
+    }
+
     @Override
     public void validate(DivorceCertificateCommand divorceCertificateCommand, BindingResult bindingResult) {
         logger.info("DivorceCertificateCommandPeopleValidator::validate");
+        validateFirstPartyDate(divorceCertificateCommand, bindingResult);
+        validateSecondPartyDate(divorceCertificateCommand, bindingResult);
+        validateRegisteredDate(divorceCertificateCommand, bindingResult);
+    }
+
+    private void validateFirstPartyDate(DivorceCertificateCommand divorceCertificateCommand, BindingResult bindingResult) {
+        logger.debug("DivorceCertificateBaseCommandDatesValidator::validateFirstPartyDate");
+        validateDateTypes.validatePastDate(divorceCertificateCommand.getFirstPartyDate(),
+                "firstPartyDate",
+                ValidationConstants.FIRST_PARTY_DATE_IS_NULL,
+                ValidationConstants.FIRST_PARTY_DATE_INVALID_FORMAT,
+                ValidationConstants.DATE_IN_FUTURE,
+                bindingResult);
+    }
+
+    private void validateSecondPartyDate(DivorceCertificateCommand divorceCertificateCommand, BindingResult bindingResult) {
+        logger.debug("DivorceCertificateBaseCommandDatesValidator::validateSecondPartyDate");
+        validateDateTypes.validatePastDate(divorceCertificateCommand.getSecondPartyDate(),
+                "secondPartyDate",
+                ValidationConstants.SECOND_PARTY_DATE_IS_NULL,
+                ValidationConstants.SECOND_PARTY_DATE_INVALID_FORMAT,
+                ValidationConstants.DATE_IN_FUTURE,
+                bindingResult);
+    }
+
+    private void validateRegisteredDate(DivorceCertificateCommand divorceCertificateCommand, BindingResult bindingResult) {
+        logger.debug("DivorceCertificateBaseCommandDatesValidator::validateRegisteredDate");
+        validateDateTypes.validatePastDate(divorceCertificateCommand.getRegisteredDate(),
+                "registeredDate",
+                ValidationConstants.REGISTERED_DATE_IS_NULL,
+                ValidationConstants.REGISTERED_DATE_INVALID_FORMAT,
+                ValidationConstants.DATE_IN_FUTURE,
+                bindingResult);
     }
 }
 

src/main/java/scot/carricksoftware/grants/validators/certificates/divorcecertificate/DivorceCertificateCommandPeopleValidator.java

@@ -8,7 +8,6 @@ package scot.carricksoftware.grants.validators.certificates.divorcecertificate;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.divorcecertificates.DivorceCertificateCommand;
-import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 
 
 @Component

src/main/java/scot/carricksoftware/grants/validators/certificates/divorcecertificate/DivorceCertificateCommandValidator.java

@@ -12,6 +12,7 @@ import scot.carricksoftware.grants.commands.certificates.divorcecertificates.Div
 @Component
 public interface DivorceCertificateCommandValidator {
 
+    @SuppressWarnings("unused")
     void validate(DivorceCertificateCommand divorceCertificateCommand, BindingResult bindingResult);
 }