Dtspb 4783 pp intestacy journey by IswaryaPepakayala · Pull Request #3628 · hmcts/probate-back-office

IswaryaPepakayala · 2026-02-03T12:59:08Z

JIRA link (if applicable)

https://tools.hmcts.net/jira/browse/DTSPB-4783

Change description

Does this PR introduce a breaking change? (check one with "x")

[ ] Yes
[X] No

…acy-PP-Spouse-Journey

# Conflicts: # src/main/java/uk/gov/hmcts/probate/model/ccd/raw/response/ResponseCaseData.java # src/main/java/uk/gov/hmcts/probate/transformer/CallbackResponseTransformer.java

# Conflicts: # ccdImports/configFiles/CCD_Probate_Backoffice/CaseEventToFields.json # ccdImports/configFiles/CCD_Probate_Backoffice/FixedLists.json

…-PP-Intestacy-journey # Conflicts: # ccdImports/configFiles/CCD_Probate_Backoffice/CaseEventToFields.json # src/main/java/uk/gov/hmcts/probate/controller/BusinessValidationController.java # src/main/resources/ValidationMessages.properties # src/test/java/uk/gov/hmcts/probate/controller/BusinessValidationUnitTest.java

…estacy-Grandchild-Journey # Conflicts: # ccdImports/configFiles/CCD_Probate_Backoffice/CaseEventToFields.json

…estacy-Grandchild-Journey

tom-saunders-cts · 2026-02-24T12:19:39Z

ccdImports/configFiles/CCD_Probate_Backoffice/CaseField.json

  {"LiveFrom": "01/01/2017", "CaseTypeID": "GrantOfRepresentation", "ID": "childrenDiedBeforeDeceased", "Label": "Did any of these children die before deceased?", "FieldType": "FixedList", "FieldTypeParameter": "predeceasedFixedList", "SecurityClassification": "Public"},
  {"LiveFrom": "01/01/2017", "CaseTypeID": "GrantOfRepresentation", "ID": "hasCoApplicant", "Label": "Has any co-applicants?", "FieldType": "YesOrNo", "SecurityClassification": "Public"},
-  {"LiveFrom": "01/01/2017", "CaseTypeID": "GrantOfRepresentation", "ID": "childAlive", "Label": "Is deceased‘s child alive?", "FieldType": "YesOrNo", "SecurityClassification": "Public"},
+  {"LiveFrom": "01/01/2017", "CaseTypeID": "GrantOfRepresentation", "ID": "childAlive", "Label": "Is one of the applicant’s parents a deceased child of the deceased?", "FieldType": "YesOrNo", "SecurityClassification": "Public"},


in hindsight this seems like a poorly named field

tom-saunders-cts · 2026-02-24T12:35:09Z

ccdImports/configFiles/CCD_Probate_Backoffice/FixedLists.json

  {"LiveFrom": "06/01/2017", "ID": "solsResiduaryTypes", "ListElementCode": "LegateeDevisee", "ListElement": "the residuary legatee and devisee"},
-  {"LiveFrom": "06/01/2017", "ID": "solsRelationshipsToDeceased", "ListElementCode": "SpouseOrCivil", "ListElement": "Spouse or civil partner", "DisplayOrder":  "1"},
-  {"LiveFrom": "06/01/2017", "ID": "solsRelationshipsToDeceased", "ListElementCode": "Child", "ListElement": "Child", "DisplayOrder":  "2"},
-  {"LiveFrom": "06/01/2017", "ID": "solsRelationshipsToDeceased", "ListElementCode": "ChildAdopted", "ListElement": "Adopted child", "DisplayOrder":  "3"},


do we need to prepare a data migration for removing ChildAdopted?

Yeah.We need to think about it.

tom-saunders-cts · 2026-02-24T12:45:42Z

ccdImports/configFiles/CCD_Probate_Backoffice/FixedLists.json

