Added Death Certificate Domain, Service and Repository

src/main/java/scot/carricksoftware/grantswriter/domains/certificates/deathcertificate/DeathCertificate.java

@@ -0,0 +1,462 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grantswriter.domains.certificates.deathcertificate;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.Lob;
+import jakarta.persistence.ManyToOne;
+import org.springframework.format.annotation.DateTimeFormat;
+import scot.carricksoftware.grantswriter.BaseEntity;
+import scot.carricksoftware.grantswriter.constants.ApplicationConstants;
+import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.domains.places.Place;
+import scot.carricksoftware.grantswriter.enums.general.Sex;
+
+@Entity
+public class DeathCertificate extends BaseEntity {
+
+    /*
+     * Copyright (c) Andrew Grant of Carrick Software 24/03/2025, 10:07. All rights reserved.
+     *
+     */
+
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @ManyToOne
+    @JoinColumn(name = "`person_id`")
+    private Person deceased;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Enumerated(EnumType.STRING)
+    @Column(name = "`sex`")
+    private Sex sex;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`occupation`")
+    private String occupation;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`when_born`")
+    @DateTimeFormat(pattern = ApplicationConstants.DATE_TIME_FORMAT)
+    private String whenBorn;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`age`")
+    @DateTimeFormat(pattern = ApplicationConstants.DATE_TIME_FORMAT)
+    private String age;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`marital_status`")
+    private String maritalStatus;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`when_died`")
+    @DateTimeFormat(pattern = ApplicationConstants.DATE_TIME_FORMAT)
+    private String whenDied;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @ManyToOne
+    @JoinColumn(name = "`where_died_id`")
+    private Place whereDied;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`untracked_where_died`")
+    private String untrackedWhereDied;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @ManyToOne
+    @JoinColumn(name = "`usual_residence_id`")
+    private Place usualResidence;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`untracked_usual_residence`")
+    private String untrackedUsualResidence;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`cause_of_death`")
+    @Lob
+    private String causeOfDeath;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @ManyToOne
+    @JoinColumn(name = "`spouse_id`")
+    private Person spouse;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`untracked_spouse`")
+    private String untrackedSpouse;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`spouse_occupation`")
+    private String spouseOccupation;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @ManyToOne
+    @JoinColumn(name = "`father_id`")
+    private Person father;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @JoinColumn(name = "`untracked_father`")
+    private String untrackedFather;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @JoinColumn(name = "`father_occupation`")
+    private String fatherOccupation;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @ManyToOne
+    @JoinColumn(name = "`mother_id`")
+    private Person mother;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @JoinColumn(name = "`untracked_mother`")
+    private String untrackedMother;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @JoinColumn(name = "`mother_occupation`")
+    private String motherOccupation;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @ManyToOne()
+    @JoinColumn(name = "`informant_id`")
+    private Person informant;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @JoinColumn(name = "`informant_address`")
+    private String informantAddress;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`untracked_informant`")
+    private String untrackedInformant;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`informant_qualification`")
+    private String informantQualification;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`when_registered`")
+    private String whenRegistered;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`where_registered`")
+    private String whereRegistered;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`regiment`")
+    private String regiment;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`service_number`")
+    private String serviceNumber;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`service_rank`")
+    private String serviceRank;
+
+    @SuppressWarnings("unused")
+    public Person getDeceased() {
+        return deceased;
+    }
+
+    @SuppressWarnings("unused")
+    public void setDeceased(Person deceased) {
+        this.deceased = deceased;
+    }
+
+    @SuppressWarnings("unused")
+    public Sex getSex() {
+        return sex;
+    }
+
+    @SuppressWarnings("unused")
+    public void setSex(Sex sex) {
+        this.sex = sex;
+    }
+
+    @SuppressWarnings("unused")
+    public String getOccupation() {
+        return occupation;
+    }
+
+    @SuppressWarnings("unused")
+    public void setOccupation(String occupation) {
+        this.occupation = occupation;
+    }
+
+    @SuppressWarnings("unused")
+    public String getWhenBorn() {
+        return whenBorn;
+    }
+
+    @SuppressWarnings("unused")
+    public void setWhenBorn(String whenBorn) {
+        this.whenBorn = whenBorn;
+    }
+
+    @SuppressWarnings("unused")
+    public String getAge() {
+        return age;
+    }
+
+    @SuppressWarnings("unused")
+    public void setAge(String age) {
+        this.age = age;
+    }
+
+    @SuppressWarnings("unused")
+    public String getMaritalStatus() {
+        return maritalStatus;
+    }
+
+    @SuppressWarnings("unused")
+    public void setMaritalStatus(String maritalStatus) {
+        this.maritalStatus = maritalStatus;
+    }
+
+    @SuppressWarnings("unused")
+    public String getWhenDied() {
+        return whenDied;
+    }
+
+    @SuppressWarnings("unused")
+    public void setWhenDied(String whenDied) {
+        this.whenDied = whenDied;
+    }
+
+    @SuppressWarnings("unused")
+    public Place getWhereDied() {
+        return whereDied;
+    }
+
+    @SuppressWarnings("unused")
+    public void setWhereDied(Place whereDied) {
+        this.whereDied = whereDied;
+    }
+
+    @SuppressWarnings("unused")
+    public String getUntrackedWhereDied() {
+        return untrackedWhereDied;
+    }
+
+    @SuppressWarnings("unused")
+    public void setUntrackedWhereDied(String untrackedWhereDied) {
+        this.untrackedWhereDied = untrackedWhereDied;
+    }
+
+    @SuppressWarnings("unused")
+    public Place getUsualResidence() {
+        return usualResidence;
+    }
+
+    @SuppressWarnings("unused")
+    public void setUsualResidence(Place usualResidence) {
+        this.usualResidence = usualResidence;
+    }
+
+    @SuppressWarnings("unused")
+    public String getUntrackedUsualResidence() {
+        return untrackedUsualResidence;
+    }
+
+    @SuppressWarnings("unused")
+    public void setUntrackedUsualResidence(String untrackedUsualResidence) {
+        this.untrackedUsualResidence = untrackedUsualResidence;
+    }
+
+    @SuppressWarnings("unused")
+    public String getCauseOfDeath() {
+        return causeOfDeath;
+    }
+
+    @SuppressWarnings("unused")
+    public void setCauseOfDeath(String causeOfDeath) {
+        this.causeOfDeath = causeOfDeath;
+    }
+
+    @SuppressWarnings("unused")
+    public Person getSpouse() {
+        return spouse;
+    }
+
+    @SuppressWarnings("unused")
+    public void setSpouse(Person spouse) {
+        this.spouse = spouse;
+    }
+
+    @SuppressWarnings("unused")
+    public String getUntrackedSpouse() {
+        return untrackedSpouse;
+    }
+
+    @SuppressWarnings("unused")
+    public void setUntrackedSpouse(String untrackedSpouse) {
+        this.untrackedSpouse = untrackedSpouse;
+    }
+
+    @SuppressWarnings("unused")
+    public String getSpouseOccupation() {
+        return spouseOccupation;
+    }
+
+    @SuppressWarnings("unused")
+    public void setSpouseOccupation(String spouseOccupation) {
+        this.spouseOccupation = spouseOccupation;
+    }
+
+    @SuppressWarnings("unused")
+    public Person getFather() {
+        return father;
+    }
+
+    @SuppressWarnings("unused")
+    public void setFather(Person father) {
+        this.father = father;
+    }
+
+    @SuppressWarnings("unused")
+    public String getUntrackedFather() {
+        return untrackedFather;
+    }
+
+    @SuppressWarnings("unused")
+    public void setUntrackedFather(String untrackedFather) {
+        this.untrackedFather = untrackedFather;
+    }
+
+    @SuppressWarnings("unused")
+    public String getFatherOccupation() {
+        return fatherOccupation;
+    }
+
+    @SuppressWarnings("unused")
+    public void setFatherOccupation(String fatherOccupation) {
+        this.fatherOccupation = fatherOccupation;
+    }
+
+    @SuppressWarnings("unused")
+    public Person getMother() {
+        return mother;
+    }
+
+    @SuppressWarnings("unused")
+    public void setMother(Person mother) {
+        this.mother = mother;
+    }
+
+    @SuppressWarnings("unused")
+    public String getUntrackedMother() {
+        return untrackedMother;
+    }
+
+    @SuppressWarnings("unused")
+    public void setUntrackedMother(String untrackedMother) {
+        this.untrackedMother = untrackedMother;
+    }
+
+    @SuppressWarnings("unused")
+    public String getMotherOccupation() {
+        return motherOccupation;
+    }
+
+    @SuppressWarnings("unused")
+    public void setMotherOccupation(String motherOccupation) {
+        this.motherOccupation = motherOccupation;
+    }
+
+    @SuppressWarnings("unused")
+    public Person getInformant() {
+        return informant;
+    }
+
+    @SuppressWarnings("unused")
+    public void setInformant(Person informant) {
+        this.informant = informant;
+    }
+
+    @SuppressWarnings("unused")
+    public String getInformantAddress() {
+        return informantAddress;
+    }
+
+    @SuppressWarnings("unused")
+    public void setInformantAddress(String informantAddress) {
+        this.informantAddress = informantAddress;
+    }
+
+    @SuppressWarnings("unused")
+    public String getUntrackedInformant() {
+        return untrackedInformant;
+    }
+
+    @SuppressWarnings("unused")
+    public void setUntrackedInformant(String untrackedInformant) {
+        this.untrackedInformant = untrackedInformant;
+    }
+
+    @SuppressWarnings("unused")
+    public String getInformantQualification() {
+        return informantQualification;
+    }
+
+    @SuppressWarnings("unused")
+    public void setInformantQualification(String informantQualification) {
+        this.informantQualification = informantQualification;
+    }
+
+    @SuppressWarnings("unused")
+    public String getWhenRegistered() {
+        return whenRegistered;
+    }
+
+    @SuppressWarnings("unused")
+    public void setWhenRegistered(String whenRegistered) {
+        this.whenRegistered = whenRegistered;
+    }
+
+    @SuppressWarnings("unused")
+    public String getWhereRegistered() {
+        return whereRegistered;
+    }
+
+    @SuppressWarnings("unused")
+    public void setWhereRegistered(String whereRegistered) {
+        this.whereRegistered = whereRegistered;
+    }
+
+    @SuppressWarnings("unused")
+    public String getRegiment() {
+        return regiment;
+    }
+
+    @SuppressWarnings("unused")
+    public void setRegiment(String regiment) {
+        this.regiment = regiment;
+    }
+
+    @SuppressWarnings("unused")
+    public String getServiceNumber() {
+        return serviceNumber;
+    }
+
+    @SuppressWarnings("unused")
+    public void setServiceNumber(String serviceNumber) {
+        this.serviceNumber = serviceNumber;
+    }
+
+    @SuppressWarnings("unused")
+    public String getServiceRank() {
+        return serviceRank;
+    }
+
+    @SuppressWarnings("unused")
+    public void setServiceRank(String serviceRank) {
+        this.serviceRank = serviceRank;
+    }
+}

