Browse Source

People in houses added to converters

Andrew Grant 6 months ago
parent
commit
c61f64512a

+ 1 - 2
src/main/java/scot/carricksoftware/grants/converters/census/CensusCommandConverterImpl.java

@@ -29,8 +29,7 @@ public class CensusCommandConverterImpl implements CensusCommandConverter {
         result.setRoomsOccupied(source.getRoomsOccupied());
         result.setInhabitedHouses(source.getInhabitedHouses());
         result.setUninhabitedHouses(source.getUninhabitedHouses());
-
-
+        result.setPeopleInHouses(source.getPeopleInHouses());
 
         return result;
     }

+ 1 - 0
src/main/java/scot/carricksoftware/grants/converters/census/CensusConverterImpl.java

@@ -29,6 +29,7 @@ public class CensusConverterImpl implements CensusConverter {
         result.setRoomsOccupied(source.getRoomsOccupied());
         result.setInhabitedHouses(source.getInhabitedHouses());
         result.setUninhabitedHouses(source.getUninhabitedHouses());
+        result.setPeopleInHouses(source.getPeopleInHouses());
 
         return result;
     }

+ 3 - 0
src/test/java/scot/carricksoftware/grants/converters/census/CensusCommandConverterTest.java

@@ -50,6 +50,7 @@ class CensusCommandConverterTest {
         String roomsOccupied = GetRandomString();
         String inhabitedHouses = GetRandomString();
         String uninhabitedHouses = GetRandomString();
+        String peopleInHouses = GetRandomString();
 
         source.setId(id);
         source.setCensusDate(censusDate);
@@ -63,6 +64,7 @@ class CensusCommandConverterTest {
         source.setRoomsOccupied(roomsOccupied);
         source.setInhabitedHouses(inhabitedHouses);
         source.setUninhabitedHouses(uninhabitedHouses);
+        source.setPeopleInHouses(peopleInHouses);
 
         Census target = converter.convert(source);
 
@@ -79,5 +81,6 @@ class CensusCommandConverterTest {
         assertEquals(roomsOccupied, target.getRoomsOccupied());
         assertEquals(inhabitedHouses, target.getInhabitedHouses());
         assertEquals(uninhabitedHouses, target.getUninhabitedHouses());
+        assertEquals(peopleInHouses, target.getPeopleInHouses());
     }
 }

+ 3 - 0
src/test/java/scot/carricksoftware/grants/converters/census/CensusConverterTest.java

@@ -50,6 +50,7 @@ class CensusConverterTest {
         String roomsOccupied = GetRandomString();
         String inhabitedHouses = GetRandomString();
         String uninhabitedHouses = GetRandomString();
+        String peopleInHouses = GetRandomString();
 
 
         source.setId(id);
@@ -64,6 +65,7 @@ class CensusConverterTest {
         source.setRoomsOccupied(roomsOccupied);
         source.setInhabitedHouses(inhabitedHouses);
         source.setUninhabitedHouses(uninhabitedHouses);
+        source.setPeopleInHouses(peopleInHouses);
 
         CensusCommand target = converter.convert(source);
 
@@ -80,5 +82,6 @@ class CensusConverterTest {
         assertEquals(roomsOccupied, target.getRoomsOccupied());
         assertEquals(inhabitedHouses, target.getInhabitedHouses());
         assertEquals(uninhabitedHouses, target.getUninhabitedHouses());
+        assertEquals(peopleInHouses, target.getPeopleInHouses());
     }
 }