DeathCertificateCapitalisation

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificate/CapitaliseDeathCertificate.java

@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.capitalisation.certificates.deathcertificate;
+
+import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
+
+public interface CapitaliseDeathCertificate {
+
+    @SuppressWarnings({"unused", "EmptyMethod"})
+    void capitalise(DeathCertificateCommand command);
+}

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/deathcertificate/CapitaliseDeathCertificateImpl.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.capitalisation.certificates.deathcertificate;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.capitalisation.CapitaliseString;
+import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
+
+@Component
+public class CapitaliseDeathCertificateImpl implements CapitaliseDeathCertificate {
+
+    private static final Logger logger = LogManager.getLogger(CapitaliseDeathCertificateImpl.class);
+
+    private final CapitaliseString capitaliseString;
+
+    public CapitaliseDeathCertificateImpl(CapitaliseString capitaliseString) {
+        this.capitaliseString = capitaliseString;
+    }
+
+    @Override
+    public void capitalise(DeathCertificateCommand birthCertificateCommand) {
+        logger.debug("CapitaliseBirthCertificate::capitalise");
+        birthCertificateCommand.setInformantQualification(capitaliseString.capitalise(birthCertificateCommand.getInformantQualification()));
+        birthCertificateCommand.setUntrackedWhereDied(capitaliseString.capitalise(birthCertificateCommand.getUntrackedWhereDied()));
+        birthCertificateCommand.setUntrackedFather(capitaliseString.capitalise(birthCertificateCommand.getUntrackedFather()));
+        birthCertificateCommand.setUntrackedMother(capitaliseString.capitalise(birthCertificateCommand.getUntrackedMother()));
+        birthCertificateCommand.setUntrackedInformant(capitaliseString.capitalise(birthCertificateCommand.getUntrackedInformant()));
+        birthCertificateCommand.setWhenBorn(capitaliseString.capitalise(birthCertificateCommand.getWhenBorn()));
+        birthCertificateCommand.setCertificateNumber(capitaliseString.capitalise(birthCertificateCommand.getCertificateNumber()));
+        birthCertificateCommand.setWhereRegistered(capitaliseString.capitalise(birthCertificateCommand.getWhereRegistered()));
+        birthCertificateCommand.setOccupation(capitaliseString.capitalise(birthCertificateCommand.getOccupation()));
+        birthCertificateCommand.setUntrackedUsualResidence(capitaliseString.capitalise(birthCertificateCommand.getUntrackedUsualResidence()));
+        birthCertificateCommand.setSpouseOccupation(capitaliseString.capitalise(birthCertificateCommand.getSpouseOccupation()));
+        birthCertificateCommand.setFatherOccupation(capitaliseString.capitalise(birthCertificateCommand.getFatherOccupation()));
+        birthCertificateCommand.setMotherOccupation(capitaliseString.capitalise(birthCertificateCommand.getMotherOccupation()));
+    }
+
+}

src/main/java/scot/carricksoftware/grants/controllers/certificates/deathcertificates/DeathCertificateFormControllerImpl.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import scot.carricksoftware.grants.capitalisation.certificates.deathcertificate.CapitaliseDeathCertificate;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.deathcertificates.DeathCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
@@ -42,6 +43,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
     private final PersonService personService;
     private final PlaceService placeService;
     private final OrganisationService organisationService;
+    private final CapitaliseDeathCertificate capitaliseDeathCertificate;
 
 
     public DeathCertificateFormControllerImpl(DeathCertificateService deathCertificateService,
@@ -50,7 +52,8 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
                                               DeathCertificateCommandValidatorImpl deathCertificateCommandValidatorImpl,
                                               PersonService personService,
                                               PlaceService placeService,
-                                              OrganisationService organisationService) {
+                                              OrganisationService organisationService,
+                                              CapitaliseDeathCertificate capitaliseDeathCertificate) {
         this.deathCertificateService = deathCertificateService;
         this.deathCertificateCommandConverter = deathCertificateCommandConverter;
 
@@ -61,6 +64,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
         this.placeService = placeService;
 
         this.organisationService = organisationService;
+        this.capitaliseDeathCertificate = capitaliseDeathCertificate;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -94,7 +98,7 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
         logger.debug("DeathCertificateFormControllerImpl::saveOrUpdate");
 
         deathCertificateCommandValidatorImpl.validate(deathCertificateCommand, bindingResult);
-
+        capitaliseDeathCertificate.capitalise(deathCertificateCommand);
 
         if (bindingResult.hasErrors()) {
             bindingResult.getAllErrors().forEach(error -> logger.debug(error.getDefaultMessage()));