DeathCertificate Validation Cause of death

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

@@ -15,64 +15,58 @@ public class ValidationConstants {
         // to stop checkstyle complaining
     }
 
-    public static final String NAME_IS_TOO_SHORT = "Name must be at least " + ApplicationConstants.MINIMUM_NAME_LENGTH + " characters long.";
-    public static final String NAME_IS_TOO_LONG = "Name must be no more than " + ApplicationConstants.MAXIMUM_NAME_LENGTH + " characters long.";
-    public static final String DATE_IS_NULL = "Date must exist.";
-    public static final String DATE_IN_FUTURE = "Date should not be in the future.";
-
-    public static final String PLACE_IS_NULL = "Place must exist.";
-    public static final String REGION_IS_NULL = "Region must exist.";
-    public static final String COUNTRY_IS_NULL = "Country must exist.";
+    public static final String BIRTHDAY_INCORRECT_FORMAT = "Format should be dd/mm";
+    public static final String BIRTH_DAY_AND_AGE_CANNOT_COEXIST = "BirthDay and Age cannot coexist.";
+    public static final String BIRTH_YEAR_AND_AGE_CANNOT_COEXIST = "Birth Year and Age cannot coexist.";
+    public static final String BOUNDARY_TYPE_IS_NULL = "The boundary type cannot be null.";
+    public static final String BRIDE_IS_NULL = "The bride cannot be null.";
     public static final String CENSUS_IS_NULL = "The census should be specified";
-    public static final String CENSUS_NAME_IS_NULL = "Either Person or Untracked Person must be given";
+    public static final String CAUSE_OF_DEATH_IS_NULL = "The cause of death should be specified";
     public static final String CENSUS_NAME_IS_NOT_NULL = "Both Person and Untracked Person cannot be given";
-
-    public static final String PERSON_IS_NULL = "The person cannot be null.";
-    public static final String MOTHER_IS_NULL = "The mother cannot be null.";
-    public static final String NEWBORN_IS_NULL = "The New Born cannot be null.";
+    public static final String CENSUS_NAME_IS_NULL = "Either Person or Untracked Person must be given";
+    public static final String CERTIFICATE_DATE_IS_NULL = "The certificate date cannot be null.";
     public static final String CERTIFICATE_NUMBER_IS_NULL = "The certificate number cannot be null.";
     public static final String CERTIFICATE_SOURCE_IS_NULL = "The certificate source cannot be null.";
-    public static final String REGISTRATION_AUTHORITY_IS_NULL = "The registration authority cannot be null.";
-    public static final String CERTIFICATE_DATE_IS_NULL = "The certificate date cannot be null.";
     public static final String CERTIFICATE_TYPE_IS_NULL = "The certificate type cannot be null.";
+    public static final String COUNTRY_IS_NULL = "Country must exist.";
+    public static final String DATE_IN_FUTURE = "Date should not be in the future.";
     public static final String DATE_IS_INVALID = "The certificate date is invalid or of the wrong format.";
-    public static final String NUMBER_IS_NULL = "The number cannot be null.";
+    public static final String DATE_IS_NULL = "Date must exist.";
+    public static final String FATHER_AND_UNTRACKED_FATHER = "One and only one father and untracked father must be specified.";
+    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 GROOM_IS_NULL = "The groom cannot be null.";
+    public static final String INFORMANT_QUALIFICATION_IS_NULL = "Informant Qualification must exist.";
+    public static final String INFORMANT_AND_UNTRACKED_INFORMANT = "One and only one informant and untracked informant may be specified.";
+    public static final String MOTHER_AND_UNTRACKED_MOTHER = "One and only one mother and untracked mother may be specified.";
+    public static final String MOTHER_IS_NULL = "The mother cannot be null.";
+    public static final String MOTHER_USUAL_RESIDENCE_AND_UNTRACKED_MOTHER_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence may be specified.";
+    public static final String NAME_IS_TOO_LONG = "Name must be no more than " + ApplicationConstants.MAXIMUM_NAME_LENGTH + " characters long.";
+    public static final String NAME_IS_TOO_SHORT = "Name must be at least " + ApplicationConstants.MINIMUM_NAME_LENGTH + " characters long.";
+    public static final String NEWBORN_IS_NULL = "The New Born cannot be null.";
     public static final String NUMBER_IS_INVALID = "The number must be a non negative integer.";