src/main/java/scot/carricksoftware/grantswriter/repositories/certificates/deathcertificate/DeathCertificateRepository.java

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 11/03/2025, 19:47. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grantswriter.repositories.certificates.deathcertificate;
+
+import org.springframework.stereotype.Repository;
+import scot.carricksoftware.grantswriter.domains.certificates.deathcertificate.DeathCertificate;
+import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.repositories.ReadOnlyRepository;
+
+@SuppressWarnings("unused")
+@Repository
+public interface DeathCertificateRepository extends ReadOnlyRepository<DeathCertificate, Long> {
+
+    Iterable<DeathCertificate> findAllByDeceased(Person person);
+
+    Iterable<DeathCertificate> findAllByInformant(Person person);
+
+    Iterable<DeathCertificate> findAllBySpouse(Person person);
+}

src/main/java/scot/carricksoftware/grantswriter/services/certificates/deathcertificate/DeathCertificateService.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grantswriter.services.certificates.deathcertificate;
+
+
+import scot.carricksoftware.grantswriter.domains.certificates.deathcertificate.DeathCertificate;
+import scot.carricksoftware.grantswriter.domains.people.Person;
+
+import java.util.List;
+
+public interface DeathCertificateService {
+
+    @SuppressWarnings("unused")
+    List<DeathCertificate> findAllByDeceased(Person person);
+
+    @SuppressWarnings("unused")
+    List<DeathCertificate> findAllByInformant(Person person);
+
+    @SuppressWarnings("unused")
+    List<DeathCertificate> findAllBySpouse(Person person);
+}

