Birth Certificate whereBorn changed to UntrackedWhereBorn

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

@@ -62,7 +62,7 @@ public class DataLoadCertificates {
         birthCertificateCommand.setNewBorn(personService.findById(3L));
         birthCertificateCommand.setSex(Sex.MALE);
         birthCertificateCommand.setWhenBorn("25/01/1953 01:01");
-        birthCertificateCommand.setWhereBorn("Edinburgh");
+        birthCertificateCommand.setUntrackedWhereBorn("Edinburgh");
         birthCertificateCommand.setFather(personService.findById(1L));
         birthCertificateCommand.setUntrackedFather("Untracked Father");
 

src/main/java/scot/carricksoftware/grants/commands/certificates/birthcertificates/BirthCertificateCommand.java

@@ -58,9 +58,9 @@ public interface BirthCertificateCommand {
 
     void setWhenBorn(String whenBorn);
 
-    String getWhereBorn();
+    String getUntrackedWhereBorn();
 
-    void setWhereBorn(String whereBorn);
+    void setUntrackedWhereBorn(String untrackedWhereBorn);
 
     Sex getSex();
 

src/main/java/scot/carricksoftware/grants/commands/certificates/birthcertificates/BirthCertificateCommandImpl.java

@@ -32,7 +32,7 @@ public class BirthCertificateCommandImpl implements BirthCertificateCommand {
 
     private String whenBorn;
 
-    private String whereBorn;
+    private String untrackedWhereBorn;
 
     private Sex sex;
 
@@ -147,13 +147,13 @@ public class BirthCertificateCommandImpl implements BirthCertificateCommand {
     }
 
     @Override
-    public String getWhereBorn() {
-        return whereBorn;
+    public String getUntrackedWhereBorn() {
+        return untrackedWhereBorn;
     }
 
     @Override
-    public void setWhereBorn(String whereBorn) {
-        this.whereBorn = whereBorn;
+    public void setUntrackedWhereBorn(String untrackedWhereBorn) {
+        this.untrackedWhereBorn = untrackedWhereBorn;
     }
 
     @Override

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

@@ -91,7 +91,7 @@ public class BirthCertificateFormControllerImpl implements BirthCertificateFormC
         logger.debug("BirthCertificateFormControllerImpl::saveOrUpdate");
 
         birthCertificateCommandValidatorImpl.validate(birthCertificateCommand, bindingResult);
-        birthCertificateCommand.setWhereBorn(capitalisation.getCapitalisation(birthCertificateCommand.getWhereBorn()));
+        birthCertificateCommand.setUntrackedWhereBorn(capitalisation.getCapitalisation(birthCertificateCommand.getUntrackedWhereBorn()));
         birthCertificateCommand.setUntrackedFather(capitalisation.getCapitalisation(birthCertificateCommand.getUntrackedFather()));
 
 

src/main/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateCommandConverterImpl.java

@@ -28,7 +28,7 @@ public class BirthCertificateCommandConverterImpl implements BirthCertificateCom
         target.setNumber(source.getNumber());
         target.setSex(source.getSex());
         target.setWhenBorn(source.getWhenBorn());
-        target.setWhereBorn(source.getWhereBorn());
+        target.setUntrackedWhereBorn(source.getUntrackedWhereBorn());
         target.setFather(source.getFather());
         target.setUntrackedFather(source.getUntrackedFather());
         target.setFatherRank(source.getFatherRank());

src/main/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateConverterImpl.java

@@ -32,7 +32,7 @@ public class BirthCertificateConverterImpl implements BirthCertificateConverter
         target.setNumber(source.getNumber());
         target.setSex(source.getSex());
         target.setWhenBorn(source.getWhenBorn());
-        target.setWhereBorn(source.getWhereBorn());
+        target.setUntrackedWhereBorn(source.getUntrackedWhereBorn());
         target.setFather(source.getFather());
         target.setUntrackedFather(source.getUntrackedFather());
         target.setFatherRank(source.getFatherRank());

src/main/java/scot/carricksoftware/grants/domains/certificates/BirthCertificate.java

@@ -31,8 +31,8 @@ public class BirthCertificate extends BaseCertificate {
     private String whenBorn;
 
     @SuppressWarnings("JpaDataSourceORMInspection")
-    @Column(name = "`where_born`")
-    private String whereBorn;
+    @Column(name = "`untracked_where_born`")
+    private String untrackedWhereBorn;
 
     @SuppressWarnings("JpaDataSourceORMInspection")
     @Enumerated(EnumType.STRING)
@@ -77,12 +77,12 @@ public class BirthCertificate extends BaseCertificate {
         this.whenBorn = whenBorn;
     }
 
-    public String getWhereBorn() {
-        return whereBorn;
+    public String getUntrackedWhereBorn() {
+        return untrackedWhereBorn;
     }
 
-    public void setWhereBorn(String whereBorn) {
-        this.whereBorn = whereBorn;
+    public void setUntrackedWhereBorn(String untrackedWhereBorn) {
+        this.untrackedWhereBorn = untrackedWhereBorn;
     }
 
     public Sex getSex() {

src/main/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartThreeValidatorImpl.java

@@ -37,7 +37,7 @@ public class BirthCertificateCommandPartThreeValidatorImpl implements BirthCerti
 
     private void validateWhereBorn(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {
         logger.debug("Validating where born");
-        validateTypes.validateNullOrEmptyString(birthCertificateCommand.getWhereBorn(), "whereBorn", ValidationConstants.WHERE_BORN_IS_NULL, bindingResult);
+        validateTypes.validateNullOrEmptyString(birthCertificateCommand.getUntrackedWhereBorn(), "untrackedWhereBorn", ValidationConstants.WHERE_BORN_IS_NULL, bindingResult);
     }
 
     private void validateSex(BirthCertificateCommand birthCertificateCommand, BindingResult bindingResult) {

src/main/resources/templates/certificates/birthCertificate/form.html

@@ -209,15 +209,15 @@
             </td>
             <tr>
             <td style="text-align: right;">
-                <label for="whereBorn">Where Born&nbsp;</label>
+                <label for="untrackedWhereBorn">Where Born&nbsp;</label>
             </td>
             <td style="text-align: left;">
                 <div>
-                    <input class="number" id="whereBorn"
-                           th:field="*{whereBorn}" type="text">
-                    <div th:if="${#fields.hasErrors('whereBorn')}">
+                    <input class="untrackedWhereBorn" id="untrackedWhereBorn"
+                           th:field="*{untrackedWhereBorn}" type="text">
+                    <div th:if="${#fields.hasErrors('untrackedWhereBorn')}">
                         <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('whereBorn')}" th:text="${err}"/>
+                            <li th:each="err : ${#fields.errors('untrackedWhereBorn')}" th:text="${err}"/>
                         </ul>
                     </div>
                 </div>

src/test/java/scot/carricksoftware/grants/bootstrap/DataLoadCertificatesBirthCertificatesTest.java

@@ -80,7 +80,7 @@ public class DataLoadCertificatesBirthCertificatesTest {
         assertEquals(newBornMock, captor.getValue().getNewBorn());
         assertEquals(Sex.MALE, captor.getValue().getSex());
         assertEquals("25/01/1953 01:01",captor.getValue().getWhenBorn());
-        assertEquals("Edinburgh",captor.getValue().getWhereBorn());
+        assertEquals("Edinburgh",captor.getValue().getUntrackedWhereBorn());
         assertEquals(fatherMock, captor.getValue().getFather());
         assertEquals("Untracked Father", captor.getValue().getUntrackedFather());
         assertEquals(motherMock, captor.getValue().getMother());

src/test/java/scot/carricksoftware/grants/commands/certificates/BirthCertificateCommandThreeFieldsTest.java

@@ -38,15 +38,15 @@ class BirthCertificateCommandThreeFieldsTest {
     }
 
     @Test
-    public void getWhereBornTest() {
-        assertNull(command.getWhereBorn());
+    public void getUntrackedWhereBornTest() {
+        assertNull(command.getUntrackedWhereBorn());
     }
 
     @Test
-    public void setWhereBornTest() {
+    public void setUntrackedWhereBornTest() {
         String string;
-        command.setWhereBorn(string = GetRandomString());
-        assertEquals(string, command.getWhereBorn());
+        command.setUntrackedWhereBorn(string = GetRandomString());
+        assertEquals(string, command.getUntrackedWhereBorn());
     }
 
     @Test

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

@@ -95,12 +95,12 @@ public class BirthCertificateFormControllerSaveOrUpdateTest {
     public void capitalisationIsAppliedIsAppliedTest() {
         String whereBorn = "where born";
         String untrackedFather = "untracked father";
-        birthCertificateCommand.setWhereBorn(whereBorn);
+        birthCertificateCommand.setUntrackedWhereBorn(whereBorn);
         birthCertificateCommand.setUntrackedFather(untrackedFather);
         when(birthCertificateServiceMock.saveBirthCertificateCommand(any(BirthCertificateCommand.class))).thenReturn(birthCertificateCommand);
 
         birthCertificateController.saveOrUpdate(birthCertificateCommand, bindingResultMock, modelMock);
-        assertEquals("Where Born", birthCertificateCommand.getWhereBorn());
+        assertEquals("Where Born", birthCertificateCommand.getUntrackedWhereBorn());
         assertEquals("Untracked Father", birthCertificateCommand.getUntrackedFather());
     }
 

src/test/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateCommandConverterTest.java

@@ -64,7 +64,7 @@ class BirthCertificateCommandConverterTest {
         source.setRegistrationAuthority(registrationAuthority);
         source.setSex(sex);
         source.setWhenBorn(whenBorn);
-        source.setWhereBorn(whereBorn);
+        source.setUntrackedWhereBorn(whereBorn);
         source.setFather(father);
         source.setMother(mother);
         source.setDateAndPlaceOfMarriage(dateAndPlaceOfMarriage);
@@ -85,7 +85,7 @@ class BirthCertificateCommandConverterTest {
         assertEquals(number, target.getNumber());
         assertEquals(registrationAuthority, target.getRegistrationAuthority());
         assertEquals(sex, target.getSex());
-        assertEquals(whereBorn, target.getWhereBorn());
+        assertEquals(whereBorn, target.getUntrackedWhereBorn());
         assertEquals(whenBorn, target.getWhenBorn());
         assertEquals(dateAndPlaceOfMarriage, target.getDateAndPlaceOfMarriage());
         assertEquals(fatherRank, target.getFatherRank());

src/test/java/scot/carricksoftware/grants/converters/certificates/birthcertificates/BirthCertificateConverterTest.java

@@ -63,7 +63,7 @@ class BirthCertificateConverterTest {
         source.setRegistrationAuthority(registrationAuthority);
         source.setSex(sex);
         source.setWhenBorn(whenBorn);
-        source.setWhereBorn(whereBorn);
+        source.setUntrackedWhereBorn(whereBorn);
         source.setFather(father);
         source.setMother(mother);
         source.setDateAndPlaceOfMarriage(dateAndPlaceOfMarriage);
@@ -84,7 +84,7 @@ class BirthCertificateConverterTest {
         assertEquals(number, target.getNumber());
         assertEquals(registrationAuthority, target.getRegistrationAuthority());
         assertEquals(sex, target.getSex());
-        assertEquals(whereBorn, target.getWhereBorn());
+        assertEquals(whereBorn, target.getUntrackedWhereBorn());
         assertEquals(whenBorn, target.getWhenBorn());
         assertEquals(dateAndPlaceOfMarriage, target.getDateAndPlaceOfMarriage());
         assertEquals(fatherRank, target.getFatherRank());

src/test/java/scot/carricksoftware/grants/domains/certificates/BirthCertificatePartTwoTest.java

@@ -36,15 +36,15 @@ class BirthCertificatePartTwoTest {
     }
 
     @Test
-    public void getWhereBornTest() {
-        assertNull(certificate.getWhereBorn());
+    public void getUntrackedWhereBornTest() {
+        assertNull(certificate.getUntrackedWhereBorn());
     }
 
     @Test
-    public void setWhereBornTest() {
+    public void setUntrackedWhereBornTest() {
         String string;
-        certificate.setWhereBorn(string = GetRandomString());
-        assertEquals(string, certificate.getWhereBorn());
+        certificate.setUntrackedWhereBorn(string = GetRandomString());
+        assertEquals(string, certificate.getUntrackedWhereBorn());
     }
 
     @Test

src/test/java/scot/carricksoftware/grants/validators/certificates/birthcertificate/BirthCertificateCommandPartThreeValidatorTest.java

@@ -43,9 +43,9 @@ class BirthCertificateCommandPartThreeValidatorTest {
     @Test
     void validateWhereBornTest() {
         String where = GetRandomString();
-        when(birthCertificateCommandMock.getWhereBorn()).thenReturn(where);
+        when(birthCertificateCommandMock.getUntrackedWhereBorn()).thenReturn(where);
         validator.validate(birthCertificateCommandMock, bindingResultMock);
-        verify(validateTypesMock).validateNullOrEmptyString(where, "whereBorn", "Where born cannot be null.", bindingResultMock);
+        verify(validateTypesMock).validateNullOrEmptyString(where, "untrackedWhereBorn", "Where born cannot be null.", bindingResultMock);
     }
 
     @Test