Capitalise Marriage Certificate

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificate/CapitaliseMarriageCertificate.java

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

src/main/java/scot/carricksoftware/grants/capitalisation/certificates/marriagecertificate/CapitaliseMarriageCertificateImpl.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate;
+
+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.marriagecertificates.MarriageCertificateCommand;
+
+@Component
+public class CapitaliseMarriageCertificateImpl implements CapitaliseMarriageCertificate {
+
+    private static final Logger logger = LogManager.getLogger(CapitaliseMarriageCertificateImpl.class);
+
+    private final CapitaliseString capitaliseString;
+
+    public CapitaliseMarriageCertificateImpl(CapitaliseString capitaliseString) {
+        this.capitaliseString = capitaliseString;
+    }
+
+    @Override
+    public void capitalise(MarriageCertificateCommand marriageCertificateCommand) {
+        logger.debug("CapitaliseMarriageCertificate::capitalise");
+        marriageCertificateCommand.setCertificateNumber(capitaliseString.capitalise(marriageCertificateCommand.getCertificateNumber()));
+        marriageCertificateCommand.setVolume(capitaliseString.capitalise(marriageCertificateCommand.getVolume()));
+        marriageCertificateCommand.setNumber(capitaliseString.capitalise(marriageCertificateCommand.getNumber()));
+        marriageCertificateCommand.setUntrackedWhereMarried(capitaliseString.capitalise(marriageCertificateCommand.getUntrackedWhereMarried()));
+        marriageCertificateCommand.setGroomUntrackedResidence(capitaliseString.capitalise(marriageCertificateCommand.getGroomUntrackedResidence()));
+        marriageCertificateCommand.setBrideUntrackedResidence(capitaliseString.capitalise(marriageCertificateCommand.getBrideUntrackedResidence()));
+        marriageCertificateCommand.setGroomUntrackedFather(capitaliseString.capitalise(marriageCertificateCommand.getGroomUntrackedFather()));
+        marriageCertificateCommand.setBrideUntrackedFather(capitaliseString.capitalise(marriageCertificateCommand.getBrideUntrackedFather()));
+        marriageCertificateCommand.setUntrackedFirstWitness(capitaliseString.capitalise(marriageCertificateCommand.getUntrackedFirstWitness()));
+        marriageCertificateCommand.setUntrackedSecondWitness(capitaliseString.capitalise(marriageCertificateCommand.getUntrackedSecondWitness()));
+        marriageCertificateCommand.setBrideRank(capitaliseString.capitalise(marriageCertificateCommand.getBrideRank()));
+        marriageCertificateCommand.setGroomRank(capitaliseString.capitalise(marriageCertificateCommand.getGroomRank()));
+        marriageCertificateCommand.setGroomFatherRank(capitaliseString.capitalise(marriageCertificateCommand.getGroomFatherRank()));
+    }
+
+}

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

@@ -55,7 +55,8 @@ public class DeathCertificateFormControllerImpl implements DeathCertificateFormC
                                               PersonService personService,
                                               PlaceService placeService,
                                               OrganisationService organisationService,
-                                              CapitaliseDeathCertificate capitaliseDeathCertificate, UpdateCertifiedYearOfDeath updateCertifiedYearOfDeath) {
+                                              CapitaliseDeathCertificate capitaliseDeathCertificate,
+                                              UpdateCertifiedYearOfDeath updateCertifiedYearOfDeath) {
         this.deathCertificateService = deathCertificateService;
         this.deathCertificateCommandConverter = deathCertificateCommandConverter;
 

src/main/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerImpl.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.marriagecertificate.CapitaliseMarriageCertificate;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.constants.AttributeConstants;
@@ -42,13 +43,14 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
     private final PersonService personService;
     private final OrganisationService organisationService;
     private final PlaceService placeService;
+    private final CapitaliseMarriageCertificate capitaliseMarriageCertificate;
 
 
     public MarriageCertificateFormControllerImpl(MarriageCertificateService marriageCertificateService,
                                                  MarriageCertificateCommandConverterImpl marriageCertificateCommandConverter,
                                                  MarriageCertificateConverterImpl marriageCertificateConverter,
                                                  MarriageCertificateCommandValidator marriageCertificateCommandValidator,
-                                                 PersonService personService, OrganisationService organisationService, PlaceService placeService) {
+                                                 PersonService personService, OrganisationService organisationService, PlaceService placeService, CapitaliseMarriageCertificate capitaliseMarriageCertificate) {
         this.marriageCertificateService = marriageCertificateService;
         this.marriageCertificateCommandConverter = marriageCertificateCommandConverter;
 
@@ -58,6 +60,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         this.personService = personService;
         this.organisationService = organisationService;
         this.placeService = placeService;
+        this.capitaliseMarriageCertificate = capitaliseMarriageCertificate;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -91,6 +94,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         logger.debug("MarriageCertificateFormControllerImpl::saveOrUpdate");
 
         marriageCertificateCommandValidator.validate(marriageCertificateCommand, bindingResult);
+        capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
 
 
         if (bindingResult.hasErrors()) {

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerSaveOrUpdateTest.java

@@ -12,6 +12,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate.CapitaliseMarriageCertificate;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
@@ -51,6 +52,9 @@ public class MarriageCertificateFormControllerSaveOrUpdateTest {
     @Mock
     private PlaceService placeServiceMock;
 
+    @Mock
+    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
+
     @Mock
     Model modelMock;
 
@@ -71,7 +75,8 @@ public class MarriageCertificateFormControllerSaveOrUpdateTest {
                 marriageCertificateCommandValidatorMock,
                 personServiceMock,
                 organisationServiceMock,
-                placeServiceMock);
+                placeServiceMock,
+                capitaliseMarriageCertificateMock);
         marriageCertificateCommand = new MarriageCertificateCommandImpl();
     }
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerTest.java

@@ -13,6 +13,7 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate.CapitaliseMarriageCertificate;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
@@ -55,6 +56,9 @@ public class MarriageCertificateFormControllerTest {
     @Mock
     private PlaceService placeServiceMock;
 
+    @Mock
+    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
+
     @Mock
     private Model modelMock;
 
@@ -70,7 +74,8 @@ public class MarriageCertificateFormControllerTest {
                 marriageCertificateCommandValidatorMock,
                 personServiceMock,
                 organisationServiceMock,
-                placeServiceMock);
+                placeServiceMock,
+                capitaliseMarriageCertificateMock);
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerValidationTest.java

@@ -13,6 +13,7 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
+import scot.carricksoftware.grants.capitalisation.certificates.marriagecertificate.CapitaliseMarriageCertificate;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
@@ -55,6 +56,8 @@ public class MarriageCertificateFormControllerValidationTest {
     @Mock
     private PlaceService placeServiceMock;
 
+    @Mock
+    private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
 
     @Mock
     private MarriageCertificateCommandValidator marriageCertificateCommandValidatorMock;
@@ -71,7 +74,8 @@ public class MarriageCertificateFormControllerValidationTest {
                 marriageCertificateCommandValidatorMock,
                 personServiceMock,
                 organisationServiceMock,
-                placeServiceMock);
+                placeServiceMock,
+                capitaliseMarriageCertificateMock);
     }