GatherMarriageCertificateGroomTimeLine::AddGroomRank

GatherMarriageCertificateBrideTimeLine::AddBrideRank

src/main/java/scot/carricksoftware/grantswriter/domains/certificates/marriagecertificate/MarriageCertificate.java

@@ -80,6 +80,14 @@ public class MarriageCertificate extends BaseCertificate {
     @Column(name = "`untracked_second_witness`")
     private String untrackedSecondWitness;
 
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`groom_rank`")
+    private String groomRank;
+
+    @SuppressWarnings("JpaDataSourceORMInspection")
+    @Column(name = "`bride_rank`")
+    private String brideRank;
+
     public Person getBride() {
         return bride;
     }
@@ -181,5 +189,19 @@ public class MarriageCertificate extends BaseCertificate {
         this.whenMarried = whenMarried;
     }
 
+    public String getGroomRank() {
+        return groomRank;
+    }
+
+    public void setGroomRank(String groomRank) {
+        this.groomRank = groomRank;
+    }
 
+    public String getBrideRank() {
+        return brideRank;
+    }
+
+    public void setBrideRank(String brideRank) {
+        this.brideRank = brideRank;
+    }
 }

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/marriagecertificate/GatherMarriageCertificateBrideTimeLineDataImpl.java

@@ -34,6 +34,7 @@ public class GatherMarriageCertificateBrideTimeLineDataImpl implements GatherMar
         logger.info("GatherMarriageCertificateBrideTimeLineDataImpl::Gather");
         for (MarriageCertificate marriageCertificate : marriageCertificates) {
             addWhenMarried(timelineData.getTimeLine(), marriageCertificate);
+            addBrideRank(timelineData.getTimeLine(), marriageCertificate);
             addRefs(marriageCertificate);
         }
     }
@@ -60,6 +61,19 @@ public class GatherMarriageCertificateBrideTimeLineDataImpl implements GatherMar
 
     }
 
+    private void addBrideRank(TreeMap<DMY, List<String>> timeLine, MarriageCertificate marriageCertificate) {
+        logger.info("GatherMarriageCertificateBrideTimeLineDataImpl::AddBrideRank");
+
+        if (marriageCertificate.getBrideRank() != null  && !marriageCertificate.getBrideRank().isEmpty()) {
+            List<String> existingValues = timeLine.get(getDMY(marriageCertificate.getWhenMarried()));
+            if (existingValues == null) {
+                existingValues = new ArrayList<>();
+            }
+            existingValues.add("Rank registered as " + marriageCertificate.getBrideRank());
+            timeLine.put(getDMY(marriageCertificate.getWhenMarried()), existingValues);
+        }
+    }
+
 
     private DMY getDMY(String dateKey) {
         DMY dmyKey = new DMYImpl();

src/main/java/scot/carricksoftware/grantswriter/writer/latex/parts/people/subsections/helpers/level2/marriagecertificate/GatherMarriageCertificateGroomTimeLineDataImpl.java

@@ -33,6 +33,7 @@ public class GatherMarriageCertificateGroomTimeLineDataImpl implements GatherMar
         logger.info("GatherMarriageCertificateGroomTimeLineDataImpl::Gather");
         for (MarriageCertificate marriageCertificate : marriageCertificates) {
             addWhenMarried(timelineData.getTimeLine(), marriageCertificate);
+            addGroomRank(timelineData.getTimeLine(), marriageCertificate);
             addRefs(marriageCertificate);
         }
     }
@@ -58,6 +59,19 @@ public class GatherMarriageCertificateGroomTimeLineDataImpl implements GatherMar
         timeLine.put(getDMY(marriageCertificate.getWhenMarried()), existingValues);
     }
 
+    private void addGroomRank(TreeMap<DMY, List<String>> timeLine, MarriageCertificate marriageCertificate) {
+        logger.info("GatherMarriageCertificateBrideTimeLineDataImpl::AddGroomRank");
+
+        if (marriageCertificate.getGroomRank() != null  && !marriageCertificate.getGroomRank().isEmpty()) {
+            List<String> existingValues = timeLine.get(getDMY(marriageCertificate.getWhenMarried()));
+            if (existingValues == null) {
+                existingValues = new ArrayList<>();
+            }
+            existingValues.add("Rank registered as " + marriageCertificate.getGroomRank());
+            timeLine.put(getDMY(marriageCertificate.getWhenMarried()), existingValues);
+        }
+    }
+
 
     private DMY getDMY(String dateKey) {
         DMY dmyKey = new DMYImpl();

src/test/java/scot/carricksoftware/grantswriter/domains/certificates/marriagecertificate/MarriageCertificateStringTest.java

@@ -7,7 +7,6 @@ package scot.carricksoftware.grantswriter.domains.certificates.marriagecertifica
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import scot.carricksoftware.grantswriter.domains.certificates.marriagecertificate.MarriageCertificate;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -36,4 +35,26 @@ class MarriageCertificateStringTest {
         assertEquals(string, marriageCertificate.getWhenMarried());
     }
 
+    @Test
+    void getBrideRankTest() {
+        assertNull(marriageCertificate.getBrideRank());
+    }
+
+    @Test
+    void setBrideRankTest() {
+        marriageCertificate.setBrideRank(string);
+        assertEquals(string, marriageCertificate.getBrideRank());
+    }
+
+    @Test
+    void getGroomRankTest() {
+        assertNull(marriageCertificate.getGroomRank());
+    }
+
+    @Test
+    void setGroomRankTest() {
+        marriageCertificate.setGroomRank(string);
+        assertEquals(string, marriageCertificate.getGroomRank());
+    }
+
 }