From bd261bd632b9d80d7b8ad692d9881b7c4c5bd380 Mon Sep 17 00:00:00 2001 From: Alex Buzea Date: Thu, 19 Mar 2026 15:35:36 +0000 Subject: [PATCH 1/3] mapping defedant responses for dependants to household_circumstances table --- .../respondpossessionclaim/HouseholdCircumstances.java | 9 +++++++++ .../HouseholdCircumstancesService.java | 3 +++ 2 files changed, 12 insertions(+) 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..64e49cdebb 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 + private String dependantChildrenDetails; + + @CCD + private YesOrNo otherDependants; + + @CCD + 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; From f76e02ef9050807276e71f45e857ba78450a6c82 Mon Sep 17 00:00:00 2001 From: Alex Buzea Date: Wed, 25 Mar 2026 17:14:13 +0000 Subject: [PATCH 2/3] adding tests for fields added --- .../HouseholdCircumstancesServiceTest.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) 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 From c86de256dad39d0723e92888559bb9ac3c3eb4cb Mon Sep 17 00:00:00 2001 From: Alex Buzea Date: Thu, 26 Mar 2026 09:48:42 +0000 Subject: [PATCH 3/3] adding max length attribute for validation --- .../domain/respondpossessionclaim/HouseholdCircumstances.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 64e49cdebb..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,13 +17,13 @@ public class HouseholdCircumstances { @CCD private YesOrNo dependantChildren; - @CCD + @CCD(max = 500) private String dependantChildrenDetails; @CCD private YesOrNo otherDependants; - @CCD + @CCD(max = 500) private String otherDependantDetails; }