PDJB-1168: add change links to org landlord CYA page by TomHanmer29 · Pull Request #1628 · communitiesuk/prsdb-webapp

TomHanmer29 · 2026-07-21T14:26:41Z

Ticket number

PDJB-1168

Goal of change

Adds the functionality to the change links to the CYA page for org landlords

Description of main change(s)

Refactors some of the elements of the journey into individual tasks to let them be used as a change link.
Adds the "landlord type" section to the CYA page for individual landlords when the flag is on.
Doesn't include the CYA for org type or companies house

Checklist

Delete any that are not applicable, and add explanation below for any that are applicable but haven't been done

Unit tests for new logic (e.g. new service methods) have been added
New journey steps have been added to the appropriate journey integration test(s)
Test suite has been run in full locally and is passing
Branch has been rebased onto main and run locally, with everything working as expected (both for your new feature
and any related functionality)
TODO comments referencing this JIRA ticket have been searched for and removed - if a future PR will address them,
mention that here
QA instructions have been added to the ticket (particularly if this is the last PR required to complete the ticket)
This feature is behind a feature flag. I've checked that there will be no change in function if the feature flag is disabled

Travis-Softwire

One Q - if we've tested this works fine then LGTM. If it doesn't then we might want to recombine the CYA pages rather than trying to figure out a (probably brittle) way of supporting two at once.

reviewed before major refactor

…ndlord-cya-change-links

samyou-softwire

happy with the tasks now, but I think there's some functional changes on the CYA page with subtasks. I think several route segments pointing to the same CYA journey is likely an antipattern (unless they truly are the 'same' step like the various country charity num questions)

samyou-softwire · 2026-07-31T14:06:29Z

+import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.stepConfig.OrgIsRegisteredCharityStep
+
+interface OrgCharityState : JourneyState {
+    val orgCharityStep: OrgIsRegisteredCharityStep


this name is out of date

samyou-softwire · 2026-07-31T14:06:54Z

+import uk.gov.communities.prsdb.webapp.journeys.landlordRegistration.tasks.OrgGovBodyTask
+
+interface OrgCompaniesHouseState : JourneyState {
+    val orgCompaniesHouseStep: OrgIsRegisteredCompanyStep


samyou-softwire · 2026-07-31T14:15:46Z

+                    }
+
+                    OrgAddressStep.ROUTE_SEGMENT -> {
+                        checkAnswerStep(journey.orgLandlordRegistrationTask.orgAddressStep, OrgAddressStep.ROUTE_SEGMENT)


maybe since this will need to be updated in PDJB-1133 we should pop a TODO here too

samyou-softwire · 2026-07-31T14:38:47Z

+                    OrgIsRegisteredCharityStep.ROUTE_SEGMENT,
+                    OrgCharityRegisteredWithStep.ROUTE_SEGMENT,
+                    OrgCharityNumberEnglandAndWalesStep.ROUTE_SEGMENT,
+                    OrgCharityNumberNorthernIrelandStep.ROUTE_SEGMENT,
+                    OrgCharityNumberScotlandStep.ROUTE_SEGMENT,


should these all be in the same branch? if I click change charity number then I shouldn't be sent into the whole charity task

samyou-softwire · 2026-07-31T14:47:03Z

+                    OrgIsRegisteredCompanyStep.ROUTE_SEGMENT,
+                    OrgCompanyNumberStep.ROUTE_SEGMENT,


I think same here; we could add the company number step CYA page now

samyou-softwire · 2026-07-31T14:48:38Z

                }
            }
