diff --git a/src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/respondpossessionclaim/HouseholdCircumstances.java b/src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/respondpossessionclaim/HouseholdCircumstances.java index 63b5b90d92..d6018dd526 100644 --- a/src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/respondpossessionclaim/HouseholdCircumstances.java +++ b/src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/respondpossessionclaim/HouseholdCircumstances.java @@ -17,4 +17,13 @@ public class HouseholdCircumstances { @CCD private YesOrNo dependantChildren; + @CCD(max = 500) + private String dependantChildrenDetails; + + @CCD + private YesOrNo otherDependants; + + @CCD(max = 500) + private String otherDependantDetails; + } diff --git a/src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/HouseholdCircumstancesService.java b/src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/HouseholdCircumstancesService.java index 2c4ec07507..ab7c293b83 100644 --- a/src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/HouseholdCircumstancesService.java +++ b/src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/HouseholdCircumstancesService.java @@ -15,6 +15,9 @@ public HouseholdCircumstancesEntity createHouseholdCircumstancesEntity(Household HouseholdCircumstancesEntity householdCircumstancesEntity = HouseholdCircumstancesEntity.builder() .dependantChildren(circumstances.getDependantChildren()) + .dependantChildrenDetails(circumstances.getDependantChildrenDetails()) + .otherDependants(circumstances.getOtherDependants()) + .otherDependantDetails(circumstances.getOtherDependantDetails()) .build(); return householdCircumstancesEntity; diff --git a/src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/HouseholdCircumstancesServiceTest.java b/src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/HouseholdCircumstancesServiceTest.java index 3fc4c62e6f..e3127962c7 100644 --- a/src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/HouseholdCircumstancesServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/HouseholdCircumstancesServiceTest.java @@ -49,6 +49,60 @@ private static Stream dependantChildrenScenarios() { ); } + @Test + void shouldMapDependantChildrenDetailsField() { + //Given + HouseholdCircumstances householdCircumstances = HouseholdCircumstances.builder() + .dependantChildrenDetails("Two children aged 4 and 7") + .build(); + + //When + HouseholdCircumstancesEntity entity = underTest.createHouseholdCircumstancesEntity(householdCircumstances); + + //Then + assertThat(entity).isNotNull(); + assertThat(entity.getDependantChildrenDetails()).isEqualTo("Two children aged 4 and 7"); + } + + @ParameterizedTest + @MethodSource("otherDependantsScenarios") + void shouldMapOtherDependantsField(YesOrNo expected) { + //Given + HouseholdCircumstances householdCircumstances = HouseholdCircumstances.builder() + .otherDependants(expected) + .build(); + + //When + HouseholdCircumstancesEntity entity = underTest.createHouseholdCircumstancesEntity(householdCircumstances); + + //Then + assertThat(entity).isNotNull(); + assertThat(entity.getOtherDependants()).isEqualTo(expected); + } + + private static Stream otherDependantsScenarios() { + return Stream.of( + Arguments.of(YesOrNo.YES), + Arguments.of(YesOrNo.NO), + Arguments.of((YesOrNo) null) + ); + } + + @Test + void shouldMapOtherDependantDetailsField() { + //Given + HouseholdCircumstances householdCircumstances = HouseholdCircumstances.builder() + .otherDependantDetails("Elderly parent requiring full-time care") + .build(); + + //When + HouseholdCircumstancesEntity entity = underTest.createHouseholdCircumstancesEntity(householdCircumstances); + + //Then + assertThat(entity).isNotNull(); + assertThat(entity.getOtherDependantDetails()).isEqualTo("Elderly parent requiring full-time care"); + } + @Test void shouldReturnNullWhenHouseholdCircumstancesIsNull() { // When