AddAttributes::AddMarriageCertificate

src/main/java/scot/carricksoftware/grants/controllers/AddAttributes.java

@@ -10,4 +10,5 @@ import org.springframework.ui.Model;
 public interface AddAttributes {
     void AddDeathCertificate(Model model);
     void AddMarriageCertificate(Model model);
+    void AddBirthCertificate(Model model);
 }

src/main/java/scot/carricksoftware/grants/controllers/AddAttributesImpl.java

@@ -38,4 +38,11 @@ public class AddAttributesImpl implements AddAttributes {
         model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
         model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
     }
+
+    @Override
+    public void AddBirthCertificate(Model model) {
+        model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
+        model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
+        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
+    }
 }

src/main/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerImpl.java

@@ -22,13 +22,11 @@ import scot.carricksoftware.grants.constants.AttributeConstants;
 import scot.carricksoftware.grants.constants.CertificateMappingConstants;
 import scot.carricksoftware.grants.constants.MappingConstants;
 import scot.carricksoftware.grants.constants.ViewConstants;
+import scot.carricksoftware.grants.controllers.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.UpdateCertifiedYearOfBirth;
-import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.certificates.birthcertificate.BirthCertificateCommandValidatorImpl;
 
 @SuppressWarnings("LoggingSimilarMessage")
@@ -41,33 +39,27 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     private final BirthCertificateCommandConverterImpl birthCertificateCommandConverter;
     private final BirthCertificateConverterImpl birthCertificateConverter;
     private final BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImpl;
-    private final PersonService personService;
-    private final PlaceService placeService;
-    private final OrganisationService organisationService;
     private final CapitaliseBirthCertificate capitaliseBirthCertificate;
     private final UpdateCertifiedYearOfBirth updateCertifiedYearOfBirth;
+    private final AddAttributes addAttributes;
 
 
     public BirthCertificateFormControllerImpl(BirthCertificateService birthCertificateService,
                                               BirthCertificateCommandConverterImpl birthCertificateCommandConverter,
                                               BirthCertificateConverterImpl birthCertificateConverter,
                                               BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImpl,
-                                              PersonService personService,
-                                              PlaceService placeService,
-                                              OrganisationService organisationService,
                                               CapitaliseBirthCertificate capitaliseBirthCertificate,
-                                              UpdateCertifiedYearOfBirth updateCertifiedYearOfBirth) {
+                                              UpdateCertifiedYearOfBirth updateCertifiedYearOfBirth,
+                                              AddAttributes addAttributes) {
         this.birthCertificateService = birthCertificateService;
         this.birthCertificateCommandConverter = birthCertificateCommandConverter;
 
 
         this.birthCertificateConverter = birthCertificateConverter;
         this.birthCertificateCommandValidatorImpl = birthCertificateCommandValidatorImpl;
-        this.personService = personService;
-        this.placeService = placeService;
-        this.organisationService = organisationService;
         this.capitaliseBirthCertificate = capitaliseBirthCertificate;
         this.updateCertifiedYearOfBirth = updateCertifiedYearOfBirth;
+        this.addAttributes = addAttributes;
     }
 
     @SuppressWarnings("SameReturnValue")
@@ -76,9 +68,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     public final String getNewBirthCertificate(final Model model) {
         logger.debug("BirthCertificateFormControllerImpl::getNewBirthCertificate");
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, new BirthCertificateCommandImpl());
-        model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
-        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
+        addAttributes.AddBirthCertificate(model);
         return ViewConstants.BIRTH_CERTIFICATE_FORM;
     }
 
@@ -88,9 +78,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
     public final String birthCertificateEdit(@Valid @PathVariable final String id, Model model) {
         logger.debug("BirthCertificateFormControllerImpl::birthCertificateEdit");
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, birthCertificateService.findById(Long.valueOf(id)));
-        model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
-        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
+        addAttributes.AddBirthCertificate(model);
         return ViewConstants.BIRTH_CERTIFICATE_FORM;
     }
 
@@ -106,18 +94,14 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
 
         if (bindingResult.hasErrors()) {
             bindingResult.getAllErrors().forEach(error -> logger.debug(error.getDefaultMessage()));
-            model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-            model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
-            model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
+            addAttributes.AddBirthCertificate(model);
             return ViewConstants.BIRTH_CERTIFICATE_FORM;
         }
 
         BirthCertificateCommand savedCommand = birthCertificateService.saveBirthCertificateCommand(birthCertificateCommand);
         updateCertifiedYearOfBirth.updateCertifiedYearOfBirth(savedCommand);
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, savedCommand);
-        model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
-        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
+        addAttributes.AddBirthCertificate(model);
         return MappingConstants.REDIRECT + CertificateMappingConstants.BIRTH_CERTIFICATE_SHOW.replace("{id}", "" + savedCommand.getId());
     }
 
