Browse Source

Father rank capitalised

Andrew Grant 5 months ago
parent
commit
ffd4461312

+ 2 - 0
src/main/java/scot/carricksoftware/grants/capitalisation/certificates/birthcertificate/CapitaliseBirthCertificateImpl.java

@@ -33,6 +33,8 @@ public class CapitaliseBirthCertificateImpl implements CapitaliseBirthCertificat
         birthCertificateCommand.setWhenBorn(capitaliseString.capitalise(birthCertificateCommand.getWhenBorn()));
         birthCertificateCommand.setWhenBorn(capitaliseString.capitalise(birthCertificateCommand.getWhenBorn()));
         birthCertificateCommand.setCertificateNumber(capitaliseString.capitalise(birthCertificateCommand.getCertificateNumber()));
         birthCertificateCommand.setCertificateNumber(capitaliseString.capitalise(birthCertificateCommand.getCertificateNumber()));
         birthCertificateCommand.setWhereRegistered(capitaliseString.capitalise(birthCertificateCommand.getWhereRegistered()));
         birthCertificateCommand.setWhereRegistered(capitaliseString.capitalise(birthCertificateCommand.getWhereRegistered()));
+        birthCertificateCommand.setFatherRank(capitaliseString.capitalise(birthCertificateCommand.getFatherRank()));
+        birthCertificateCommand.setDateAndPlaceOfMarriage(capitaliseString.capitalise(birthCertificateCommand.getDateAndPlaceOfMarriage()));
     }
     }
 
 
 }
 }

+ 1 - 0
src/main/java/scot/carricksoftware/grants/constants/ValidationConstants.java

@@ -29,6 +29,7 @@ public class ValidationConstants {
     public static final String CENSUS_NAME_IS_NOT_NULL = "Both Person and Untracked Person cannot be given";
     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 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 NEWBORN_IS_NULL = "The New Born cannot be null.";
     public static final String CERTIFICATE_NUMBER_IS_NULL = "The certificate number 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 CERTIFICATE_SOURCE_IS_NULL = "The certificate source cannot be null.";

+ 5 - 0
src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartOneValidatorImpl.java

@@ -34,6 +34,7 @@ public class BirthCertificateCommandPartOneValidatorImpl implements BirthCertifi
         validateCertificateSource(birthCertificateCommand, bindingResult);
         validateCertificateSource(birthCertificateCommand, bindingResult);
         validateCertificateType(birthCertificateCommand, bindingResult);
         validateCertificateType(birthCertificateCommand, bindingResult);
         validateCertificateDate(birthCertificateCommand, bindingResult);
         validateCertificateDate(birthCertificateCommand, bindingResult);
+        validateMother(birthCertificateCommand, bindingResult);
     }
     }
 
 
     private void validateNewBorn(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
     private void validateNewBorn(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
@@ -67,6 +68,10 @@ public class BirthCertificateCommandPartOneValidatorImpl implements BirthCertifi
                 bindingResult);
                 bindingResult);
     }
     }
 
 
+    private void validateMother(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
+        logger.debug("Validating birth certificate Mother");
+        validateTypes.validatePerson(birthCertificateCommand.getMother(), "mother", ValidationConstants.MOTHER_IS_NULL, bindingResult);
+    }
 
 
 }
 }