From 07a6c82f15416350dfdcc4d9b5036906c8159e16 Mon Sep 17 00:00:00 2001 From: "iswarya.pepakayala" Date: Tue, 9 Sep 2025 11:31:49 +0100 Subject: [PATCH 1/6] DTSPB-4689 Changed commons version --- build.gradle | 2 +- charts/probate-orchestrator-service/values.yaml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index a6b49eaea..6be5c1241 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ def versions = [ mapStruct : '1.3.0.Final', pact_version : '4.1.34', piTest : '1.20.2', - probateCommonsVersion : '2.2.12', + probateCommonsVersion : '2.2.12-DTSPB-4689-v1', restAssured : '5.5.6', serenity : '4.2.34', serviceAuthProviderClient : '5.3.3', diff --git a/charts/probate-orchestrator-service/values.yaml b/charts/probate-orchestrator-service/values.yaml index 8d24f4ff1..9bff572de 100644 --- a/charts/probate-orchestrator-service/values.yaml +++ b/charts/probate-orchestrator-service/values.yaml @@ -11,12 +11,12 @@ java: DEPLOYMENT_ENV: "{{ .Values.global.environment }}" SERVICES_PERSISTENCE_BASEURL: "http://probate-persistence-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" AUTH_PROVIDER_SERVICE_CLIENT_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" - SERVICES_CORECASEDATA_BASEURL: "http://ccd-data-store-api-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" + SERVICES_CORECASEDATA_BASEURL: "http://probate-back-office-pr-3376-ccd-data-store-api" SERVICES_AUTH_PROVIDER_BASEURL: "http://rpe-service-auth-provider-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" AUTH_IDAM_CLIENT_BASEURL: "https://idam-api.{{ .Values.global.environment }}.platform.hmcts.net" - SUBMIT_SERVICE_API_URL: "http://probate-submit-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" + SUBMIT_SERVICE_API_URL: "http://probate-submit-service-pr-1215-java" BUSINESS_SERVICE_API_URL: "http://probate-business-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" - BACK_OFFICE_API_URL: "http://probate-back-office-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal" + BACK_OFFICE_API_URL: "http://probate-back-office-pr-3376-java" MAIL_JAVAMAILPROPERTIES_MAIL_SMTP_SSL_ENABLE: false MAIL_JAVAMAILPROPERTIES_MAIL_SMTP_AUTH: false SERVICES_CORECASEDATA_ENABLED: true From ec14d10adcec5e3d09c7d5643568198ff0d2c84e Mon Sep 17 00:00:00 2001 From: hmcts-jenkins-j-to-z <61242337+hmcts-jenkins-j-to-z[bot]@users.noreply.github.com> Date: Tue, 9 Sep 2025 10:33:30 +0000 Subject: [PATCH 2/6] Bumping chart version/ fixing aliases --- charts/probate-orchestrator-service/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/probate-orchestrator-service/Chart.yaml b/charts/probate-orchestrator-service/Chart.yaml index 8c8559b81..36d397637 100644 --- a/charts/probate-orchestrator-service/Chart.yaml +++ b/charts/probate-orchestrator-service/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: probate-orchestrator-service home: https://github.com/hmcts/probate-orchestrator-service -version: 1.0.51 +version: 1.0.52 description: HMCTS Probate Orchestrator Service maintainers: - name: HMCTS Probate Team From 7e6360f7239a32a1a62d7b7f836ac6dcbefd530a Mon Sep 17 00:00:00 2001 From: "iswarya.pepakayala" Date: Tue, 9 Sep 2025 14:53:19 +0100 Subject: [PATCH 3/6] DTSPB-4689 Changed the Intestacy mapper --- .../hmcts/probate/core/service/mapper/IntestacyMapper.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java index fe57d911c..fdd11573d 100644 --- a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java +++ b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java @@ -78,6 +78,11 @@ public interface IntestacyMapper extends FormMapper Date: Fri, 19 Sep 2025 10:40:11 +0100 Subject: [PATCH 4/6] DTSPB-4689 changed commons version --- build.gradle | 2 +- .../hmcts/probate/core/service/mapper/IntestacyMapper.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 6be5c1241..77fb33957 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ def versions = [ mapStruct : '1.3.0.Final', pact_version : '4.1.34', piTest : '1.20.2', - probateCommonsVersion : '2.2.12-DTSPB-4689-v1', + probateCommonsVersion : '2.2.12-DTSPB-4689-v2', restAssured : '5.5.6', serenity : '4.2.34', serviceAuthProviderClient : '5.3.3', diff --git a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java index fdd11573d..bbb6f85b8 100644 --- a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java +++ b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java @@ -78,11 +78,8 @@ public interface IntestacyMapper extends FormMapper Date: Wed, 17 Sep 2025 16:15:58 +0100 Subject: [PATCH 5/6] use updated mappings. --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 77fb33957..bbcc4944b 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ def versions = [ mapStruct : '1.3.0.Final', pact_version : '4.1.34', piTest : '1.20.2', - probateCommonsVersion : '2.2.12-DTSPB-4689-v2', + probateCommonsVersion : '2.2.12-DTSPB-4689-v3', restAssured : '5.5.6', serenity : '4.2.34', serviceAuthProviderClient : '5.3.3', From 62f9aed19a7049bd88be9e6f8f6d77ed371b6133 Mon Sep 17 00:00:00 2001 From: Iswarya Pepakayala Date: Fri, 17 Oct 2025 11:37:19 +0100 Subject: [PATCH 6/6] Dtspb 4704 intestacy child journey changes (#1397) * DTSPB-4704 Intestacy child journey changes * DTSPB-4704 Added test --- build.gradle | 2 +- .../mapper/ApplicantFamilyDetailsMapper.java | 43 +++++++++++ .../core/service/mapper/IntestacyMapper.java | 17 +++- .../FromApplicantFamilyDetails.java | 14 ++++ .../qualifiers/ToApplicantFamilyDetails.java | 14 ++++ .../ApplicantFamilyDetailsMapperTest.java | 77 +++++++++++++++++++ 6 files changed, 164 insertions(+), 3 deletions(-) create mode 100644 src/main/java/uk/gov/hmcts/probate/core/service/mapper/ApplicantFamilyDetailsMapper.java create mode 100644 src/main/java/uk/gov/hmcts/probate/core/service/mapper/qualifiers/FromApplicantFamilyDetails.java create mode 100644 src/main/java/uk/gov/hmcts/probate/core/service/mapper/qualifiers/ToApplicantFamilyDetails.java create mode 100644 src/test/java/uk/gov/hmcts/probate/core/service/mapper/ApplicantFamilyDetailsMapperTest.java diff --git a/build.gradle b/build.gradle index 6be1b9505..1b4fa0f0a 100644 --- a/build.gradle +++ b/build.gradle @@ -173,7 +173,7 @@ def versions = [ mapStruct : '1.3.0.Final', pact_version : '4.1.34', piTest : '1.21.0', - probateCommonsVersion : '2.2.12-DTSPB-4689-v3', + probateCommonsVersion : '2.2.12-DTSPB-4689-v4', restAssured : '5.5.6', serenity : '4.2.34', serviceAuthProviderClient : '5.3.3', diff --git a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/ApplicantFamilyDetailsMapper.java b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/ApplicantFamilyDetailsMapper.java new file mode 100644 index 000000000..410cb0ea0 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/ApplicantFamilyDetailsMapper.java @@ -0,0 +1,43 @@ +package uk.gov.hmcts.probate.core.service.mapper; + +import org.springframework.stereotype.Component; +import uk.gov.hmcts.probate.core.service.mapper.qualifiers.FromApplicantFamilyDetails; +import uk.gov.hmcts.probate.core.service.mapper.qualifiers.ToApplicantFamilyDetails; +import uk.gov.hmcts.reform.probate.model.Relationship; +import uk.gov.hmcts.reform.probate.model.cases.ApplicantFamilyDetails; +import uk.gov.hmcts.reform.probate.model.forms.intestacy.FamilyDetails; + +@Component +public class ApplicantFamilyDetailsMapper { + @ToApplicantFamilyDetails + public ApplicantFamilyDetails toApplicantDetails(FamilyDetails details) { + if (details == null) { + return null; + } + return ApplicantFamilyDetails.builder() + .relationshipToDeceased(Relationship.fromString(details.getRelationshipToDeceased())) + .childAdoptedIn(details.getChildAdoptedIn()) + .childAdoptionInEnglandOrWales(details.getChildAdoptionInEnglandOrWales()) + .childAdoptedOut(details.getChildAdoptedOut()) + .grandchildAdoptedIn(details.getGrandchildAdoptedIn()) + .grandchildAdoptionInEnglandOrWales(details.getGrandchildAdoptionInEnglandOrWales()) + .grandchildAdoptedOut(details.getGrandchildAdoptedOut()) + .build(); + } + + @FromApplicantFamilyDetails + public FamilyDetails fromApplicantDetails(ApplicantFamilyDetails details) { + if (details == null) { + return null; + } + return FamilyDetails.builder() + .relationshipToDeceased(details.getRelationshipToDeceased().getDescription()) + .childAdoptedIn(details.getChildAdoptedIn()) + .childAdoptionInEnglandOrWales(details.getChildAdoptionInEnglandOrWales()) + .childAdoptedOut(details.getChildAdoptedOut()) + .grandchildAdoptedIn(details.getGrandchildAdoptedIn()) + .grandchildAdoptionInEnglandOrWales(details.getGrandchildAdoptionInEnglandOrWales()) + .grandchildAdoptedOut(details.getGrandchildAdoptedOut()) + .build(); + } +} diff --git a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java index bbb6f85b8..894bfc2b1 100644 --- a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java +++ b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/IntestacyMapper.java @@ -5,6 +5,7 @@ import org.mapstruct.Mapping; import org.mapstruct.NullValueCheckStrategy; import org.mapstruct.ReportingPolicy; +import uk.gov.hmcts.probate.core.service.mapper.qualifiers.FromApplicantFamilyDetails; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.FromCollectionMember; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.FromDocumentLink; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.FromIhtMethod; @@ -12,6 +13,7 @@ import uk.gov.hmcts.probate.core.service.mapper.qualifiers.FromMap; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.FromRegistryLocation; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.FromUploadDocs; +import uk.gov.hmcts.probate.core.service.mapper.qualifiers.ToApplicantFamilyDetails; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.ToCaseAddress; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.ToCollectionMember; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.ToDocumentLink; @@ -25,6 +27,7 @@ import uk.gov.hmcts.probate.core.service.mapper.qualifiers.ToRegistryLocation; import uk.gov.hmcts.probate.core.service.mapper.qualifiers.ToUploadDocs; import uk.gov.hmcts.reform.probate.model.IhtFormType; +import uk.gov.hmcts.reform.probate.model.Predeceased; import uk.gov.hmcts.reform.probate.model.ProbateType; import uk.gov.hmcts.reform.probate.model.Relationship; import uk.gov.hmcts.reform.probate.model.cases.ApplicationType; @@ -42,10 +45,10 @@ @Mapper(componentModel = "spring", uses = {PaPaymentMapper.class, PaymentsMapper.class, AliasNameMapper.class, RegistryLocationMapper.class, PoundsConverter.class, IhtMethodConverter.class, MapConverter.class, LegalStatementMapper.class, LocalDateTimeMapper.class, - DocumentsMapper.class, StatementOfTruthMapper.class, AddressMapper.class}, + DocumentsMapper.class, StatementOfTruthMapper.class, AddressMapper.class, ApplicantFamilyDetailsMapper.class}, imports = {ApplicationType.class, GrantType.class, LocalDate.class, ProbateType.class, IhtMethod.class, MaritalStatus.class, DeathCertificate.class, Relationship.class, SpouseNotApplyingReason.class, - AddressMapper.class, IhtFormType.class}, + AddressMapper.class, IhtFormType.class, Predeceased.class}, unmappedTargetPolicy = ReportingPolicy.IGNORE, nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) public interface IntestacyMapper extends FormMapper { @@ -85,6 +88,9 @@ public interface IntestacyMapper extends FormMapper 0L)") + @Mapping(target = "details", source = "applicantFamilyDetails", + qualifiedBy = {FromApplicantFamilyDetails.class}) @InheritInverseConfiguration IntestacyForm fromCaseData(GrantOfRepresentationData grantOfRepresentation); } diff --git a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/qualifiers/FromApplicantFamilyDetails.java b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/qualifiers/FromApplicantFamilyDetails.java new file mode 100644 index 000000000..1aa378459 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/qualifiers/FromApplicantFamilyDetails.java @@ -0,0 +1,14 @@ +package uk.gov.hmcts.probate.core.service.mapper.qualifiers; + +import org.mapstruct.Qualifier; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Qualifier +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.SOURCE) +public @interface FromApplicantFamilyDetails { +} diff --git a/src/main/java/uk/gov/hmcts/probate/core/service/mapper/qualifiers/ToApplicantFamilyDetails.java b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/qualifiers/ToApplicantFamilyDetails.java new file mode 100644 index 000000000..47d2aa0b5 --- /dev/null +++ b/src/main/java/uk/gov/hmcts/probate/core/service/mapper/qualifiers/ToApplicantFamilyDetails.java @@ -0,0 +1,14 @@ +package uk.gov.hmcts.probate.core.service.mapper.qualifiers; + +import org.mapstruct.Qualifier; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Qualifier +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.SOURCE) +public @interface ToApplicantFamilyDetails { +} diff --git a/src/test/java/uk/gov/hmcts/probate/core/service/mapper/ApplicantFamilyDetailsMapperTest.java b/src/test/java/uk/gov/hmcts/probate/core/service/mapper/ApplicantFamilyDetailsMapperTest.java new file mode 100644 index 000000000..cc7935c3a --- /dev/null +++ b/src/test/java/uk/gov/hmcts/probate/core/service/mapper/ApplicantFamilyDetailsMapperTest.java @@ -0,0 +1,77 @@ +package uk.gov.hmcts.probate.core.service.mapper; + +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.Mock; +import uk.gov.hmcts.reform.probate.model.Relationship; +import uk.gov.hmcts.reform.probate.model.cases.ApplicantFamilyDetails; +import uk.gov.hmcts.reform.probate.model.forms.intestacy.FamilyDetails; + +class ApplicantFamilyDetailsMapperTest { + @Mock + private ApplicantFamilyDetailsMapper mapper; + + @BeforeEach + void setUp() { + mapper = new ApplicantFamilyDetailsMapper(); + } + + @Test + void toApplicantDetailsReturnsNullWhenInputIsNull() { + ApplicantFamilyDetails result = mapper.toApplicantDetails(null); + Assertions.assertThat(result).isNull(); + } + + @Test + void fromApplicantDetailsReturnsNullWhenInputIsNull() { + FamilyDetails result = mapper.fromApplicantDetails(null); + Assertions.assertThat(result).isNull(); + } + + @Test + void toApplicantDetailsMapsAllFieldsCorrectly() { + FamilyDetails details = FamilyDetails.builder() + .relationshipToDeceased("optionSpousePartner") + .childAdoptedIn(true) + .childAdoptionInEnglandOrWales(false) + .childAdoptedOut(true) + .grandchildAdoptedIn(false) + .grandchildAdoptionInEnglandOrWales(true) + .grandchildAdoptedOut(false) + .build(); + + ApplicantFamilyDetails result = mapper.toApplicantDetails(details); + + Assertions.assertThat(result.getRelationshipToDeceased()).isEqualTo(Relationship.PARTNER); + Assertions.assertThat(result.getChildAdoptedIn()).isTrue(); + Assertions.assertThat(result.getChildAdoptionInEnglandOrWales()).isFalse(); + Assertions.assertThat(result.getChildAdoptedOut()).isTrue(); + Assertions.assertThat(result.getGrandchildAdoptedIn()).isFalse(); + Assertions.assertThat(result.getGrandchildAdoptionInEnglandOrWales()).isTrue(); + Assertions.assertThat(result.getGrandchildAdoptedOut()).isFalse(); + } + + @Test + void fromApplicantDetailsMapsAllFieldsCorrectly() { + ApplicantFamilyDetails details = ApplicantFamilyDetails.builder() + .relationshipToDeceased(Relationship.PARTNER) + .childAdoptedIn(true) + .childAdoptionInEnglandOrWales(false) + .childAdoptedOut(true) + .grandchildAdoptedIn(false) + .grandchildAdoptionInEnglandOrWales(true) + .grandchildAdoptedOut(false) + .build(); + + FamilyDetails result = mapper.fromApplicantDetails(details); + + Assertions.assertThat(result.getRelationshipToDeceased()).isEqualTo("optionSpousePartner"); + Assertions.assertThat(result.getChildAdoptedIn()).isTrue(); + Assertions.assertThat(result.getChildAdoptionInEnglandOrWales()).isFalse(); + Assertions.assertThat(result.getChildAdoptedOut()).isTrue(); + Assertions.assertThat(result.getGrandchildAdoptedIn()).isFalse(); + Assertions.assertThat(result.getGrandchildAdoptionInEnglandOrWales()).isTrue(); + Assertions.assertThat(result.getGrandchildAdoptedOut()).isFalse(); + } +} \ No newline at end of file