People in houses added to form and validator

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

@@ -51,7 +51,7 @@ public class CensusCommandValidatorNonNumericImpl implements CensusCommandValida
 
     private void validateDate(CensusCommand censusCommand, BindingResult bindingResult) {
         if (censusCommand.getCensusDate() == null) {
-            bindingResult.rejectValue("date", ApplicationConstants.EMPTY_STRING,
+            bindingResult.rejectValue("censusDate", ApplicationConstants.EMPTY_STRING,
                     null,
                     ValidationConstants.DATE_IS_NULL);
         }

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

@@ -22,6 +22,7 @@ public class CensusCommandValidatorNumericImpl implements CensusCommandValidator
         validateRoomsOccupied(censusCommand, bindingResult);
         validateUninhabitedHouses(censusCommand, bindingResult);
         validateInhabitedHouses(censusCommand, bindingResult);
+        validatePeopleInHouses(censusCommand, bindingResult);
     }
 
 
@@ -73,6 +74,14 @@ public class CensusCommandValidatorNumericImpl implements CensusCommandValidator
         }
     }
 
+    private void validatePeopleInHouses(CensusCommand censusCommand, BindingResult bindingResult) {
+        if (notANonNegativeInteger(censusCommand.getPeopleInHouses())) {
+            bindingResult.rejectValue("peopleInHouses", ApplicationConstants.EMPTY_STRING,
+                    null,
+                    ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+        }
+    }
+
 
     private boolean notANonNegativeInteger(String field) {
         if (field == null || field.isEmpty()) {

src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.application.name=grants
 server.port=8086
 server.servlet.context-path=/grants
 spring.mvc.format.date=dd-MM-yyyy
-spring.profiles.active=uat
+spring.profiles.active=dev
 logging.level.scot.carricksoftware=trace
 
 

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

@@ -158,11 +158,21 @@ rounded-3 text-center p-4">
                     </ul>
                 </div>
             </div>
+            <div class="col-md-3">
+                <label for="peopleInHouses">People in Houses</label>
+                <input class="form-control" id="peopleInHouses"
+                       th:field="*{peopleInHouses}" type="text">
+                <div th:if="${#fields.hasErrors('peopleInHouses')}">
+                    <ul class="text-danger">
+                        <li th:each="err : ${#fields.errors('peopleInHouses')}" th:text="${err}"/>
+                    </ul>
+                </div>
+            </div>
+            <button type="submit" class="btn btn-primary">Commit</button>
+            <a class="btn btn-secondary" th:href="@{/censuses}" th:text="${'List all'}">List all</a>
+            <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
+            <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
         </div>
-        <button type="submit" class="btn btn-primary">Commit</button>
-        <a class="btn btn-secondary" th:href="@{/censuses}" th:text="${'List all'}">List all</a>
-        <a class="btn btn-success" th:href="@{/}" th:text="${'Home'}">Home</a>
-        <h6><span style="color: rgb(255,0,0);">*</span><span> Cannot be edited</span></h6>
     </form>
 </div>
 </body>

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

@@ -57,7 +57,7 @@ public class CensusCommandNonNumericValidatorTest {
         censusCommand.setBoundaryType(GetRandomCensusBoundaryType());
         validator.validate(censusCommand, bindingResultMock);
         verify(bindingResultMock).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
-        assertEquals("date", stringArgumentCaptor.getValue());
+        assertEquals("censusDate", stringArgumentCaptor.getValue());
         assertEquals("", stringArgumentCaptor2.getValue());
         assertNull(objectArgumentCaptor.getValue());
         assertEquals("Date must exist.", stringArgumentCaptor3.getValue());

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

@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2025.  Andrew Grant Carrick Software. All rights reserved
+ *
+ */
+
+package scot.carricksoftware.grants.validators.census.census;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.ArgumentCaptor;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.validation.BindingResult;
+import scot.carricksoftware.grants.commands.census.CensusCommand;
+import scot.carricksoftware.grants.commands.census.CensusCommandImpl;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusBoundaryType;
+import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusDate;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
+
+@ExtendWith(MockitoExtension.class)
+public class CensusCommandNumericValidatorRoomsInHouseTest {
+
+    private CensusCommandValidatorNumeric validator;
+
+    private ArgumentCaptor<String> stringArgumentCaptor;
+    private ArgumentCaptor<String> stringArgumentCaptor2;
+    private ArgumentCaptor<String> stringArgumentCaptor3;
+    private ArgumentCaptor<Object[]> objectArgumentCaptor;
+
+    private CensusCommand censusCommand;
+
+    @Mock
+    BindingResult bindingResultMock;
+
+    @BeforeEach
+    void setUp() {
+        validator = new CensusCommandValidatorNumericImpl();
+        stringArgumentCaptor = ArgumentCaptor.forClass(String.class);
+        stringArgumentCaptor2 = ArgumentCaptor.forClass(String.class);
+        stringArgumentCaptor3 = ArgumentCaptor.forClass(String.class);
+        objectArgumentCaptor = ArgumentCaptor.forClass(Object[].class);
+
+        censusCommand = new CensusCommandImpl();
+        censusCommand.setPlace(GetRandomPlace());
+        censusCommand.setCensusDate(GetRandomCensusDate());
+        censusCommand.setBoundaryType(GetRandomCensusBoundaryType());
+    }
+
+    @Test
+    public void validatePeopleInHousesNegativeTest() {
+        censusCommand.setPeopleInHouses("-5");
+        validator.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
+        assertEquals("peopleInHouses", stringArgumentCaptor.getValue());
+        assertEquals("", stringArgumentCaptor2.getValue());
+        assertNull(objectArgumentCaptor.getValue());
+        assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
+    }
+
+
+    @Test
+    public void validatePeopleInHousesNonNumberTest() {
+        censusCommand.setPeopleInHouses("z");
+        validator.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
+        assertEquals("peopleInHouses", stringArgumentCaptor.getValue());
+        assertEquals("", stringArgumentCaptor2.getValue());
+        assertNull(objectArgumentCaptor.getValue());
+        assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
+    }
+
+    @Test
+    public void validatePeopleInHousesValidNumberTest() {
+        censusCommand.setPeopleInHouses("5");
+        validator.validate(censusCommand, bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+    @Test
+    public void validatePeopleInHousesNullTest() {
+        censusCommand.setPeopleInHouses(null);
+        validator.validate(censusCommand, bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+    @Test
+    public void validatePeopleInHousesZeroTest() {
+        censusCommand.setPeopleInHouses("0");
+        validator.validate(censusCommand, bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+}