DataLoadMarriageCertificates

src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadBirthCertificates.java

@@ -11,12 +11,8 @@ import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommand;
 import scot.carricksoftware.grants.commands.certificates.birthcertificates.BirthCertificateCommandImpl;
-import scot.carricksoftware.grants.enums.certificates.CertificateType;
-import scot.carricksoftware.grants.enums.general.Sex;
 import scot.carricksoftware.grants.services.certificates.birthcertificates.BirthCertificateService;
 import scot.carricksoftware.grants.services.people.PersonService;
-import scot.carricksoftware.grants.services.places.organisations.OrganisationService;
-import scot.carricksoftware.grants.services.places.places.PlaceService;
 
 
 @Component
@@ -24,18 +20,13 @@ import scot.carricksoftware.grants.services.places.places.PlaceService;
 public class DataLoadBirthCertificates {
 
     private static final Logger logger = LogManager.getLogger(DataLoadBirthCertificates.class);
-    private final OrganisationService organisationService;
     private final BirthCertificateService birthCertificateService;
     private final PersonService personService;
-    private final PlaceService placeService;
 
-    public DataLoadBirthCertificates(OrganisationService organisationService,
-                                     BirthCertificateService birthCertificateService,
-                                     PersonService personService, PlaceService placeService) {
-        this.organisationService = organisationService;
+    public DataLoadBirthCertificates(BirthCertificateService birthCertificateService,
+                                     PersonService personService) {
         this.birthCertificateService = birthCertificateService;
         this.personService = personService;
-        this.placeService = placeService;
     }
 
     public void load() {
@@ -47,38 +38,11 @@ public class DataLoadBirthCertificates {
         logger.debug("DataLoadBirthCertificates::LoadBirthCertificates");
         BirthCertificateCommand birthCertificateCommand = new BirthCertificateCommandImpl();
 
-        birthCertificateCommand.setCertificateNumber("999");
-        birthCertificateCommand.setCertificateDate("25/01/1953");
-        birthCertificateCommand.setCertificateType(CertificateType.EXTRACT);
-
-        birthCertificateCommand.setRegistrationAuthority(organisationService.findById(2L));
-        birthCertificateCommand.setVolume("01");
-        birthCertificateCommand.setNumber("02");
-        birthCertificateCommand.setCertificateSource(organisationService.findById(1L));
-
-        birthCertificateCommand.setNewBorn(personService.findById(3L));
-        birthCertificateCommand.setSex(Sex.MALE);
-        birthCertificateCommand.setWhenBorn("25/01/1953 01:01");
-        birthCertificateCommand.setUntrackedWhereBorn("Edinburgh");
         birthCertificateCommand.setFather(personService.findById(1L));
-        birthCertificateCommand.setUntrackedFather("Untracked Father");
-
         birthCertificateCommand.setMother(personService.findById(2L));
-        birthCertificateCommand.setWhereBorn(placeService.findById(1L));
-        birthCertificateCommand.setInformant(personService.findById(1L));
-        birthCertificateCommand.setUntrackedInformant("Untracked Informant");
-        birthCertificateCommand.setInformantQualification("Qualification");
-        birthCertificateCommand.setWhenRegistered("22/01/1978");
-        birthCertificateCommand.setWhereRegistered("Where Registered");
-        birthCertificateCommand.setFatherUsualResidence(placeService.findById(1L));
-        birthCertificateCommand.setUntrackedFatherUsualResidence("57 Back Street, Edinburgh");
-        birthCertificateCommand.setInformantResidence("2 Wilson Avenue, Edinburgh");
-        birthCertificateCommand.setMotherUsualResidence(placeService.findById(1L));
-        birthCertificateCommand.setUntrackedMotherUsualResidence("92 Broughton Road, Edinburgh");
-        birthCertificateCommand.setMotherPlaceOfBirth("Drop");
-        birthCertificateCommand.setFatherPlaceOfBirth("Drip");
+        birthCertificateCommand.setNewBorn(personService.findById(3L));
+
         birthCertificateService.saveBirthCertificateCommand(birthCertificateCommand);
     }
 
-
 }

src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadCertificates.java

@@ -17,19 +17,23 @@ public class DataLoadCertificates {
     private static final Logger logger = LogManager.getLogger(DataLoadCertificates.class);
 
     private final DataLoadBirthCertificates dataLoadBirthCertificates;
-    private final DataLoadDeathCertificates dataLoadDeathertificates;
+    private final DataLoadDeathCertificates dataLoadDeathCertificates;
+    private final DataLoadMarriageCertificates dataLoadMarriageCertificates;
 
     public DataLoadCertificates(DataLoadBirthCertificates dataLoadBirthCertificates,
-                                DataLoadDeathCertificates dataLoadDeathertificates) {
+                                DataLoadDeathCertificates dataLoadDeathCertificates,
+                                DataLoadMarriageCertificates dataLoadMarriageCertificates) {
         this.dataLoadBirthCertificates = dataLoadBirthCertificates;
-        this.dataLoadDeathertificates = dataLoadDeathertificates;
+        this.dataLoadDeathCertificates = dataLoadDeathCertificates;
+        this.dataLoadMarriageCertificates = dataLoadMarriageCertificates;
     }
 
 
     public void load() {
         logger.debug("DataLoadCertificates::load");
         dataLoadBirthCertificates.load();
-        dataLoadDeathertificates.load();
+        dataLoadDeathCertificates.load();
+        dataLoadMarriageCertificates.load();
     }
 
 

src/main/java/scot/carricksoftware/grants/bootstrap/DataLoadMarriageCertificates.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c)  18 Feb 2025, Andrew Grant of Carrick Software .
+ * All rights reserved.
+ */
+
+package scot.carricksoftware.grants.bootstrap;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommand;
+import scot.carricksoftware.grants.commands.certificates.marriagecertificates.MarriageCertificateCommandImpl;
+import scot.carricksoftware.grants.services.certificates.marriagecertificates.MarriageCertificateService;
+import scot.carricksoftware.grants.services.people.PersonService;
+
+
+@Component
+@Profile("dev")
+public class DataLoadMarriageCertificates {
+
+    private static final Logger logger = LogManager.getLogger(DataLoadMarriageCertificates.class);
+    private final PersonService personService;
+    private final MarriageCertificateService marriageCertificateService;
+
+    public DataLoadMarriageCertificates(PersonService personService,
+                                        MarriageCertificateService marriageCertificateService) {
+        this.personService = personService;
+        this.marriageCertificateService = marriageCertificateService;
+    }
+
+    public void load() {
+        logger.debug("DataLoadDeathCertificates::load");
+        loadDeathCertificates();
+    }
+
+
+    private void loadDeathCertificates() {
+        logger.debug("DataLoadCertificates::LoadDeathCertificates");
+        MarriageCertificateCommand marriageCertificateCommand = new MarriageCertificateCommandImpl();
+        marriageCertificateCommand.setGroom(personService.findById(1L));
+        marriageCertificateCommand.setBride(personService.findById(2L));
+
+        marriageCertificateService.saveMarriageCertificateCommand(marriageCertificateCommand);
+    }
+
+
+}

src/test/java/scot/carricksoftware/grants/validators/certificates/deathcertificate/DeathCertificateFieldsValidatorImplTest.java

@@ -42,18 +42,17 @@ class DeathCertificateFieldsValidatorImplTest {
 
     @SuppressWarnings("unused")
     DeathCertificateCommand deathCertificateCommand;
-    Person deceased;
-    String certificateNumber;
-    String volume;
-    String number;
-    String causeOfDeath;
-    String informantQualification;
-    String certificateDate;
-    String whenDied;
-    final Sex sex = Sex.FEMALE;
-    Organisation certificateSource;
-    Organisation registrationAuthority;
-    CertificateType certificateType;
+    private Person deceased;
+    private String certificateNumber;
+    private String volume;
+    private String number;
+    private String causeOfDeath;
+    private String informantQualification;
+    private String whenDied;
+    private final Sex sex = Sex.FEMALE;
+    private Organisation certificateSource;
+    private Organisation registrationAuthority;
+    private CertificateType certificateType;
 
     @BeforeEach
     void setUp() {
@@ -66,10 +65,11 @@ class DeathCertificateFieldsValidatorImplTest {
         number = GetRandomString();
         causeOfDeath = GetRandomString();
         informantQualification = GetRandomString();
+        whenDied = GetRandomString();
         certificateSource = GetRandomOrganisation();
         certificateType = CertificateType.EXTRACT;
         registrationAuthority = GetRandomOrganisation();
-        certificateDate = GetRandomString();
+        String certificateDate = GetRandomString();
         deathCertificateCommand.setDeceased(deceased);
         deathCertificateCommand.setCertificateNumber(certificateNumber);
         deathCertificateCommand.setVolume(volume);
@@ -82,7 +82,6 @@ class DeathCertificateFieldsValidatorImplTest {
         deathCertificateCommand.setCertificateType(certificateType);
         deathCertificateCommand.setCertificateDate(certificateDate);
         deathCertificateCommand.setWhenDied(whenDied);
-
     }
 
     @Test