@@ -129,9 +113,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");
         BirthCertificateCommand savedCommand = birthCertificateConverter.convert(birthCertificateService.findById(Long.valueOf(id)));
         model.addAttribute(AttributeConstants.BIRTH_CERTIFICATE_COMMAND, savedCommand);
-        model.addAttribute(AttributeConstants.PEOPLE, personService.findAll());
-        model.addAttribute(AttributeConstants.PLACES, placeService.findAll());
-        model.addAttribute(AttributeConstants.ORGANISATIONS, organisationService.findAll());
+        addAttributes.AddBirthCertificate(model);
         return ViewConstants.BIRTH_CERTIFICATE_FORM;
     }
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerCapitalisationTest.java

@@ -16,13 +16,11 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
+import scot.carricksoftware.grants.controllers.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.UpdateCertifiedYearOfBirth;
-import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.certificates.birthcertificate.BirthCertificateCommandValidatorImpl;
 
 import static org.mockito.Mockito.verify;
@@ -48,21 +46,15 @@ public class BirthCertificateFormControllerCapitalisationTest {
     @Mock
     private BindingResult bindingResultMock;
 
-    @Mock
-    private PersonService personServiceMock;
-
-    @Mock
-    private PlaceService placeServiceMock;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
-
     @Mock
     private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
 
+    @Mock
+    private AddAttributes addAttributesMock;
+
     @Mock
     private UpdateCertifiedYearOfBirth updateCertifiedYearOfBirthMock;
 
@@ -76,11 +68,9 @@ public class BirthCertificateFormControllerCapitalisationTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                personServiceMock,
-                placeServiceMock,
-                organisationServiceMock,
                 capitaliseBirthCertificateMock,
-                updateCertifiedYearOfBirthMock);
+                updateCertifiedYearOfBirthMock,
+                addAttributesMock);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerSaveOrUpdateTest.java

@@ -15,13 +15,11 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
+import scot.carricksoftware.grants.controllers.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.UpdateCertifiedYearOfBirth;
-import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.certificates.birthcertificate.BirthCertificateCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -45,15 +43,6 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
     @Mock
     private BirthCertificateConverterImpl birthCertificateConverterMock;
 
-    @Mock
-    private PersonService personServiceMock;
-
-    @Mock
-    private PlaceService placeServiceMock;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
-
     @Mock
     private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
@@ -69,19 +58,22 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
     @Mock
     private UpdateCertifiedYearOfBirth updateCertifiedYearOfBirthMock;
 
+    @Mock
+    private AddAttributes addAttributesMock;
+
     private BirthCertificateCommand birthCertificateCommand;
 
+
+
     @BeforeEach
     public void setUp() {
         birthCertificateController = new BirthCertificateFormControllerImpl(birthCertificateServiceMock,
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                personServiceMock,
-                placeServiceMock,
-                organisationServiceMock,
                 capitaliseBirthCertificateMock,
-                updateCertifiedYearOfBirthMock);
+                updateCertifiedYearOfBirthMock,
+                addAttributesMock);
         birthCertificateCommand = new BirthCertificateCommandImpl();
     }
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerTest.java

@@ -9,26 +9,23 @@ package scot.carricksoftware.grants.controllers.certificates.birthcertificates;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
-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.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.constants.AttributeConstants;
+import scot.carricksoftware.grants.controllers.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.domains.certificates.BirthCertificate;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.UpdateCertifiedYearOfBirth;
-import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.certificates.birthcertificate.BirthCertificateCommandValidatorImpl;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomBirthCertificate;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomBirthCertificateCommand;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
@@ -49,21 +46,15 @@ public class BirthCertificateFormControllerTest {
     @Mock
     private BirthCertificateConverterImpl birthCertificateConverterMock;
 
-    @Mock
-    private PersonService personServiceMock;
-
-    @Mock
-    private PlaceService placeServiceMock;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
-
     @Mock
     private Model modelMock;
 
     @Mock
     private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
+    @Mock
+    private AddAttributes addAttributesMock;
+
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
 
@@ -77,37 +68,11 @@ public class BirthCertificateFormControllerTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                personServiceMock,
-                placeServiceMock,
-                organisationServiceMock,
                 capitaliseBirthCertificateMock,
-                updateCertifiedYearOfBirthMock);
+                updateCertifiedYearOfBirthMock,
+                addAttributesMock);
     }
 
-    @Test
-    public void getNewBirthCertificateTest() {
-        ArgumentCaptor<Object> objectCaptor = ArgumentCaptor.forClass(Object.class);
-        ArgumentCaptor<String> stringCaptor = ArgumentCaptor.forClass(String.class);
-        assertEquals("certificates/birthCertificate/form", birthCertificateFormController.getNewBirthCertificate(modelMock));
-        verify(modelMock, atLeast(1)).addAttribute(stringCaptor.capture(), objectCaptor.capture());
-        boolean foundBirthCertificateCommand = false;
-        boolean foundPeople = false;
-        for (int i = 0; i < stringCaptor.getAllValues().size(); i++) {
-            if (stringCaptor.getAllValues().get(i).equals("birthCertificateCommand")) {
-                if (objectCaptor.getAllValues().get(i).getClass().getSimpleName().equals("BirthCertificateCommandImpl")) {
-                    foundBirthCertificateCommand = true;
-                }
-            }
-            if (stringCaptor.getAllValues().get(i).equals("people")) {
-                if (objectCaptor.getAllValues().get(i).getClass().getSimpleName().equals("LinkedList")) {
-                    foundPeople = true;
-                }
-            }
-        }
-
-        assertTrue(foundBirthCertificateCommand && foundPeople);
-
-    }
 
     @Test
     public void birthCertificateEditTestEditTest() {

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerUpdateTest.java

@@ -16,13 +16,11 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
+import scot.carricksoftware.grants.controllers.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.UpdateCertifiedYearOfBirth;
-import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.certificates.birthcertificate.BirthCertificateCommandValidatorImpl;
 
 import static org.mockito.Mockito.verify;
@@ -49,16 +47,10 @@ public class BirthCertificateFormControllerUpdateTest {
     private BindingResult bindingResultMock;
 
     @Mock
-    private PersonService personServiceMock;
-
-    @Mock
-    private PlaceService placeServiceMock;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
+    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
     @Mock
-    private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
+    private AddAttributes addAttributesMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
@@ -76,11 +68,9 @@ public class BirthCertificateFormControllerUpdateTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                personServiceMock,
-                placeServiceMock,
-                organisationServiceMock,
                 capitaliseBirthCertificateMock,
-                updateCertifiedYearOfBirthMock);
+                updateCertifiedYearOfBirthMock,
+                addAttributesMock);
     }
 
 

src/test/java/scot/carricksoftware/grants/controllers/certificates/birthcertificates/BirthCertificateFormControllerValidationTest.java

@@ -16,13 +16,11 @@ import org.springframework.validation.BindingResult;
 import scot.carricksoftware.grants.capitalisation.certificates.birthcertificates.CapitaliseBirthCertificate;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
+import scot.carricksoftware.grants.controllers.AddAttributes;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateCommandConverterImpl;
 import scot.carricksoftware.grants.converters.certificates.birthcertificates.BirthCertificateConverterImpl;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.UpdateCertifiedYearOfBirth;
-import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.services.places.places.PlaceService;
 import scot.carricksoftware.grants.validators.certificates.birthcertificate.BirthCertificateCommandValidatorImpl;
 
 import static org.mockito.Mockito.verify;
@@ -48,21 +46,15 @@ public class BirthCertificateFormControllerValidationTest {
     @Mock
     private BindingResult bindingResultMock;
 
-    @Mock
-    private PersonService personServiceMock;
-
-    @Mock
-    private PlaceService placeServiceMock;
-
-    @Mock
-    private OrganisationService organisationServiceMock;
-
     @Mock
     private CapitaliseBirthCertificate capitaliseBirthCertificateMock;
 
     @Mock
     private BirthCertificateCommandValidatorImpl birthCertificateCommandValidatorImplMock;
 
+    @Mock
+    private AddAttributes addAttributesMock;
+
     @Mock
     private UpdateCertifiedYearOfBirth updateCertifiedYearOfBirthMock;
 
@@ -76,11 +68,9 @@ public class BirthCertificateFormControllerValidationTest {
                 birthCertificateCommandConverterMock,
                 birthCertificateConverterMock,
                 birthCertificateCommandValidatorImplMock,
-                personServiceMock,
-                placeServiceMock,
-                organisationServiceMock,
                 capitaliseBirthCertificateMock,
-                updateCertifiedYearOfBirthMock);
+                updateCertifiedYearOfBirthMock,
+                addAttributesMock);
     }