src/main/java/scot/carricksoftware/grantswriter/services/certificates/deathcertificate/DeathCertificateServiceImpl.java

@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grantswriter.services.certificates.deathcertificate;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.stereotype.Component;
+import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.domains.certificates.deathcertificate.DeathCertificate;
+import scot.carricksoftware.grantswriter.repositories.certificates.deathcertificate.DeathCertificateRepository;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class DeathCertificateServiceImpl implements DeathCertificateService {
+
+    private static final Logger logger = LogManager.getLogger(DeathCertificateServiceImpl.class);
+
+    private final DeathCertificateRepository deathCertificateRepository;
+
+    public DeathCertificateServiceImpl(DeathCertificateRepository deathCertificateRepository) {
+        this.deathCertificateRepository = deathCertificateRepository;
+    }
+
+    @Override
+    public List<DeathCertificate> findAllByDeceased(Person person) {
+        logger.debug("PersonServiceImpl::findAllByDeceased");
+        List<DeathCertificate> result = new ArrayList<>();
+        Iterable<DeathCertificate> deathCertificatesIterable = deathCertificateRepository.findAllByDeceased(person);
+        for (DeathCertificate deathCertificate : deathCertificatesIterable) {
+            result.add(deathCertificate);
+        }
+        return result;
+    }
+
+
+    @Override
+    public List<DeathCertificate> findAllBySpouse(Person person) {
+        logger.debug("PersonServiceImpl::findAllBySpouse");
+        List<DeathCertificate> result = new ArrayList<>();
+        Iterable<DeathCertificate> deathCertificatesIterable = deathCertificateRepository.findAllBySpouse(person);
+        for (DeathCertificate deathCertificate : deathCertificatesIterable) {
+            result.add(deathCertificate);
+        }
+        return result;
+    }
+
+    @Override
+    public List<DeathCertificate> findAllByInformant(Person person) {
+        logger.debug("PersonServiceImpl::findAllByInformant");
+        List<DeathCertificate> result = new ArrayList<>();
+        Iterable<DeathCertificate> deathCertificatesIterable = deathCertificateRepository.findAllByInformant(person);
+        for (DeathCertificate deathCertificate : deathCertificatesIterable) {
+            result.add(deathCertificate);
+        }
+        return result;
+    }
+}

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherBirthCertificateTimeLineDataImpl.java

@@ -9,10 +9,10 @@ import org.springframework.stereotype.Component;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.services.certificates.birthcertificate.BirthCertificateService;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.GatherBirthCertificateFatherTimeLineData;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.GatherBirthCertificateInformantTimeLineData;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.GatherBirthCertificateMotherTimeLineData;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.GatherBirthCertificateNewBornTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateFatherTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateInformantTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateMotherTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineData;
 
 import java.util.List;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateFatherTimeLineData.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateFatherTimeLineData.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate;
 
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateFatherTimeLineDataImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateFatherTimeLineDataImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateInformantTimeLineData.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateInformantTimeLineData.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate;
 
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateInformantTimeLineDataImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateInformantTimeLineDataImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateMotherTimeLineData.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateMotherTimeLineData.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate;
 
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateMotherTimeLineDataImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateMotherTimeLineDataImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateNewBornTimeLineData.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineData.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate;
 
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateNewBornTimeLineDataImpl.java → src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/birthcertificate/GatherBirthCertificateNewBornTimeLineDataImpl.java

@@ -3,7 +3,7 @@
  *
  */
 
-package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2;
+package scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/GatherBirthCertificateTimeLineDataTest.java

@@ -13,10 +13,10 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.services.certificates.birthcertificate.BirthCertificateService;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.GatherBirthCertificateFatherTimeLineData;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.GatherBirthCertificateInformantTimeLineDataImpl;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.GatherBirthCertificateMotherTimeLineData;
-import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.GatherBirthCertificateNewBornTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateFatherTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateInformantTimeLineDataImpl;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateMotherTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineData;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateFatherTimeLineDataFatherTest.java

@@ -14,6 +14,8 @@ import scot.carricksoftware.grantswriter.data.DMY;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateFatherTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateFatherTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateFatherTimeLineDataRefsTest.java

@@ -13,6 +13,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateFatherTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateFatherTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateInformantTimeLineDataInformantTest.java

@@ -14,6 +14,8 @@ import scot.carricksoftware.grantswriter.data.DMY;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateInformantTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateInformantTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateInformantTimeLineDataRefsTest.java

@@ -13,6 +13,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateInformantTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateInformantTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateMotherTimeLineDataMotherTest.java

@@ -14,6 +14,8 @@ import scot.carricksoftware.grantswriter.data.DMY;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateMotherTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateMotherTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateMotherTimeLineDataRefsTest.java

@@ -13,6 +13,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateMotherTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateMotherTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateNewBornTimeLineDataFatherTest.java

@@ -14,6 +14,8 @@ import scot.carricksoftware.grantswriter.data.DMY;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateNewBornTimeLineDataMotherTest.java

@@ -14,6 +14,8 @@ import scot.carricksoftware.grantswriter.data.DMY;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateNewBornTimeLineDataRefsTest.java

@@ -13,6 +13,8 @@ import org.mockito.junit.jupiter.MockitoExtension;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateNewBornTimeLineDataWhenRegisteredTest.java

@@ -15,6 +15,8 @@ import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.people.Person;
 import scot.carricksoftware.grantswriter.domains.places.Place;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;

src/test/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/GatherBirthCertificateNewBornTimeLineDataWhereBornTest.java

@@ -14,6 +14,8 @@ import scot.carricksoftware.grantswriter.data.DMY;
 import scot.carricksoftware.grantswriter.data.TimeLineData;
 import scot.carricksoftware.grantswriter.domains.certificates.birthcertificate.BirthCertificate;
 import scot.carricksoftware.grantswriter.domains.places.Place;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineData;
+import scot.carricksoftware.grantswriter.writer.latex.parts.people.subsections.helpers.level2.birthcertificate.GatherBirthCertificateNewBornTimeLineDataImpl;
 
 import java.util.ArrayList;
 import java.util.List;