+  {"LiveFrom": "01/01/2017", "ID": "DocumentsRequiredSubList", "ListElementCode": "PA1A", "ListElement": "PA1A", "DisplayOrder":  "7"},
+  {"LiveFrom": "01/01/2017", "ID": "DocumentsRequiredSubList", "ListElementCode": "PA1P", "ListElement": "PA1P", "DisplayOrder":  "8"},


have these been merged in from another branch?

Rebased with master.Think will resolve this.

tom-saunders-cts · 2026-02-24T12:46:27Z

ccdImports/configFiles/CCD_Probate_Caveat/AuthorisationCaseEvent.json

the changes here seem unrelated to this set of changes?

Rebased with master.Think will resolve this.

tom-saunders-cts · 2026-02-24T15:20:08Z

src/main/java/uk/gov/hmcts/probate/validator/IntestacyDeceasedDetailsValidationRule.java

+            if (isSiblingOrParent && YES.equalsIgnoreCase(deceased.getDeceasedAnyLivingParents())) {
+                codes.add(LIVING_PARENTS);
+                codes.add(LIVING_PARENTS_WELSH);


doesn't this stop any parent applying? (since they are alive?)

Updated.Sorry need to add isSiblingOrParent for descendants.

tom-saunders-cts · 2026-02-24T16:32:31Z

src/main/java/uk/gov/hmcts/probate/transformer/CallbackResponseTransformer.java

+        if (existingExecutorList != null && !existingExecutorList.isEmpty()) {
+            for (CollectionMember<IntestacyAdditionalExecutor> additionalExecutor : existingExecutorList) {
+                if (additionalExecutor.getValue().getSolsApplicantFamilyDetails() != null
+                        && additionalExecutor.getValue().getSolsApplicantFamilyDetails().getRelationship() != null) {
+                    DynamicRadioList relationshipRadioList =
+                            additionalExecutor.getValue().getSolsApplicantFamilyDetails().getRelationship();
+                    if (relationshipRadioList.getValue() != null
+                            && relationshipRadioList.getValue().getCode() != null) {
+                        String code = relationshipRadioList.getValue().getCode();
+                        selectedValue = listItems.stream()
+                                .filter(item -> code.equals(item.getCode()))
+                                .findFirst()
+                                .orElse(null);
+                    }
+                    break;
+                }
+            }
+        }


so we use the value of the relationship of the last entry in the existing execs to provide the default for the new relationships?

This code is for radio selection.If no existingExecutorList lis there then we show selectedValue as null and if it has existingExecutorList then the selectedValue will be the one that is selected before

tom-saunders-cts · 2026-02-24T16:35:21Z

src/main/java/uk/gov/hmcts/probate/validator/IntestacyDivorceOrSeparationValidationRule.java

+    public static final String DIVORCED_OUTSIDE_ENGLAND_OR_WALES = "divorcedOutsideEnglandOrWales";
+    public static final String DIVORCED_OUTSIDE_ENGLAND_OR_WALES_WELSH = "divorcedOutsideEnglandOrWales";
+    public static final String SEPARATED_OUTSIDE_ENGLAND_OR_WALES = "separatedOutsideEnglandOrWales";
+    public static final String SEPARATED_OUTSIDE_ENGLAND_OR_WALES_WELSH = "separatedOutsideEnglandOrWales";


should ..._WELSH be different from non-..._WELSH?

I have changed that in CW Amend PR because Welsh was not available when I was doing PP Intestacy https://github.com/hmcts/probate-back-office/pull/3670/changes

tom-saunders-cts · 2026-02-24T16:37:48Z

src/main/resources/templates/pdf/admonWillGrant.html

i'm going to work on the basis that these template changes are unintentionally included?

tom-saunders-cts · 2026-02-24T16:43:06Z

src/main/resources/ValidationMessages.properties

 AssembleLetterEvent=As there is no email address recorded for this applicant, you must use the 'Assemble a letter' event to request information instead.
 invalidCaseTypeSelection=Cannot select this case type, please select a different case type
 notAllowedStopReason=You cannot use stop reason **NOT TO BE USED (Other)**. You must select a specific stop reason from the case stop reason list
+errorCannotProceed=A joint application is not possible if the main applicant is the deceased's husband, wife or civil partner.\nIn some cases, the deceased's child can be a joint applicant. Use Form PA1A to apply by post instead.


can we confirm that these messages show up with the ' values correctly? i've been bitten in the past by properties files getting loaded and used through MessageFormat which can lead to some surprising outputs if you arent' expecting them.

Updated with Unicode escape sequences

tom-saunders-cts · 2026-02-24T16:43:54Z

src/main/resources/ValidationMessages.properties

 invalidCaseTypeSelection=Cannot select this case type, please select a different case type
 notAllowedStopReason=You cannot use stop reason **NOT TO BE USED (Other)**. You must select a specific stop reason from the case stop reason list
+errorCannotProceed=A joint application is not possible if the main applicant is the deceased's husband, wife or civil partner.\nIn some cases, the deceased's child can be a joint applicant. Use Form PA1A to apply by post instead.
+errorCannotProceedWelsh=Nid yw cais ar y cyd yn bosibl os yw?r prif geisydd yn ?r, gwraig neu bartner sifil yr ymadawedig.\nMewn rhai achosion, gall plentyn yr ymadawedig fod yn geisydd ar y cyd. Yn hytrach, bydd angen ichi wneud cais drwy?r post drwy ddefnyddio Ffurflen PA1A.


i'm almost certain the ? chars here should be ' ? (and in some of the other messages below)

IswaryaPepakayala and others added 30 commits January 12, 2026 08:57

DTSPB-4783 PP Intestacy journey

4f61378

DTSPB-4788 content change - applicant details

29a276f

Merge branch 'DTSPB-4689-Digitising-Intestacy' into DTSPB-4788

67f7289

DTSPB-4783 Fixed build issues

2eebd06

DTSPB-4778 Intestacy PP Spouse Journey

09e5734

Merge branch 'master' into DTSPB-4778-Intestacy-PP-Spouse-Journey

eb8fb16

DTSPB-4778 Intestacy PP Spouse Journey

f41243b

DTSPB-4778 add Functional Tests

f4d03df

Merge branch 'DTSPB-4689-Digitising-Intestacy' into DTSPB-4778-Intest…

8c558a2

…acy-PP-Spouse-Journey

Merge branch 'DTSPB-4689-Digitising-Intestacy' into DTSPB-4788

586521c

DTSPB-4783 Further changes to populate coapplicant list

309515e

Update ValidationMessages.properties

9a4f8c2

Merge branch 'master' into DTSPB-4778-Intestacy-PP-Spouse-Journey

2742926

DTSPB-4778 update ValidationMessages.properties

253fb3f

DTSPB-4778 update ValidationMessages.properties

5c9e62f

DTSPB-4778 update ValidationMessages.properties

0b170d4

DTSPB-4778 update the Welsh Text for the ValidationMessages.properties

afd3443

DTSPB-4783 Further changes to custom error messages

6cb259e

DTSPB-4770 PP Intestacy Grandchild journey

9f03dce

Merge branch 'master' into DTSPB-4783-PP-Intestacy-journey

df11c9a

# Conflicts: # src/main/java/uk/gov/hmcts/probate/model/ccd/raw/response/ResponseCaseData.java # src/main/java/uk/gov/hmcts/probate/transformer/CallbackResponseTransformer.java

DTSPB-4783 rebase with Master

01c9cb6

Merge branch 'DTSPB-4788' into DTSPB-4783-PP-Intestacy-journey

de32fbe

# Conflicts: # ccdImports/configFiles/CCD_Probate_Backoffice/CaseEventToFields.json # ccdImports/configFiles/CCD_Probate_Backoffice/FixedLists.json

DTSPB-4783 fix rebase issue with PP spouse journey

1d86148

DTSPB-4783 Added test class

612cea2

Merge branch 'DTSPB-4783-PP-Intestacy-journey' into DTSPB-4770-PP-Int…

82f0361

…estacy-Grandchild-Journey # Conflicts: # ccdImports/configFiles/CCD_Probate_Backoffice/CaseEventToFields.json

DTSPB-4783 fix rebase issue with PP spouse journey

8af2a2f

DTSPB-4770 update CaseEventToFields.json

d0e16c3

DTSPB-4783 Added few more tests and few fixes

151d087

merge master

cb46f42

MarcusHMCTS added 4 commits February 3, 2026 18:45

Merge branch 'DTSPB-4783-PP-Intestacy-journey' into DTSPB-4770-PP-Int…

99b96a4

…estacy-Grandchild-Journey # Conflicts: # ccdImports/configFiles/CCD_Probate_Backoffice/CaseEventToFields.json

DTSPB-4770 rebase with PP Child journey

8d37a03

DTSPB-4770 fix style issue

23cf7e1

DTSPB-4770 update solicitorUpdateIntestacyPage2 midEvent url

42315ce

hmcts-jenkins-j-to-z bot deployed to preview February 3, 2026 20:05 View deployment

hmcts-jenkins-j-to-z bot deployed to preview February 3, 2026 20:09 View deployment

hmcts-jenkins-j-to-z bot deployed to preview February 3, 2026 21:21 View deployment

hmcts-jenkins-j-to-z bot deployed to preview February 4, 2026 09:19 View deployment

DTSPB-4783 Added switch condition

181febe

hmcts-jenkins-j-to-z bot deployed to preview February 4, 2026 12:00 View deployment

hmcts-jenkins-j-to-z bot deployed to preview February 4, 2026 12:03 View deployment

Merge branch 'DTSPB-4783-PP-Intestacy-journey' into DTSPB-4770-PP-Int…

84c6db2

…estacy-Grandchild-Journey

hmcts-jenkins-j-to-z bot deployed to preview February 12, 2026 12:59 View deployment

IswaryaPepakayala added 2 commits February 16, 2026 10:33

DTSPB-4808 Sibling journey changes

e0d098e

DTSPB-4808 Fix check styles

2d5706c

hmcts-jenkins-j-to-z bot deployed to preview February 16, 2026 13:33 View deployment

hmcts-jenkins-j-to-z bot deployed to preview February 20, 2026 12:51 View deployment

Dtspb 4813 pp parent journey (#3649)

cece2eb

hmcts-jenkins-j-to-z bot deployed to preview February 23, 2026 12:08 View deployment

tom-saunders-cts requested changes Feb 24, 2026

View reviewed changes

merge base branch

06a0857

hmcts-jenkins-j-to-z bot deployed to preview March 2, 2026 19:52 View deployment

DTSPB-4783 Addressing review comments

9cf0f94

hmcts-jenkins-j-to-z bot deployed to preview March 4, 2026 11:07 View deployment

IswaryaPepakayala added 2 commits March 4, 2026 12:12

DTSPB-4770 Field name changes for deceased parent

66d3b4d

DTSPB-4770 Modified log

be00db1

hmcts-jenkins-j-to-z bot deployed to preview March 4, 2026 12:23 View deployment

hmcts-jenkins-j-to-z bot deployed to preview March 4, 2026 12:33 View deployment

IswaryaPepakayala requested a review from tom-saunders-cts March 4, 2026 13:43

hmcts-jenkins-j-to-z bot deployed to preview March 9, 2026 09:52 View deployment

		{"LiveFrom": "01/01/2017", "ID": "DocumentsRequiredSubList", "ListElementCode": "PA1A", "ListElement": "PA1A", "DisplayOrder": "7"},
		{"LiveFrom": "01/01/2017", "ID": "DocumentsRequiredSubList", "ListElementCode": "PA1P", "ListElement": "PA1P", "DisplayOrder": "8"},

Conversation

IswaryaPepakayala commented Feb 3, 2026

JIRA link (if applicable)

Change description

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants