Person.toString

Closes #17

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

@@ -35,8 +35,8 @@ public class DataLoadPeople {
         final Person dad = new Person();
         dad.setFirstName("Andrew");
         dad.setLastName("Grant");
-        dad.setCertifiedYearOfBirth("dad's date of Birth");
-        dad.setRecordedYearOfBirth("dad's reported Birth");
+        dad.setCertifiedYearOfBirth("1920");
+        dad.setRecordedYearOfBirth("1925");
         personService.save(dad);
     }
 
@@ -45,8 +45,8 @@ public class DataLoadPeople {
         mum.setFirstName("Dorothy");
         //noinspection SpellCheckingInspection
         mum.setLastName("Bramall");
-        mum.setCertifiedYearOfBirth("mum's date of Birth");
-        mum.setRecordedYearOfBirth("mum's reported Birth");
+        mum.setCertifiedYearOfBirth("1910");
+        mum.setRecordedYearOfBirth("1915");
         personService.save(mum);
 
     }

src/main/java/scot/carricksoftware/grants/domains/people/Person.java

@@ -34,7 +34,25 @@ public class Person extends BaseEntity {
 
     @Override
     public String toString() {
-        return lastName + ", " + firstName;
+        StringBuilder builder = new StringBuilder();
+        builder.append(this.lastName);
+        builder.append(", ");
+        builder.append(this.firstName);
+        builder.append(", ");
+        if (certifiedYearOfBirth != null) {
+            builder.append(certifiedYearOfBirth);
+            builder.append(" ");
+        }  else {
+            if (recordedYearOfBirth != null) {
+                builder.append("(");
+                builder.append(recordedYearOfBirth);
+                builder.append(")");
+                builder.append(" ");
+            }
+        }
+        builder.append("-");
+
+        return builder.toString();
     }
 
     public String getRecordedYearOfBirth() {

src/main/resources/templates/censusentry/list.html

@@ -37,7 +37,7 @@
 
             <tr th:each="entry   : ${censusEntries}">
                 <td th:text="${entry.id}">123</td>
-                <td th:text="${entry.person}">123</td>
+                <td th:text="${entry.person.toString()}">123</td>
                 <td th:text="${entry.name}">123</td>
                 <td th:text="${entry.toString()}">123</td>
 

src/test/java/scot/carricksoftware/grants/GenerateCensusEntryRandomEnums.java

@@ -22,7 +22,7 @@ public class GenerateCensusEntryRandomEnums {
         CensusEntryCondition[] conditions = CensusEntryCondition.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, conditions.length );
+        int randomInt = random.nextInt(0, conditions.length);
         return conditions[randomInt];
     }
 
@@ -30,7 +30,7 @@ public class GenerateCensusEntryRandomEnums {
         CensusEntryGaelic[] gaelicArray = CensusEntryGaelic.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, gaelicArray.length );
+        int randomInt = random.nextInt(0, gaelicArray.length);
         return gaelicArray[randomInt];
     }
 
@@ -38,7 +38,7 @@ public class GenerateCensusEntryRandomEnums {
         CensusEntryRelationship[] relationships = CensusEntryRelationship.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, relationships.length );
+        int randomInt = random.nextInt(0, relationships.length);
         return relationships[randomInt];
     }
 
@@ -46,7 +46,7 @@ public class GenerateCensusEntryRandomEnums {
         CensusEntryWorker[] workers = CensusEntryWorker.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, workers.length );
+        int randomInt = random.nextInt(0, workers.length);
         return workers[randomInt];
     }
 }

src/test/java/scot/carricksoftware/grants/GenerateCensusRandomEnums.java

@@ -3,7 +3,9 @@
  *
  */
 
-package scot.carricksoftware.grants;import org.springframework.stereotype.Component;
+package scot.carricksoftware.grants;
+
+import org.springframework.stereotype.Component;
 import scot.carricksoftware.grants.enums.census.CensusBoundaryType;
 import scot.carricksoftware.grants.enums.census.CensusDate;
 
@@ -18,7 +20,7 @@ public class GenerateCensusRandomEnums {
         CensusBoundaryType[] boundaryTypes = CensusBoundaryType.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, boundaryTypes.length );