+    public static final String NUMBER_IS_NULL = "The number cannot be null.";
+    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 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 WHERE_BORN_IS_NULL = "Where born 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 SEX_IS_NULL = "Sex cannot be null.";
+    public static final String SPOUSE_AND_UNTRACKED_SPOUSE = "One and only one spouse and untracked spouse must be specified.";
+    public static final String TOTAL_ROOMS_AND_INHABITED_ROOMS_CANNOT_COEXIST =  "Total Rooms and Inhabited Rooms cannot coexist.";
+    public static final String TOTAL_ROOMS_AND_ROOMS_WITH_WINDOWS_CANNOT_COEXIST =  "Total Rooms and Rooms With Windows cannot coexist.";
+    public static final String USUAL_RESIDENCE_AND_UNTRACKED_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence may be specified.";
     public static final String WHEN_BORN_INCORRECT_FORMAT = "The format should be dd/MM/yyyy hh:mm.";
     public static final String WHEN_BORN_IS_NULL = "When born cannot be null.";
-    public static final String FATHER_AND_UNTRACKED_FATHER = "One and only one father and untracked father must be specified.";
-    public static final String MOTHER_AND_UNTRACKED_MOTHER = "One and only one mother and untracked mother may be specified.";
-    public static final String INFORMANT_AND_UNTRACKED_INFORMANT = "One and only one informant and untracked informant may be specified.";
-    public static final String WHERE_BORN_AND_UNTRACKED_WHERE_BORN = "One and only one where born and untracked where born must be specified.";
-
-    public static final String MOTHER_USUAL_RESIDENCE_AND_UNTRACKED_MOTHER_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence may be specified.";
-    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 BRIDE_IS_NULL = "The bride cannot be null.";
-    public static final String GROOM_IS_NULL = "The groom cannot be null.";
-    public static final String SAME_BRIDE_AND_GROOM = "The bride and groom cannot be the same person.";
-    public static final String WHEN_REGISTERED_DATE_IS_NULL = "When registered cannot be null.";
-    public static final String WHEN_REGISTERED_DATE_IS_INVALID = "When registered date is invalid.";
     public static final String WHEN_REGISTERED_DATE_IN_FUTURE = "Date should not be in the future.";
-
-
+    public static final String WHEN_REGISTERED_DATE_IS_INVALID = "When registered date is invalid.";
+    public static final String WHEN_REGISTERED_DATE_IS_NULL = "When registered cannot be null.";
+    public static final String WHERE_BORN_AND_UNTRACKED_WHERE_BORN = "One and only one where born and untracked where born must be specified.";
+    public static final String WHERE_BORN_IS_NULL = "Where born cannot be null.";
     public static final String WHERE_DIED_AND_UNTRACKED_WHERE_DIED = "One and only one where died and untracked where died must be specified.";
-    public static final String SPOUSE_AND_UNTRACKED_SPOUSE = "One and only one spouse and untracked spouse must be specified.";
-    public static final String USUAL_RESIDENCE_AND_UNTRACKED_USUAL_RESIDENCE = "Only one usual residence and untracked usual residence may be specified.";
 
