Marriage certificates setYearMarried plumbed in

src/main/java/scot/carricksoftware/grants/controllers/certificates/marriagecertificates/MarriageCertificateFormControllerImpl.java

@@ -25,6 +25,7 @@ import scot.carricksoftware.grants.constants.ViewConstants;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
+import scot.carricksoftware.grants.services.certificates.marriagecertificates.helpers.SetYearMarried;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
@@ -44,13 +45,18 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
     private final OrganisationService organisationService;
     private final PlaceService placeService;
     private final CapitaliseMarriageCertificate capitaliseMarriageCertificate;
+    private final SetYearMarried setYearMarried;
 
 
     public MarriageCertificateFormControllerImpl(MarriageCertificateService marriageCertificateService,
                                                  MarriageCertificateCommandConverterImpl marriageCertificateCommandConverter,
                                                  MarriageCertificateConverterImpl marriageCertificateConverter,
                                                  MarriageCertificateCommandValidator marriageCertificateCommandValidator,
-                                                 PersonService personService, OrganisationService organisationService, PlaceService placeService, CapitaliseMarriageCertificate capitaliseMarriageCertificate) {
+                                                 PersonService personService,
+                                                 OrganisationService organisationService,
+                                                 PlaceService placeService,
+                                                 CapitaliseMarriageCertificate capitaliseMarriageCertificate,
+                                                 SetYearMarried setYearMarried) {
         this.marriageCertificateService = marriageCertificateService;
         this.marriageCertificateCommandConverter = marriageCertificateCommandConverter;
 
@@ -61,6 +67,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
         this.organisationService = organisationService;
         this.placeService = placeService;
         this.capitaliseMarriageCertificate = capitaliseMarriageCertificate;
+        this.setYearMarried = setYearMarried;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -95,7 +102,7 @@ public class MarriageCertificateFormControllerImpl implements MarriageCertificat
 
         marriageCertificateCommandValidator.validate(marriageCertificateCommand, bindingResult);
         capitaliseMarriageCertificate.capitalise(marriageCertificateCommand);
-
+        setYearMarried.setDatesMarried(marriageCertificateCommand);
 
 
         if (bindingResult.hasErrors()) {

src/main/java/scot/carricksoftware/grants/services/certificates/marriagecertificates/helpers/SetYearMarriedImpl.java

@@ -5,11 +5,13 @@
 
 package scot.carricksoftware.grants.services.certificates.marriagecertificates.helpers;
 
+import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
 import scot.carricksoftware.grants.constants.ApplicationConstants;
 
 import java.time.LocalDate;
 
+@Component
 public class SetYearMarriedImpl implements SetYearMarried {
 
     @Override

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

@@ -19,6 +19,7 @@ import scot.carricksoftware.grants.commands.certificates.marriagecertificates.Ma
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
+import scot.carricksoftware.grants.services.certificates.marriagecertificates.helpers.SetYearMarried;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
@@ -62,6 +63,9 @@ public class MarriageCertificateFormControllerCapitalisationTest {
     @Mock
     private MarriageCertificateCommandValidator marriageCertificateCommandValidatorMock;
 
+    @Mock
+    private SetYearMarried setYearMarriedMock;
+
     @Mock
     private Model modelMock;
 
@@ -75,7 +79,8 @@ public class MarriageCertificateFormControllerCapitalisationTest {
                 personServiceMock,
                 organisationServiceMock,
                 placeServiceMock,
-                capitaliseMarriageCertificateMock);
+                capitaliseMarriageCertificateMock,
+                setYearMarriedMock);
     }
 
 

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

@@ -18,6 +18,7 @@ import scot.carricksoftware.grants.commands.certificates.marriagecertificates.Ma
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
+import scot.carricksoftware.grants.services.certificates.marriagecertificates.helpers.SetYearMarried;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
@@ -55,6 +56,9 @@ public class MarriageCertificateFormControllerSaveOrUpdateTest {
     @Mock
     private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
 
+    @Mock
+    private SetYearMarried setYearMarriedMock;
+
     @Mock
     Model modelMock;
 
@@ -76,7 +80,8 @@ public class MarriageCertificateFormControllerSaveOrUpdateTest {
                 personServiceMock,
                 organisationServiceMock,
                 placeServiceMock,
-                capitaliseMarriageCertificateMock);
+                capitaliseMarriageCertificateMock,
+                setYearMarriedMock);
         marriageCertificateCommand = new MarriageCertificateCommandImpl();
     }
 

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

@@ -20,6 +20,7 @@ import scot.carricksoftware.grants.converters.certificates.marriagecertificates.
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.domains.certificates.MarriageCertificate;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
+import scot.carricksoftware.grants.services.certificates.marriagecertificates.helpers.SetYearMarried;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
@@ -59,6 +60,9 @@ public class MarriageCertificateFormControllerTest {
     @Mock
     private CapitaliseMarriageCertificate capitaliseMarriageCertificateMock;
 
+    @Mock
+    private SetYearMarried setYearMarriedMock;
+
     @Mock
     private Model modelMock;
 
@@ -75,7 +79,8 @@ public class MarriageCertificateFormControllerTest {
                 personServiceMock,
                 organisationServiceMock,
                 placeServiceMock,
-                capitaliseMarriageCertificateMock);
+                capitaliseMarriageCertificateMock,
+                setYearMarriedMock);
     }
 
     @Test

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

@@ -19,6 +19,7 @@ import scot.carricksoftware.grants.commands.certificates.marriagecertificates.Ma
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.marriagecertificates.MarriageCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
+import scot.carricksoftware.grants.services.certificates.marriagecertificates.helpers.SetYearMarried;
 import scot.carricksoftware.grants.services.people.PersonService;
 import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
 import scot.carricksoftware.grants.services.places.places.PlaceService;
@@ -62,6 +63,9 @@ public class MarriageCertificateFormControllerValidationTest {
     @Mock
     private MarriageCertificateCommandValidator marriageCertificateCommandValidatorMock;
 
+    @Mock
+    private SetYearMarried setYearMarriedMock;
+
     @Mock
     private Model modelMock;
 
@@ -75,7 +79,8 @@ public class MarriageCertificateFormControllerValidationTest {
                 personServiceMock,
                 organisationServiceMock,
                 placeServiceMock,
-                capitaliseMarriageCertificateMock);
+                capitaliseMarriageCertificateMock,
+                setYearMarriedMock);
     }