+        int randomInt = random.nextInt(0, boundaryTypes.length);
         return boundaryTypes[randomInt];
     }
 
@@ -27,7 +29,7 @@ public class GenerateCensusRandomEnums {
         CensusDate[] dates = CensusDate.values();
 
         Random random = new Random();
-        int randomInt = random.nextInt(0, dates.length );
+        int randomInt = random.nextInt(0, dates.length);
         return dates[randomInt];
     }
 

src/test/java/scot/carricksoftware/grants/GenerateRandomTextValues.java

@@ -21,9 +21,9 @@ import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPla
 public class GenerateRandomTextValues {
 
     public static DocumentText GetRandomDocumentText() {
-       DocumentText documentText = new DocumentText();
-       documentText.setId(GetRandomLong());
-       return documentText;
+        DocumentText documentText = new DocumentText();
+        documentText.setId(GetRandomLong());
+        return documentText;
     }
 
     @SuppressWarnings("unused")

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

@@ -65,7 +65,7 @@ public class DataLoadCensusTest {
         dataLoadCensus.load();
         verify(censusServiceMock).saveCensusCommand(captor.capture());
 
-        assertEquals( CensusDate.CENSUS_1881, captor.getValue().getCensusDate());
+        assertEquals(CensusDate.CENSUS_1881, captor.getValue().getCensusDate());
         assertEquals(captor.getValue().getPlace(), place);
         assertEquals(CensusBoundaryType.ISLAND, captor.getValue().getBoundaryType());
         assertEquals("2", captor.getValue().getInhabitedRooms());

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

@@ -35,9 +35,9 @@ public class DataLoadPeopleTest {
         assertTrue(captor.getAllValues().stream().anyMatch(person -> person.getFirstName().equals("Andrew")));
         assertTrue(captor.getAllValues().stream().anyMatch(person -> person.getLastName().equals("Grant")));
         assertTrue(captor.getAllValues().stream().anyMatch(
-                person -> person.getCertifiedYearOfBirth().equals("dad's date of Birth")));
+                person -> person.getCertifiedYearOfBirth().equals("1920")));
         assertTrue(captor.getAllValues().stream().anyMatch(
-                person -> person.getRecordedYearOfBirth().equals("dad's reported Birth")));
+                person -> person.getRecordedYearOfBirth().equals("1925")));
     }
 
 
@@ -50,9 +50,9 @@ public class DataLoadPeopleTest {
         //noinspection SpellCheckingInspection
         assertTrue(captor.getAllValues().stream().anyMatch(person -> person.getLastName().equals("Bramall")));
         assertTrue(captor.getAllValues().stream().anyMatch(
-                person -> person.getCertifiedYearOfBirth().equals("mum's date of Birth")));
+                person -> person.getCertifiedYearOfBirth().equals("1910")));
         assertTrue(captor.getAllValues().stream().anyMatch(
-                person -> person.getRecordedYearOfBirth().equals("mum's reported Birth")));
+                person -> person.getRecordedYearOfBirth().equals("1915")));
     }
 
 }

src/test/java/scot/carricksoftware/grants/converters/people/PersonConverterTest.java

