Total Rooms added to validator

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

@@ -40,6 +40,8 @@ public class ValidationConstants {
     public static final String FIELD_NOT_NEGATIVE_INTEGER = "Not a non negative integer.";
 
     public static final String BIRTHDAY_INCORRECT_FORMAT = "Format should be dd/mm";
-    public static final String BIRTH_YEAR_AND_AGE_CANNOT_COEXIST = "Birth Year and Age cannot exist.";
-    public static final String BIRTH_DAY_AND_AGE_CANNOT_COEXIST = "BirthDay and Age cannot exist.";
+    public static final String BIRTH_YEAR_AND_AGE_CANNOT_COEXIST = "Birth Year and Age cannot coexist.";
+    public static final String BIRTH_DAY_AND_AGE_CANNOT_COEXIST = "BirthDay and Age cannot coexist.";
+    public static final String TOTAL_ROOMS_AND_INHABITED_ROOMS_CANNOT_COEXIST =  "Total Rooms and Inhabited Rooms cannot coexist.";
+    public static final String TOTAL_ROOMS_AND_ROOMS_WITH_WINDOWS_CANNOT_COEXIST =  "Total Rooms and Rooms With Windows cannot coexist.";
 }

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

@@ -18,6 +18,45 @@ public class CensusCommandValidatorImpl implements CensusCommandValidator {
         validateDate(censusCommand, bindingResult);
         validateRoomsInhabited(censusCommand, bindingResult);
         validateRoomsWithWindows(censusCommand, bindingResult);
+        validateTotalRooms(censusCommand, bindingResult);
+        validateTotalRoomsAndInhabitedRooms(censusCommand, bindingResult);
+        validateTotalRoomsAndRoomsWithWindows(censusCommand, bindingResult);
+    }
+
+    private void validateTotalRoomsAndRoomsWithWindows(CensusCommand censusCommand, BindingResult bindingResult) {
+        if ( censusCommand.getTotalRooms()!= null && !censusCommand.getTotalRooms().isEmpty()) {
+            if ( censusCommand.getRoomsWithWindows()!= null && !censusCommand.getRoomsWithWindows().isEmpty()) {
+                bindingResult.rejectValue("totalRooms", ApplicationConstants.EMPTY_STRING,
+                        null,
+                        ValidationConstants.TOTAL_ROOMS_AND_ROOMS_WITH_WINDOWS_CANNOT_COEXIST);
+                bindingResult.rejectValue("roomsWithWindows", ApplicationConstants.EMPTY_STRING,
+                        null,
+                        ValidationConstants.TOTAL_ROOMS_AND_ROOMS_WITH_WINDOWS_CANNOT_COEXIST);
+
+            }
+        }
+    }
+
+    private void validateTotalRoomsAndInhabitedRooms(CensusCommand censusCommand, BindingResult bindingResult) {
+        if ( censusCommand.getTotalRooms()!= null && !censusCommand.getTotalRooms().isEmpty()) {
+            if ( censusCommand.getInhabitedRooms()!= null && !censusCommand.getInhabitedRooms().isEmpty()) {
+                bindingResult.rejectValue("totalRooms", ApplicationConstants.EMPTY_STRING,
+                        null,
+                        ValidationConstants.TOTAL_ROOMS_AND_INHABITED_ROOMS_CANNOT_COEXIST);
+                bindingResult.rejectValue("inhabitedRooms", ApplicationConstants.EMPTY_STRING,
+                        null,
+                        ValidationConstants.TOTAL_ROOMS_AND_INHABITED_ROOMS_CANNOT_COEXIST);
+
+            }
+        }
+    }
+
+    private void validateTotalRooms(CensusCommand censusCommand, BindingResult bindingResult) {
+        if (notANonNegativeInteger(censusCommand.getTotalRooms())) {
+            bindingResult.rejectValue("totalRooms", ApplicationConstants.EMPTY_STRING,
+                    null,
+                    ValidationConstants.FIELD_NOT_NEGATIVE_INTEGER);
+        }
     }
 
     private void validateRoomsWithWindows(CensusCommand censusCommand, BindingResult bindingResult) {

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

@@ -0,0 +1,111 @@
+/*
+ * 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.junit.jupiter.api.Assertions.assertTrue;
+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)
+class CensusCommandValidatorTotalRoomsTest {
+
+    private CensusCommandValidatorImpl censusCommandValidatorImpl = new CensusCommandValidatorImpl();
+
+    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() {
+        censusCommandValidatorImpl = new CensusCommandValidatorImpl();
+        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 validateTotalNegativeTest() {
+        censusCommand.setTotalRooms("-1");
+        censusCommandValidatorImpl.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
+        assertEquals("totalRooms", stringArgumentCaptor.getValue());
+        assertEquals("", stringArgumentCaptor2.getValue());
+        assertNull(objectArgumentCaptor.getValue());
+        assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
+    }
+
+    @Test
+    public void validateTotalNonNumberTest() {
+        censusCommand.setTotalRooms("z");
+        censusCommandValidatorImpl.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
+        assertEquals("totalRooms", stringArgumentCaptor.getValue());
+        assertEquals("", stringArgumentCaptor2.getValue());
+        assertNull(objectArgumentCaptor.getValue());
+        assertEquals("Not a non negative integer.", stringArgumentCaptor3.getValue());
+    }
+
+    @Test
+    public void validateTotalRoomsValidNumberTest() {
+        censusCommand.setTotalRooms("3");
+        censusCommandValidatorImpl.validate(censusCommand, bindingResultMock);
+        verifyNoInteractions(bindingResultMock);
+    }
+
+    @Test
+    public void validateTotalRoomsAndInhabitedRoomsTest() {
+        censusCommand.setTotalRooms("3");
+        censusCommand.setInhabitedRooms("3");
+        censusCommandValidatorImpl.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
+
+        assertTrue(stringArgumentCaptor.getAllValues().contains("totalRooms"));
+        assertTrue(stringArgumentCaptor.getAllValues().contains("inhabitedRooms"));
+    }
+
+    @Test
+    public void validateTotalRoomsAndRoomsWithWindowsTest() {
+        censusCommand.setTotalRooms("3");
+        censusCommand.setRoomsWithWindows("3");
+        censusCommandValidatorImpl.validate(censusCommand, bindingResultMock);
+        verify(bindingResultMock, atLeast(1)).rejectValue(stringArgumentCaptor.capture(), stringArgumentCaptor2.capture(), objectArgumentCaptor.capture(), stringArgumentCaptor3.capture());
+
+        assertTrue(stringArgumentCaptor.getAllValues().contains("totalRooms"));
+        assertTrue(stringArgumentCaptor.getAllValues().contains("roomsWithWindows"));
+    }
+
+
+
+}