+
+        private fun destinationForSelectedLandlordType(


is there a precedent for a method like this? worth a comment explaining what this mechanism is for?

samyou-softwire · 2026-07-31T14:52:07Z

    contactAddress: Contact address
    localCouncil: Local Council
+    landlordType: Landlord type
 orgCheckAnswers:


I wonder if this layout is still useful; implies orgCheckAnswers is still a separate page, though this may be fine as they are quite separate. what do you think?

Travis-Softwire

I think there's some more changes required here but happy for this to merge once the functional ones are addressed - the refactoring suggestions can go in a separate PR as this is getting quite hard to review already!

Travis-Softwire · 2026-07-31T14:47:30Z

-            (org.governingBodyMembersMap ?: emptyMap())
-                .values
-                .toList()
+            securityContextService.refreshContext()


Minor, but would probably use an else instead of an early return here and put the refresh context call at the end?

Travis-Softwire · 2026-07-31T14:58:21Z

                }
            }
+
+        private fun destinationForSelectedLandlordType(


I think this would be clearer as a new internal step that computes the outcome of the check as it's mode? That lets us keep the DSL nice and clean

Travis-Softwire · 2026-07-31T15:04:19Z

-                parents { journey.orgLandlordRegistrationTask.isComplete() }
+                parents {
+                    OrParents(
+                        journey.individualLandlordLocationTask.isComplete(),


I think this needs to be a bit more sophisticated - I think we need to check the landlord type is individual + individual LL location task is complete, or that the landlord type is org + org LL task is complete. Otherwise you could get all the way to CYA as an individual, back out all the way to LL type, change your answer, and then navigate straight back to CYA which would be reachable but none of the relevant fields would have been completed -> null assertion exceptions I think

Travis-Softwire · 2026-07-31T15:07:55Z

+                    }
+                }
+            }
+            step(journey.orgGovBodyWhoToProvideStep) {


Didn't we previously override the back destination here so that if you're 'adding another' you can back out to the member list instead of 'hasAnyGovBodyMemberStep'?

This behaviour is now back since re-refactoring the tasks :)

Travis-Softwire · 2026-07-31T15:09:02Z

