Rooms added to Census Validator

src/main/java/scot/carricksoftware/grants/constants/ValidationConstants.java

@@ -36,4 +36,6 @@ public class ValidationConstants {
     public static final String SAME_TWO_PARTIES = "The two parties cannot be the same person.";
 
     public static final String BOUNDARY_TYPE_IS_NULL = "The boundary type cannot be null.";
+
+    public static final String FIELD_NOT_NEGATIVE_INTEGER = "Not a non negative integer.";
 }

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

@@ -16,6 +16,40 @@ public class CensusCommandValidator {
 
     public void validate(CensusCommand censusCommand, BindingResult bindingResult) {
         validateDate(censusCommand, bindingResult);
+        validateRoomsInhabited(censusCommand, bindingResult);
+        validateRoomsWithWindows(censusCommand, bindingResult);
+    }
+
+    private void validateRoomsWithWindows(CensusCommand censusCommand, BindingResult bindingResult) {
+        if (notANonNegativeInteger(censusCommand.getRoomsWithWindows())) {
+            bindingResult.rejectValue("roomsWithWindows", ApplicationConstants.EMPTY_STRING,
+                    null,
+                    ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+        }
+    }
+
+    private void validateRoomsInhabited(CensusCommand censusCommand, BindingResult bindingResult) {
+        if (notANonNegativeInteger(censusCommand.getInhabitedRooms())) {
+            bindingResult.rejectValue("roomsInhabited", ApplicationConstants.EMPTY_STRING,
+                    null,
+                    ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+        }
+    }
+
+    private boolean notANonNegativeInteger(String field) {
+        if (field == null || field.isEmpty()) {
+            return false;
+        } else {
+            try {
+                int number = Integer.parseInt(field);
+                if (number < 0) {
+                   return true;
+                }
+            } catch (NumberFormatException e) {
+                return true;
+            }
+        }
+        return false;
     }
 
     private void validateDate(CensusCommand censusCommand, BindingResult bindingResult) {

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

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 11:37. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.validators.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.*;
+import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusBoundaryType;
+import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusDate;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
+
+@ExtendWith(MockitoExtension.class)
+class CensusCommandValidatorRoomWithWindowsTest {
+
+    private CensusCommandValidator censusCommandValidator = new CensusCommandValidator();
+
+    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() {
+        censusCommandValidator = new CensusCommandValidator();
+        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 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());
+   }
+
+
+    @Test
+    public void validateRoomsWithWindowsNonNumberTest() {
+        censusCommand.setInhabitedRooms("1");
+        censusCommand.setRoomsWithWindows("z");
+        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
+    public void validateRoomsWithWindowsValidNumberTest() {
+        censusCommand.setInhabitedRooms("3");
+        censusCommand.setRoomsWithWindows("5");
+        censusCommandValidator.validate(censusCommand, bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+}

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

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) Andrew Grant of Carrick Software 19/03/2025, 11:37. All rights reserved.
+ *
+ */
+
+package scot.carricksoftware.grants.validators.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.*;
+import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusBoundaryType;
+import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusDate;
+import static scot.carricksoftware.grants.GenerateRandomPlaceValues.GetRandomPlace;
+
+@ExtendWith(MockitoExtension.class)
+class CensusCommandValidatorRoomsInhabitedTest {
+
+    private CensusCommandValidator censusCommandValidator = new CensusCommandValidator();
+
+    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() {
+        censusCommandValidator = new CensusCommandValidator();
+        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 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("roomsInhabited", stringArgumentCaptor.getValue());
+       assertEquals("", stringArgumentCaptor2.getValue());
+       assertNull(objectArgumentCaptor.getValue());
+       assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
+   }
+
+
+    @Test
+    public void validateRoomsInhabitedNonNumberTest() {
+        censusCommand.setInhabitedRooms("z");
+        censusCommand.setRoomsWithWindows("5");
+        censusCommandValidator.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(),stringArgumentCaptor3.capture());
+        assertEquals("roomsInhabited", stringArgumentCaptor.getValue());
+        assertEquals("", stringArgumentCaptor2.getValue());
+        assertNull(objectArgumentCaptor.getValue());
+        assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
+    }
+
+    @Test
+    public void validateRoomsInhabitedValidNumberTest() {
+        censusCommand.setInhabitedRooms("3");
+        censusCommand.setRoomsWithWindows("5");
+        censusCommandValidator.validate(censusCommand, bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+}

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

@@ -17,6 +17,7 @@ import scot.carricksoftware.grants.commands.census.CensusCommand;
 import scot.carricksoftware.grants.commands.census.CensusCommandImpl;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.atLeast;
 import static org.mockito.Mockito.verify;
 import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusBoundaryType;
 import static scot.carricksoftware.grants.GenerateCensusRandomEnums.GetRandomCensusDate;
@@ -46,6 +47,8 @@ class CensusCommandValidatorTest {
         objectArgumentCaptor = ArgumentCaptor.forClass(Object[].class);
 
         censusCommand = new CensusCommandImpl();
+        censusCommand.setInhabitedRooms("1");
+        censusCommand.setRoomsWithWindows("1");
     }
 
     @Test
@@ -77,7 +80,7 @@ class CensusCommandValidatorTest {
         censusCommand.setCensusDate(GetRandomCensusDate());
         censusCommand.setBoundaryType(GetRandomCensusBoundaryType());
         censusCommandValidator.validate(censusCommand, bindingResultMock);
-        verify(bindingResultMock).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());