Working at home and Industry or Service added to CensusEntry converters

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

@@ -35,6 +35,8 @@ public class CensusEntryCommandConverterImpl implements CensusEntryCommandConver
         result.setChildrenWhoHaveDied(source.getChildrenWhoHaveDied());
         result.setYearsCompletedMarriage(source.getYearsCompletedMarriage());
         result.setChildrenStillAlive(source.getChildrenStillAlive());
+        result.setIndustryOrService(source.getIndustryOrService());
+        result.setWorkingAtHome(source.getWorkingAtHome());
         return result;
     }
 

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

@@ -36,6 +36,8 @@ public class CensusEntryConverterImpl implements CensusEntryConverter {
         result.setChildrenWhoHaveDied(source.getChildrenWhoHaveDied());
         result.setYearsCompletedMarriage(source.getYearsCompletedMarriage());
         result.setChildrenStillAlive(source.getChildrenStillAlive());
+        result.setIndustryOrService(source.getIndustryOrService());
+        result.setWorkingAtHome(source.getWorkingAtHome());
         return result;
     }
 }

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

@@ -13,10 +13,12 @@ import scot.carricksoftware.grants.domains.census.Census;
 import scot.carricksoftware.grants.domains.census.CensusEntry;
 import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.enums.censusentry.*;
+import scot.carricksoftware.grants.enums.general.YesNo;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static scot.carricksoftware.grants.GenerateCensusEntryRandomEnums.*;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateGeneralRandomEnums.GetRandomGeneralYesNo;
 import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensus;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
@@ -52,6 +54,8 @@ class CensusEntryCommandConverterTest {
         String childrenWhoHaveDied = GetRandomString();
         String yearsCompletedMarriage = GetRandomString();
         String childrenStillAlive = GetRandomString();
+        String industryOrService = GetRandomString();
+        YesNo workingAtHome = GetRandomGeneralYesNo();
 
 
         source.setId(id);
@@ -73,6 +77,8 @@ class CensusEntryCommandConverterTest {
         source.setChildrenWhoHaveDied(childrenWhoHaveDied);
         source.setYearsCompletedMarriage(yearsCompletedMarriage);
         source.setChildrenStillAlive(childrenStillAlive);
+        source.setIndustryOrService(industryOrService);
+        source.setWorkingAtHome(workingAtHome);
 
 
         CensusEntry target = converter.convert(source);
@@ -97,5 +103,7 @@ class CensusEntryCommandConverterTest {
         assertEquals(childrenStillAlive, target.getChildrenStillAlive());
         assertEquals(yearsCompletedMarriage, target.getYearsCompletedMarriage());
         assertEquals(childrenWhoHaveDied, target.getChildrenWhoHaveDied());
+        assertEquals(workingAtHome, target.getWorkingAtHome());
+        assertEquals(industryOrService, target.getIndustryOrService());
     }
 }

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

@@ -12,10 +12,12 @@ import scot.carricksoftware.grants.domains.census.Census;
 import scot.carricksoftware.grants.domains.census.CensusEntry;
 import scot.carricksoftware.grants.domains.people.Person;
 import scot.carricksoftware.grants.enums.censusentry.*;
+import scot.carricksoftware.grants.enums.general.YesNo;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static scot.carricksoftware.grants.GenerateCensusEntryRandomEnums.*;
 import static scot.carricksoftware.grants.GenerateCertificateRandomValues.GetRandomString;
+import static scot.carricksoftware.grants.GenerateGeneralRandomEnums.GetRandomGeneralYesNo;
 import static scot.carricksoftware.grants.GenerateRandomCensusValues.GetRandomCensus;
 import static scot.carricksoftware.grants.GenerateRandomNumberValues.GetRandomLong;
 import static scot.carricksoftware.grants.GenerateRandomPeopleValues.GetRandomPerson;
@@ -51,6 +53,9 @@ class CensusEntryConverterTest {
         String childrenWhoHaveDied = GetRandomString();
         String yearsCompletedMarriage = GetRandomString();
         String childrenStillAlive = GetRandomString();
+        String industryOrService = GetRandomString();
+        YesNo workingAtHome = GetRandomGeneralYesNo();
+
 
         source.setId(id);
         source.setName(name);
@@ -71,6 +76,8 @@ class CensusEntryConverterTest {
         source.setChildrenWhoHaveDied(childrenWhoHaveDied);
         source.setYearsCompletedMarriage(yearsCompletedMarriage);
         source.setChildrenStillAlive(childrenStillAlive);
+        source.setIndustryOrService(industryOrService);
+        source.setWorkingAtHome(workingAtHome);
 
         CensusEntryCommand target = converter.convert(source);
 
@@ -94,5 +101,7 @@ class CensusEntryConverterTest {
         assertEquals(childrenStillAlive, target.getChildrenStillAlive());
         assertEquals(yearsCompletedMarriage, target.getYearsCompletedMarriage());
         assertEquals(childrenWhoHaveDied, target.getChildrenWhoHaveDied());
+        assertEquals(workingAtHome, target.getWorkingAtHome());
+        assertEquals(industryOrService, target.getIndustryOrService());
     }
 }