+                nextStep { mode ->
+                    when (mode) {
+                        AnyMembers.SOME_MEMBERS -> journey.orgGovBodyMemberListStep
+                        AnyMembers.NO_MEMBERS -> journey.orgGovBodyWhoToProvideStep


I don't think this is right is it? Removing the last member should take them back to hasAnyGovBodyMembersStep

yes, you're right that it should do that in the initial journey, I routed it like this so the CYA would not take you back outside this inner journey to the page that you can click the links of, but maybe it's simpler to route it normally and fix it by just getting rid of the remove link on the CYA change journey as discussed in handover. I forgot it would break the regular journey

In fact, I think this was just confusing with the task structure we had before - the hasAnyGovBodyMembersStep is just internal for the looping, if we have no members that's for the initial run through so it should always go to the who to provide step, otherwise it goes to the member list, just like in joint landlords, so fine as is.

Travis-Softwire · 2026-07-31T15:16:03Z

+interface OrgCompaniesHouseState : JourneyState {
+    val orgCompaniesHouseStep: OrgIsRegisteredCompanyStep
+    val orgCompanyNumberStep: OrgCompanyNumberStep
+    val orgGovBodyTask: OrgGovBodyTask


It feels odd for this to be a child of the CH task - I don't think it needs to be?

haha yes me and Sammy had a big discussion about this in person which Sammy summarised in this comment so I ended up making it a child

Hmm, yeah I'm not sure I agree with that conclusion - it feels unintuitive to access gov body fields by going via journey.orgCompaniesHouseTask.orgGovBodyTask.<>. They feel like mutually exclusive siblings to me rather than parent/child. I'd rather it be clear with a bit of repetition in the update journey than confusing but require less duplication

Cool, I'll move it back out :) The other one I moved to be a subchild at that time was the lead trustee as a subchild of org type - should I change that back too?

Ah, yes please!

TomHanmer29 · 2026-07-31T16:35:19Z

Will give this one last check over functionality wise, and if there are no problems I'll merge - I'll leave all the other refactor comments (those I've not replied to or reacted to) to another PR as this is getting pretty large

TomHanmer29 marked this pull request as ready for review July 21, 2026 16:25

TomHanmer29 force-pushed the feat/PDJB-1168-org-landlord-cya-change-links branch from ede3c8f to ae21b59 Compare July 23, 2026 14:58

Travis-Softwire previously approved these changes Jul 23, 2026

View reviewed changes

Comment thread ...otlin/uk/gov/communities/prsdb/webapp/journeys/shared/states/CheckYourAnswersJourneyState.kt Outdated

danielledias-MT previously approved these changes Jul 24, 2026

View reviewed changes

TomHanmer29 force-pushed the feat/PDJB-1168-org-landlord-cya-change-links branch 4 times, most recently from e1b3096 to 68cbd95 Compare July 24, 2026 10:36

samyou-softwire reviewed Jul 24, 2026

View reviewed changes

Comment thread src/test/kotlin/uk/gov/communities/prsdb/webapp/integration/LandlordRegistrationJourneyTests.kt

Base automatically changed from feat/PDJB-1168-org-landlord-cya-page to main July 24, 2026 11:17

TomHanmer29 marked this pull request as draft July 24, 2026 11:18

TomHanmer29 force-pushed the feat/PDJB-1168-org-landlord-cya-change-links branch from 68cbd95 to ff69328 Compare July 24, 2026 16:11

TomHanmer29 added 5 commits July 28, 2026 17:19

PDJB-1168: add change links

1a1497d

PDJB-1168: recombine cyas

d290cbd

PDJB-1168: fix org / individual change link

1085831

PDJB-1168: fix companys house CYA

9c80e75

PDJB-1168: fix gov body member change links

aa2d861

TomHanmer29 force-pushed the feat/PDJB-1168-org-landlord-cya-change-links branch from ff69328 to 1866b39 Compare July 28, 2026 16:34

TomHanmer29 added 3 commits July 29, 2026 09:33

PDJB-1168: rebase fixes

4aa19da

PDJB-1168: extract out nested task and update TODOs

ecba207

PDJB-1168: WIP individual landlord change journey

b60759a

TomHanmer29 force-pushed the feat/PDJB-1168-org-landlord-cya-change-links branch from 1866b39 to b60759a Compare July 29, 2026 10:14

TomHanmer29 added 2 commits July 30, 2026 10:21

PDJB-1168: flag off cya change properly

3c2b661

PDJB-1168: change link tests

b3b3bc1

TomHanmer29 marked this pull request as ready for review July 30, 2026 13:29

PDJB-1168: add TODOs for change pages

c287e3b

samyou-softwire reviewed Jul 30, 2026

View reviewed changes

Comment thread ...es/prsdb/webapp/journeys/landlordRegistration/states/LandlordRegistrationOrgLandlordState.kt

Merge remote-tracking branch 'origin/main' into feat/PDJB-1168-org-la…

91a65fb

…ndlord-cya-change-links

TomHanmer29 added 3 commits July 31, 2026 14:20

PDJB-1168: restructure tasks to make them better for update journies

4c9c606

Merge remote-tracking branch 'origin/main' into feat/PDJB-1168-org-la…

8890619

…ndlord-cya-change-links

PDJB-1168: fix tests

547989b

samyou-softwire reviewed Jul 31, 2026

View reviewed changes

Travis-Softwire approved these changes Jul 31, 2026

View reviewed changes

TomHanmer29 added 4 commits July 31, 2026 17:14

PDJB-1168: strengthen cya conditions

bea079e

PDJB-1168: revert task restructure

58f50bf

PDJB-1168: naming fixes

bdf0a1a

PDJB-1168: improve change link granularity

6874873

		OrgIsRegisteredCompanyStep.ROUTE_SEGMENT,
		OrgCompanyNumberStep.ROUTE_SEGMENT,

Uh oh!

Conversation

TomHanmer29 commented Jul 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Ticket number

Goal of change

Description of main change(s)

Checklist

Uh oh!

Travis-Softwire left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

samyou-softwire left a comment

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!

Travis-Softwire left a comment

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!

TomHanmer29 commented Jul 31, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

TomHanmer29 commented Jul 21, 2026 •

edited

Loading