Replaced census.date by census.censusDate

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

@@ -58,7 +58,7 @@ public class DataLoadCensus {
         logger.debug("DataLoadCensus::loadCensus");
         CensusCommand censusCommand = new CensusCommandImpl();
         Place place = placeService.findById(1L);
-        censusCommand.setDate(CensusDate.CENSUS_1881);
+        censusCommand.setCensusDate(CensusDate.CENSUS_1881);
         censusCommand.setPlace(place);
         censusCommand.setBoundaryType(CensusBoundaryType.ISLAND);
         censusService.saveCensusCommand(censusCommand);

src/main/java/scot/carricksoftware/grants/commands/census/CensusCommand.java

@@ -17,9 +17,9 @@ public interface CensusCommand {
 
     void setId(Long id);
 
-    CensusDate getDate();
+    CensusDate getCensusDate();
 
-    void setDate(CensusDate date);
+    void setCensusDate(CensusDate date);
 
     List<CensusEntry> getCensusEntries();
 

src/main/java/scot/carricksoftware/grants/commands/census/CensusCommandImpl.java

@@ -17,7 +17,7 @@ public class CensusCommandImpl implements CensusCommand {
 
     private Long id;
 
-    private CensusDate date;
+    private CensusDate censusDate;
 
     private List<CensusEntry> censusEntries = new ArrayList<>();
 
@@ -36,13 +36,13 @@ public class CensusCommandImpl implements CensusCommand {
     }
 
     @Override
-    public CensusDate getDate() {
-        return date;
+    public CensusDate getCensusDate() {
+        return censusDate;
     }
 
     @Override
-    public void setDate(CensusDate date) {
-        this.date = date;
+    public void setCensusDate(CensusDate censusDate) {
+        this.censusDate = censusDate;
     }
 
     @Override

src/main/java/scot/carricksoftware/grants/converters/census/CensusCommandConverterImpl.java

@@ -20,7 +20,7 @@ public class CensusCommandConverterImpl implements CensusCommandConverter {
         result.setCensusEntries(source.getCensusEntries());
         result.setPlace(source.getPlace());
         result.setBoundaryType(source.getBoundaryType());
-        result.setDate(source.getDate());
+        result.setCensusDate(source.getCensusDate());
 
 
         return result;

src/main/java/scot/carricksoftware/grants/converters/census/CensusConverterImpl.java

@@ -20,7 +20,7 @@ public class CensusConverterImpl implements CensusConverter {
         result.setCensusEntries(source.getCensusEntries());
         result.setPlace(source.getPlace());
         result.setBoundaryType(source.getBoundaryType());
-        result.setDate(source.getDate());
+        result.setCensusDate(source.getCensusDate());
         return result;
     }
 }

src/main/java/scot/carricksoftware/grants/domains/census/Census.java

@@ -18,7 +18,7 @@ import java.util.List;
 public class Census extends BaseEntity {
 
     @Enumerated(EnumType.STRING)
-    private CensusDate date;
+    private CensusDate censusDate;
 
     @OneToMany(mappedBy = "census", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<CensusEntry> censusEntries = new ArrayList<>();
@@ -30,12 +30,12 @@ public class Census extends BaseEntity {
     @Enumerated(EnumType.STRING)
     private CensusBoundaryType boundaryType;
 
-    public CensusDate getDate() {
-        return date;
+    public CensusDate getCensusDate() {
+        return censusDate;
     }
 
-    public void setDate(CensusDate date) {
-        this.date = date;
+    public void setCensusDate(CensusDate date) {
+        this.censusDate = date;
     }
 
     public List<CensusEntry> getCensusEntries() {
@@ -48,7 +48,7 @@ public class Census extends BaseEntity {
 
     @Override
     public String toString() {
-        return place.toString() + ", " + date.label;
+        return place.toString() + ", " + censusDate.label;
     }
 
     public Place getPlace() {

src/main/java/scot/carricksoftware/grants/validators/census/CensusCommandValidator.java

@@ -19,7 +19,7 @@ public class CensusCommandValidator {
     }
 
     private void validateDate(CensusCommand censusCommand, BindingResult bindingResult) {
-        if (censusCommand.getDate() == null) {
+        if (censusCommand.getCensusDate() == null) {
             bindingResult.rejectValue("date", ApplicationConstants.EMPTY_STRING,
                     null,
                     ValidationConstants.DATE_IS_NULL);

src/main/resources/db/changelog/2025/04/08-01-changelog.xml

@@ -17,7 +17,7 @@
             <column autoIncrement="true" name="id" type="BIGINT">
                 <constraints nullable="false" primaryKey="true" primaryKeyName="pk_census"/>
             </column>
-            <column name="date" type="DATE"/>
+            <column name="censusDate" type="DATE"/>
             <column name="census_place_id" type="BIGINT"/>
         </createTable>
     </changeSet>

src/main/resources/db/changelog/2025/04/20-01-changelog.sql

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+-- liquibase formatted sql
+
+
+-- changeset apg:1745161135116-1
+ALTER TABLE `census`
+    DROP COLUMN IF EXISTS `date`;
+
+-- changeset apg:1745161135116-2
+ALTER TABLE `census`
+    ADD `census_date` VARCHAR(255);
+

src/main/resources/db/changelog/master.xml

@@ -9,5 +9,6 @@
     <include file="/db/changelog/2025/04/16-01-changelog.sql"/>
     <include file="/db/changelog/2025/04/17-01-changelog.sql"/>
     <include file="/db/changelog/2025/04/19-01-changelog.sql"/>
+    <include file="/db/changelog/2025/04/20-01-changelog.sql"/>
 
 </databaseChangeLog>

src/main/resources/templates/census/form.html

@@ -45,16 +45,16 @@ rounded-3 text-center p-4">
                        th:field="*{id}" type="text" readonly>
             </div>
             <div class="col-md-3">
-                <label for="date">Date</label>
+                <label for="censusDate">Date</label>
                 <div>
-                    <select id="date" style="width: 200px;" name="date" th:field="*{date}">
+                    <select id="censusDate" style="width: 200px;" name="censusDate" th:field="*{censusDate}">
                         <option th:value="${''}" th:text="${''}"></option>
                         <option th:each="value : ${T(scot.carricksoftware.grants.enums.census.CensusDate).values()}"
                                 th:value="${value}" th:text="${value.label}"></option>
                     </select>
-                    <div th:if="${#fields.hasErrors('date')}">
+                    <div th:if="${#fields.hasErrors('censusDate')}">
                         <ul class="text-danger">
-                            <li th:each="err : ${#fields.errors('date')}" th:text="${err}"/>
+                            <li th:each="err : ${#fields.errors('censusDate')}" th:text="${err}"/>
                         </ul>
                     </div>
                 </div>

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

@@ -33,7 +33,7 @@
             <tr th:each="census   : ${censuses}">
                 <td th:text="${census.id}">123</td>
                 <td th:text="${census.place}">123</td>
-                <td th:text="${census.date.label}"></td>
+                <td th:text="${census.censusDate.label}"></td>
                 <td><span>
                         <a th:action="delete" class="btn btn-danger btn-sm" href=""
                            th:href="'census/' + ${census.id} + '/delete'"

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

@@ -31,7 +31,7 @@ public class GenerateRandomCensusValues {
     public static CensusCommand GetRandomCensusCommand() {
         CensusCommand censusCommand = new CensusCommandImpl();
         censusCommand.setId(GetRandomLong());
-        censusCommand.setDate(GetRandomCensusDate());
+        censusCommand.setCensusDate(GetRandomCensusDate());
         return censusCommand;
     }
 

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().getDate());
+        assertEquals( CensusDate.CENSUS_1881, captor.getValue().getCensusDate());
         assertEquals(captor.getValue().getPlace(), place);
         assertEquals(CensusBoundaryType.ISLAND, captor.getValue().getBoundaryType());
     }

src/test/java/scot/carricksoftware/grants/commands/census/CensusCommandEnumTest.java

@@ -38,14 +38,14 @@ class CensusCommandEnumTest {
     }
 
     @Test
-    void getDateTest() {
-        assertNull(command.getDate());
+    void getVCensusDateTest() {
+        assertNull(command.getCensusDate());
     }
 
     @Test
-    void setDateTest() {
-        CensusDate date = GetRandomCensusDate();
-        command.setDate(date);
-        assertEquals(date, command.getDate());
+    void setCensusDateTest() {
+        CensusDate censusDate = GetRandomCensusDate();
+        command.setCensusDate(censusDate);
+        assertEquals(censusDate, command.getCensusDate());
     }
 }

src/test/java/scot/carricksoftware/grants/converters/census/CensusCommandConverterTest.java

@@ -36,7 +36,7 @@ class CensusCommandConverterTest {
     @Test
     void convertTest() {
         Long id = GetRandomLong();
-        CensusDate date = GetRandomCensusDate();
+        CensusDate censusDate = GetRandomCensusDate();
         CensusCommand source = new CensusCommandImpl();
         List<CensusEntry> censusEntries = new ArrayList<>();
         censusEntries.add(GetRandomCensusEntry());
@@ -44,7 +44,7 @@ class CensusCommandConverterTest {
         CensusBoundaryType boundaryType = GetRandomCensusBoundaryType();
 
         source.setId(id);
-        source.setDate(date);
+        source.setCensusDate(censusDate);
         source.setCensusEntries(censusEntries);
         source.setPlace(place);
         source.setBoundaryType(boundaryType);
@@ -56,6 +56,6 @@ class CensusCommandConverterTest {
         assertEquals(censusEntries, target.getCensusEntries());
         assertEquals(place, target.getPlace());
         assertEquals(boundaryType, target.getBoundaryType());
-        assertEquals(date, target.getDate());
+        assertEquals(censusDate, target.getCensusDate());
     }
 }

src/test/java/scot/carricksoftware/grants/converters/census/CensusConverterTest.java

@@ -37,7 +37,7 @@ class CensusConverterTest {
     void convertTest() {
         Long id = GetRandomLong();
         Census source = new Census();
-        CensusDate date = GetRandomCensusDate();
+        CensusDate censusDate = GetRandomCensusDate();
         List<CensusEntry> censusEntries = new ArrayList<>();
         censusEntries.add(GetRandomCensusEntry());
         Place place = GetRandomPlace();
@@ -48,7 +48,7 @@ class CensusConverterTest {
         source.setCensusEntries(censusEntries);
         source.setPlace(place);
         source.setBoundaryType(boundaryType);
-        source.setDate(date);
+        source.setCensusDate(censusDate);
 
         CensusCommand target = converter.convert(source);
 
@@ -57,6 +57,6 @@ class CensusConverterTest {
         assertEquals(censusEntries, target.getCensusEntries());
         assertEquals(place, target.getPlace());
         assertEquals(boundaryType, target.getBoundaryType());
-        assertEquals(date, target.getDate());
+        assertEquals(censusDate, target.getCensusDate());
     }
 }

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

@@ -40,15 +40,15 @@ class CensusEnumTest {
     }
 
     @Test
-    public void getDateTest() {
-        assertNull(census.getDate());
+    public void getCensusDateTest() {
+        assertNull(census.getCensusDate());
     }
 
     @Test
-    public void setDateTest() {
+    public void setCensusDateTest() {
         CensusDate date = GetRandomCensusDate();
-        census.setDate(date);
-        assertEquals(date, census.getDate());
+        census.setCensusDate(date);
+        assertEquals(date, census.getCensusDate());
     }
 
 }

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

@@ -77,12 +77,12 @@ public class CensusTest {
 
     @Test
     public void toStringTest() {
-        CensusDate date = GetRandomCensusDate();
+        CensusDate censusDate = GetRandomCensusDate();
         String placeString =  GetRandomString();
         when(placeMock.toString()).thenReturn(placeString);
-        census.setDate(date);
+        census.setCensusDate(censusDate);
         census.setPlace(placeMock);
-        assertEquals(placeString + ", " + date.label, census.toString());
+        assertEquals(placeString + ", " + censusDate.label, census.toString());
     }
 
 }

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

@@ -63,7 +63,7 @@ class CensusCommandValidatorTest {
     @Test
     public void nullBoundaryTest() {
         censusCommand.setPlace(GetRandomPlace());
-        censusCommand.setDate(GetRandomCensusDate());
+        censusCommand.setCensusDate(GetRandomCensusDate());
         censusCommandValidator.validate(censusCommand, bindingResultMock);
         verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
         assertEquals("boundaryType", stringArgumentCaptor.getValue());
@@ -74,7 +74,7 @@ class CensusCommandValidatorTest {
 
     @Test
     public void nullPlaceTest() {
-        censusCommand.setDate(GetRandomCensusDate());
+        censusCommand.setCensusDate(GetRandomCensusDate());
         censusCommand.setBoundaryType(GetRandomCensusBoundaryType());
         censusCommandValidator.validate(censusCommand, bindingResultMock);
         verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());