-    public static final String FIRST_PARTY_IS_NULL = "The first party cannot be null.";
-    public static final String SECOND_PARTY_IS_NULL = "The second party cannot be null.";
-    public static final String SAME_TWO_PARTIES = "The two parties cannot be the same person.";
-
-    public static final String BOUNDARY_TYPE_IS_NULL = "The boundary type cannot be null.";
-
-    public static final String FIELD_NOT_NEGATIVE_INTEGER = "Not a non negative integer.";
-
-    public static final String BIRTHDAY_INCORRECT_FORMAT = "Format should be dd/mm";
-    public static final String BIRTH_YEAR_AND_AGE_CANNOT_COEXIST = "Birth Year and Age cannot coexist.";
-    public static final String BIRTH_DAY_AND_AGE_CANNOT_COEXIST = "BirthDay and Age cannot coexist.";
-    public static final String TOTAL_ROOMS_AND_INHABITED_ROOMS_CANNOT_COEXIST =  "Total Rooms and Inhabited Rooms cannot coexist.";
-    public static final String TOTAL_ROOMS_AND_ROOMS_WITH_WINDOWS_CANNOT_COEXIST =  "Total Rooms and Rooms With Windows cannot coexist.";
 }

src/main/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DeathCertificateNullFieldsValidatorImpl.java

@@ -10,6 +10,7 @@ import org.apache.logging.log4j.Logger;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
+import scot.carricksoftware.grants.constants.ValidationConstants;
 import scot.carricksoftware.grants.validators.helpers.ValidateTypesImpl;
 
 @Component
@@ -26,6 +27,7 @@ public class DeathCertificateNullFieldsValidatorImpl implements DeathCertificate
     @Override
     public void validate(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         validateCertificateNumber(deathCertificateCommand, bindingResult);
+        validateCertificateType(deathCertificateCommand, bindingResult);
         validateVolume(deathCertificateCommand, bindingResult);
         validateNumber(deathCertificateCommand, bindingResult);
         validateDeceased(deathCertificateCommand, bindingResult);
@@ -58,28 +60,34 @@ public class DeathCertificateNullFieldsValidatorImpl implements DeathCertificate
 
     private void validateCauseOfDeath(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateCauseOfDeath");
-        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getCauseOfDeath(), "causeOfDeath","Cause of Death must exist", bindingResult);
+        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getCauseOfDeath(), "causeOfDeath",ValidationConstants.CAUSE_OF_DEATH_IS_NULL, bindingResult);
     }
 
     private void validateInformantQualification(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateInformantQualification");
-        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getInformantQualification(), "informantQualification","Informant Qualification must exist", bindingResult);
+        validateTypes.validateNullOrEmptyString(deathCertificateCommand.getInformantQualification(), "informantQualification",ValidationConstants.INFORMANT_QUALIFICATION_IS_NULL, bindingResult);
     }
 
     private void validateSex(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateSex");
-        validateTypes.validateSex(deathCertificateCommand.getSex(), "sex","Sex cannot be null", bindingResult);
+        validateTypes.validateSex(deathCertificateCommand.getSex(), "sex",ValidationConstants.SEX_IS_NULL, bindingResult);
     }
 
     private void validateCertificateSource(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateCertificateSource");
-        validateTypes.validateOrganisation(deathCertificateCommand.getCertificateSource(), "certificateSource","Certificate source must exist", bindingResult);
+        validateTypes.validateOrganisation(deathCertificateCommand.getCertificateSource(), "certificateSource", ValidationConstants.CERTIFICATE_SOURCE_IS_NULL, bindingResult);
     }
 
     private void validateRegistrationAuthority(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
         logger.debug("DeathCertificateNullFieldsValidator::validateRegistrationAuthority");
-        validateTypes.validateOrganisation(deathCertificateCommand.getRegistrationAuthority(), "registrationAuthority","Certificate source must exist", bindingResult);
+        validateTypes.validateOrganisation(deathCertificateCommand.getRegistrationAuthority(), "registrationAuthority",ValidationConstants.REGISTRATION_AUTHORITY_IS_NULL, bindingResult);
     }
 
+    private void validateCertificateType(DeathCertificateCommand deathCertificateCommand, BindingResult bindingResult) {
+        logger.debug("DeathCertificateNullFieldsValidator::validateRegistrationAuthority");
+        validateTypes.validateCertificateType(deathCertificateCommand.getCertificateType(), "certificateType",ValidationConstants.CERTIFICATE_TYPE_IS_NULL, bindingResult);
+    }
+
+
 
 }