@@ -35,7 +35,8 @@ class PersonConverterTest {
 
         source.setId(id);
         source.setFirstName(firstName);
-        source.setLastName(lastName);source.setRecordedYearOfBirth(recordedYearOfBirth);
+        source.setLastName(lastName);
+        source.setRecordedYearOfBirth(recordedYearOfBirth);
         source.setCertifiedYearOfBirth(certifiedYearOfBirth);
 
         PersonCommand target = converter.convert(source);

src/test/java/scot/carricksoftware/grants/domains/census/CensusTest.java

@@ -78,7 +78,7 @@ public class CensusTest {
     @Test
     public void toStringTest() {
         CensusDate censusDate = GetRandomCensusDate();
-        String placeString =  GetRandomString();
+        String placeString = GetRandomString();
         when(placeMock.toString()).thenReturn(placeString);
         census.setCensusDate(censusDate);
         census.setPlace(placeMock);
@@ -86,5 +86,4 @@ public class CensusTest {
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/domains/people/PersonTest.java

@@ -45,16 +45,7 @@ class PersonTest {
         assertEquals(lastName, person.getLastName());
     }
 
-    @Test
-    void toStringTest() {
-        String firstName = GetRandomString();
-        String lastName = GetRandomString();
-        person.setFirstName(firstName);
-        person.setLastName(lastName);
 
-        assertEquals(lastName + ", " + firstName, person.toString());
-    }
-    
     @Test
     void getRecodedYearOfBirthTest() {
         assertNull(person.getRecordedYearOfBirth());

src/test/java/scot/carricksoftware/grants/domains/people/PersonToStringTest.java

@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 18/03/2025, 01:54. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.domains.people;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+class PersonToStringTest {
+
+    Person person;
+
+    final String firstName = "First";
+    final String lastName = "Last";
+    final String recordedBirth = "1920";
+    final String certifiedBirth = "1930";
+
+
+    @BeforeEach
+    void setUp() {
+        person = new Person();
+        person.setFirstName(firstName);
+        person.setLastName(lastName);
+    }
+
+    @Test
+    public void NoDatesTest() {
+        String requiredResult = "Last, First, -";
+
+        assertEquals(requiredResult, person.toString());
+    }
+
+    @Test
+    public void certifiedBirthOnlyTest() {
+        String requiredResult = "Last, First, " + certifiedBirth + " -";
+        person.setCertifiedYearOfBirth(certifiedBirth);
+
+        assertEquals(requiredResult, person.toString());
+    }
+
+
+    @Test
+    public void recordedBirthOnlyTest() {
+        String requiredResult = "Last, First, (" + recordedBirth + ") -";
+        person.setRecordedYearOfBirth(recordedBirth);
+
+        assertEquals(requiredResult, person.toString());
+    }
+
+    @Test
+    public void bothTest() {
+        String requiredResult = "Last, First, " + certifiedBirth + " -";
+        person.setCertifiedYearOfBirth(certifiedBirth);
+        person.setRecordedYearOfBirth(recordedBirth);
+
+        assertEquals(requiredResult, person.toString());
+    }
+
+
+}

src/test/java/scot/carricksoftware/grants/services/census/censusentry/UpdateRecordedYearOfBirthFailingTest.java

@@ -67,9 +67,8 @@ class UpdateRecordedYearOfBirthFailingTest {
         when(personMock.getRecordedYearOfBirth()).thenReturn("1874");
         when(personMock.getRecordedYearOfBirth()).thenReturn("1800");
         updateRecordedYearOfBirth.updateRecordedYearOfBirth(censusEntryCommandMock);
-        verify(personCommandMock,times(0)).setRecordedYearOfBirth(anyString());
+        verify(personCommandMock, times(0)).setRecordedYearOfBirth(anyString());
     }
 
 
-
 }

src/test/java/scot/carricksoftware/grants/services/census/censusentry/UpdateRecordedYearOfBirthPassingTest.java

@@ -57,9 +57,9 @@ class UpdateRecordedYearOfBirthPassingTest {
         when(personMock.getRecordedYearOfBirth()).thenReturn(null);
         when(censusMock.getCensusDate()).thenReturn(CENSUS_1881);
 
-       updateRecordedYearOfBirth.updateRecordedYearOfBirth(censusEntryCommandMock);
+        updateRecordedYearOfBirth.updateRecordedYearOfBirth(censusEntryCommandMock);
 
-       verify(personCommandMock).setRecordedYearOfBirth("1874");
+        verify(personCommandMock).setRecordedYearOfBirth("1874");
     }
 
 

src/test/java/scot/carricksoftware/grants/validators/census/CensusCommandValidatorRoomWithWindowsTest.java

@@ -52,17 +52,17 @@ class CensusCommandValidatorRoomWithWindowsTest {
         censusCommand.setBoundaryType(GetRandomCensusBoundaryType());
     }
 
-   @Test
+    @Test
     public void validateRoomsWithWindowsNegativeTest() {
         censusCommand.setInhabitedRooms("1");
         censusCommand.setRoomsWithWindows("-5");
-       censusCommandValidator.validate(censusCommand, bindingResultMock);
-       verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
-       assertEquals("roomsWithWindows", stringArgumentCaptor.getValue());
-       assertEquals("", stringArgumentCaptor2.getValue());
-       assertNull(objectArgumentCaptor.getValue());
-       assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
-   }
+        censusCommandValidator.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
+        assertEquals("roomsWithWindows", stringArgumentCaptor.getValue());
+        assertEquals("", stringArgumentCaptor2.getValue());
+        assertNull(objectArgumentCaptor.getValue());
+        assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
+    }
 
 
     @Test
@@ -70,7 +70,7 @@ class CensusCommandValidatorRoomWithWindowsTest {
         censusCommand.setInhabitedRooms("1");
         censusCommand.setRoomsWithWindows("z");
         censusCommandValidator.validate(censusCommand, bindingResultMock);
-        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
         assertEquals("roomsWithWindows", stringArgumentCaptor.getValue());
         assertEquals("", stringArgumentCaptor2.getValue());
         assertNull(objectArgumentCaptor.getValue());

src/test/java/scot/carricksoftware/grants/validators/census/CensusCommandValidatorRoomsInhabitedTest.java

@@ -52,17 +52,17 @@ class CensusCommandValidatorRoomsInhabitedTest {
         censusCommand.setBoundaryType(GetRandomCensusBoundaryType());
     }
 
-   @Test
+    @Test
     public void validateRoomsInhabitedNegativeTest() {
         censusCommand.setInhabitedRooms("-1");
         censusCommand.setRoomsWithWindows("5");
-       censusCommandValidator.validate(censusCommand, bindingResultMock);
-       verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
-       assertEquals("inhabitedRooms", stringArgumentCaptor.getValue());
-       assertEquals("", stringArgumentCaptor2.getValue());
-       assertNull(objectArgumentCaptor.getValue());
-       assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
-   }
+        censusCommandValidator.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
+        assertEquals("inhabitedRooms", stringArgumentCaptor.getValue());
+        assertEquals("", stringArgumentCaptor2.getValue());
+        assertNull(objectArgumentCaptor.getValue());
+        assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
+    }
 
 
     @Test
@@ -70,7 +70,7 @@ class CensusCommandValidatorRoomsInhabitedTest {
         censusCommand.setInhabitedRooms("z");
         censusCommand.setRoomsWithWindows("5");
         censusCommandValidator.validate(censusCommand, bindingResultMock);
-        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
         assertEquals("inhabitedRooms", stringArgumentCaptor.getValue());
         assertEquals("", stringArgumentCaptor2.getValue());
         assertNull(objectArgumentCaptor.getValue());

src/test/java/scot/carricksoftware/grants/validators/census/CensusCommandValidatorTest.java

@@ -56,7 +56,7 @@ class CensusCommandValidatorTest {
         censusCommand.setPlace(GetRandomPlace());
         censusCommand.setBoundaryType(GetRandomCensusBoundaryType());
         censusCommandValidator.validate(censusCommand, bindingResultMock);
-        verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
+        verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
         assertEquals("date", stringArgumentCaptor.getValue());
         assertEquals("", stringArgumentCaptor2.getValue());
         assertNull(objectArgumentCaptor.getValue());
@@ -68,7 +68,7 @@ class CensusCommandValidatorTest {
         censusCommand.setPlace(GetRandomPlace());
         censusCommand.setCensusDate(GetRandomCensusDate());
         censusCommandValidator.validate(censusCommand, bindingResultMock);
-        verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
+        verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
         assertEquals("boundaryType", stringArgumentCaptor.getValue());
         assertEquals("", stringArgumentCaptor2.getValue());
         assertNull(objectArgumentCaptor.getValue());
@@ -80,7 +80,7 @@ class CensusCommandValidatorTest {
         censusCommand.setCensusDate(GetRandomCensusDate());
         censusCommand.setBoundaryType(GetRandomCensusBoundaryType());
         censusCommandValidator.validate(censusCommand, bindingResultMock);
-        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
         assertEquals("place", stringArgumentCaptor.getValue());
         assertEquals("", stringArgumentCaptor2.getValue());
         assertNull(objectArgumentCaptor.getValue());