Hdpi 4312 confirm eviction summary by tvr-hmcts · Pull Request #1550 · hmcts/pcs-api

tvr-hmcts · 2026-03-20T17:06:47Z

https://tools.hmcts.net/jira/browse/HDPI-4312

This PR introduces the "Confirm Eviction" journey into the Possession Claim Service (PCS), allowing claimants to confirm eviction details once a bailiff date has been assigned.

Introduced to handle logic for displaying eviction requirements. EnforcementOrderMediator
Dynamically generates summary markup and determines if the "Confirm Eviction" journey should be visible based on the presence of a in the enforcement record. bailiffDate
Added a new confirmEviction event accessible to . PCS_SOLICITOR
Updated CaseType to include a new "Summary" tab field () and a hidden field for journey visibility control (). confirmEvictionSummaryMarkup``showConfirmEvictionJourney
Implemented new UI pages: and . ConfirmEvictionDetailsPage``EvictionDatePage
Added (Timestamp) to ( table) via a new flyway migration (V070). bailiffDate``EnforcementOrderEntity``enf_case
Updated domain model with necessary fields for eviction summaries. PCSCase
Added to . findByClaimId``EnforcementOrderRepository
Comprehensive unit tests for , PCSCaseView integration, and page configuration. EnforcementOrderMediator
Updated test case generation JSON files to support the new enforcement fields.

…config

… retreive an enforcement

…312-confirm-eviction-summary

…viction-summary' into HDPI-4312-confirm-eviction-summary

…o `ConfirmEviction`, reorganise page configuration classes, update the event ID and imports, and adjust `PCSCaseView` to handle optional enforcement orders and bailiff dates with new date formatting helpers. Adjust repository import and update the test suite accordingly.

…312-confirm-eviction-summary

…he old `EvictionDatePage` and `EnforcementOrderRepository` from `PCSCaseView`. Update page configuration tests, helper imports, and add comprehensive tests for the new `EnforcementOrderMediator`. This refactor centralises date formatting, bailiff‑date checks, and UI markup generation.

…nd logger, make PageConfigurerHelper final with a private constructor, remove debug logs from the mediator, and hide the showConfirmEvictionJourney field in CaseType.

github-actions · 2026-03-20T17:10:29Z

CCD diff summary

👉 Full report: https://github.com/hmcts/pcs-api/actions/runs/23738235310?check_suite_focus=true

CaseField.json

RegularExpression	Max	Searchable	Min	FieldTypeParameter	HintText	Label	ID	FieldType
+	+	+	+	+	+	+<p class="govuk-body"> The bailiff has arranged a date for the eviction and they need you to confirm if you are available. </p> <p class="govuk-body"> They will also ask you to confirm if the person being evicted poses any risk. </p> <p class="govuk-body"> The bailiff needs this information to carry out the eviction safely. If you do not provide it, they may not be able to complete the eviction. </p> <p class="govuk-body govuk-!-font-weight-bold govuk-!-font-size-24">What you’ll need </p> <p class="govuk-body govuk-!-margin-bottom-0">You’ll need to know:</p> <ul class="govuk-list govuk-list--bullet"> <li class="govuk-!-font-size-19">who will attend the eviction (you, or someone else)</li> <li class="govuk-!-font-size-19">if you (or they) can attend the eviction on the date suggested by the bailiff</li> </ul> <p class="govuk-body govuk-!-margin-bottom-0">We will also ask you to:</p> <ul class="govuk-list govuk-list--bullet"> <li class="govuk-!-font-size-19">describe the person who will be evicted</li> <li class="govuk-!-font-size-19">tell us how to access the property</li> <li class="govuk-!-font-size-19">book a locksmith (this is to make sure that the person being evicted cannot return to the property)</li> </ul> <p class="govuk-body"> Once you have confirmed the eviction date, we’ll send you an email reminding you to book a locksmith. </p>	+confirmEvictionDetails-content	+Label
+	+	+	+	+	+	+---	+confirmEvictionDetails-line-separator	+Label
+	+	+N	+	+	+	+	+confirmEvictionSummaryMarkup	+Text
+	+	+	+	+	+	+${confirmEvictionSummaryMarkup}	+confirmEvictionSummaryMarkupLabel	+Label
+	+	+	+	+	+	+---	+evictionDate-line-separator	+Label
+	+	+N	+	+	+	+	+showConfirmEvictionJourney	+YesOrNo

AuthorisationCaseEvent/AuthorisationCaseEvent.json

UserRole	CaseEventID	CRUD
+caseworker-pcs-solicitor	+confirmEviction	+CRUD

AuthorisationCaseField/caseworker-pcs-solicitor.json

UserRole	CaseFieldID	CRUD
+caseworker-pcs-solicitor	+confirmEvictionDetails-content	+CR
+caseworker-pcs-solicitor	+confirmEvictionDetails-line-separator	+CR
+caseworker-pcs-solicitor	+confirmEvictionSummaryMarkup	+R
+caseworker-pcs-solicitor	+confirmEvictionSummaryMarkupLabel	+R
+caseworker-pcs-solicitor	+evictionDate-line-separator	+CR
+caseworker-pcs-solicitor	+showConfirmEvictionJourney	+CRU

AuthorisationCaseField/DEFENDANT.json

UserRole	CaseFieldID	CRUD
+[DEFENDANT]	+confirmEvictionSummaryMarkup	+R
+[DEFENDANT]	+confirmEvictionSummaryMarkupLabel	+R

CaseEvent/confirmEviction.json

Description	EndButtonLabel	ID	Name	PostConditionState	PreConditionState(s)	Publish	ShowEventNotes	ShowSummary
+Confirm the eviction details	+Save and continue	+confirmEviction	+Confirm the eviction details	+*	+*	+N	+N	+Y

CaseEventToFields/confirmEviction.json

CaseEventID

CaseFieldID

DisplayContext

PageColumnNumber

PageDisplayOrder

PageFieldDisplayOrder

PageID

PageLabel

+confirmEviction

+confirmEvictionDetails-content

+READONLY

+1

+1

+2

+confirmEvictionDetails

+Confirm the eviction details

+confirmEviction

+confirmEvictionDetails-line-separator

+READONLY

+1

+1

+1

+confirmEvictionDetails

+Confirm the eviction details

+confirmEviction

+evictionDate-line-separator

+READONLY

+1

+2

+1

+evictionDate

+The eviction date

CaseTypeTab/2_summary.json

UserRole	TabShowCondition	TabLabel	TabID	TabFieldDisplayOrder	TabDisplayOrder	Channel	CaseFieldID	FieldShowCondition
+	+	+Summary	+summary	+2	+2	+CaseWorker	+confirmEvictionSummaryMarkup	+[STATE]="NEVER_SHOW"
+	+	+Summary	+summary	+1	+2	+CaseWorker	+confirmEvictionSummaryMarkupLabel
	-[STATE]!="AWAITING_SUBMISSION_TO_HMCTS" +	Summary	summary	-1 +3	2	CaseWorker	propertyAddress

src/main/java/uk/gov/hmcts/reform/pcs/ccd/entity/enforcetheorder/EnforcementOrderEntity.java

guygrewal77 · 2026-03-25T15:52:43Z

src/test/java/uk/gov/hmcts/reform/pcs/ccd/page/enforcetheorder/PageConfigurerHelper.java

        counter.incrementAndGet();
    }

+    private PageConfigurerHelper() {


Minor - could use Lombok declaration for this

guygrewal77 · 2026-03-25T15:58:18Z

src/main/java/uk/gov/hmcts/reform/pcs/ccd/EnforcementOrderMediator.java

+        pcsCase.setShowConfirmEvictionJourney(YesOrNo.YES);
+        pcsCase.setConfirmEvictionSummaryMarkup(String.format(
+            """
+            <h2 class="govuk-heading-m govuk-!-padding-top-1">Confirm the eviction date</h2>


Minor - could the markup texts be externalised in constants ?

guygrewal77 · 2026-03-25T16:00:27Z

src/main/java/uk/gov/hmcts/reform/pcs/ccd/EnforcementOrderMediator.java

+        return instant.atZone(ZoneId.of("UTC")).format(outputFormatter);
+    }
+
+    private String minus72HoursFormatted(Instant instant) {


Could the time amount be parameterised ?

If you mean the 72 hours element then it was within an earlier implementation, however 72 is the business rule here and it would always be 72 for this point.

I guess if this is useful in the future for other business cases then it could be refactored at that point so I went with being explicit to the business requirement.

I still think this method could be made more versatile instead of hardcoded.

Also maybe this could be moved to a Util class (static ?)

I will gut it ... make a reusable version and keep this method here as it enforces the business requirement with the method name.

This is changed now.

src/main/java/uk/gov/hmcts/reform/pcs/ccd/PCSCaseView.java

src/main/resources/db/migration/V073__add_bailiff_date_enf_case.sql

…312-confirm-eviction-summary

…viction-summary

…312-confirm-eviction-summary

guygrewal77 · 2026-03-27T11:31:42Z

src/main/java/uk/gov/hmcts/reform/pcs/ccd/EnforcementOrderMediator.java

+            .orElseThrow(() -> new CaseNotFoundException(caseReference));
+        List<ClaimEntity> claims = pcsCaseEntity.getClaims();
+        if (claims != null && !claims.isEmpty()) {
+            return enforcementOrderRepository.findByClaimId(claims.getFirst().getId());


Do we know which type of enforcement case should be retrieved as there could be different ones linked to the same enf_case ?

Yer this is a pain point and had me stuck. Have had conversations with Nafees on this a few times.

It may just link to the latest ... which at the time ... I did not have HDPI-4220 which has adds the "created" field. However, again, the latest of which?

It is possible we may need the enforcement type to be applied to the enf_case table for this type of scenario but all of this is unknown at the moment.

You can find the enf_case associated with the warrant of possession if you use enforcementOrderService. retrieveEnforcementOrder.

The Confirm Eviction may not have come from that though.

guygrewal77 · 2026-03-27T11:54:46Z

src/main/java/uk/gov/hmcts/reform/pcs/ccd/EnforcementOrderMediator.java

+    }
+
+    Optional<EnforcementOrderEntity> getEnforcementOrder(long caseReference) {
+        PcsCaseEntity pcsCaseEntity = pcsCaseRepository.findByCaseReference(caseReference)


Could use EnforcementOrderService.retrieveEnforcementOrder() to retrieve by case_reference and enforcement type as the eviction would follow from Warrant of Possession.

As with the other comment this is where the sticking point is at the moment. This is coded up to the current 'knowledge' and there are changes on route.

I can not use that method suggested as it requires the SelectEnforcementType. If I overload the method within there ... then I am doing the same as what I am doing here in the EnforcementOrderMediator. The EnforcementOrderMediator purpose is from this point in the journey.

The sticking point is we do not know which the Confirm Eviction is against.

There can be multiple Eviction Orders against an Claim and from that multiple types of Evictions. In reality it will probably not be many but currently there is no link from the Confirm to the specific eviction the confirm is against.

With the de-prioritising of Enforcement and the unknown elements this is as close as we can get at the moment.

guygrewal77 · 2026-03-27T11:56:28Z

.../java/uk/gov/hmcts/reform/pcs/ccd/repository/enforcetheorder/EnforcementOrderRepository.java


 public interface EnforcementOrderRepository extends JpaRepository<EnforcementOrderEntity, UUID> {
-
+    Optional<EnforcementOrderEntity> findByClaimId(UUID claimId);


Won't need this if EnforcementOrderService is used to retrieve the Enforcement order.

Ah actually it is used earlier in the process.

…Util and summary markup to MarkupContent constants. Remove inline formatter logic and private constructor in PageConfigurerHelper. Update mediator to use new utilities and constants.

…312-confirm-eviction-summary

Aqib and others added 13 commits March 10, 2026 14:21

initial commit of Summary page changes

f85c09a

Added Summary tab markup. Also Changed confirm eviction details page …

5e5a643

…config

I've added date formatters. Also have a current issue where i cannot…

2051b40

… retreive an enforcement

Merge remote-tracking branch 'refs/remotes/origin/master' into HDPI-4…

f6229ee

…312-confirm-eviction-summary

[#4312] Update flyway version numbering.

464d212

We can now toggle on the summary page

102f9d6

Merge remote-tracking branch 'refs/remotes/origin/HDPI-4312-confirm-e…

bcd77ad

…viction-summary' into HDPI-4312-confirm-eviction-summary

Added logs to see if we get pcs case objective for show condition

dd08a0f

Reverting local change

5eb187a

Merge remote-tracking branch 'refs/remotes/origin/master' into HDPI-4…

25648ea

…312-confirm-eviction-summary

Cleanup ConfirmEviction event and helpers: drop unused start method a…

3e6165b

…nd logger, make PageConfigurerHelper final with a private constructor, remove debug logs from the mediator, and hide the showConfirmEvictionJourney field in CaseType.

tvr-hmcts requested review from a team, adusumillipraveen, aqibh25, guygrewal77, libanAbdirahman1, m014389b and scottstewart-sl March 20, 2026 17:06

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

hmcts-jenkins-j-to-z bot added ns:pcs prd:pcs rel:pcs-api-pr-1550 labels Mar 20, 2026

srinijg added the pr-values:ccd label Mar 24, 2026

srinijg added 2 commits March 24, 2026 09:37

Merge branch 'master' into HDPI-4312-confirm-eviction-summary

afbd098

Merge branch 'master' into HDPI-4312-confirm-eviction-summary

e294cb0

hmcts-jenkins-j-to-z bot deployed to preview March 24, 2026 10:30 View deployment

guygrewal77 reviewed Mar 25, 2026

View reviewed changes

src/main/java/uk/gov/hmcts/reform/pcs/ccd/entity/enforcetheorder/EnforcementOrderEntity.java Show resolved Hide resolved

guygrewal77 reviewed Mar 25, 2026

View reviewed changes

src/main/java/uk/gov/hmcts/reform/pcs/ccd/PCSCaseView.java Outdated Show resolved Hide resolved

guygrewal77 reviewed Mar 25, 2026

View reviewed changes

src/main/resources/db/migration/V073__add_bailiff_date_enf_case.sql Show resolved Hide resolved

tvr-solirius added 2 commits March 26, 2026 10:10

Merge remote-tracking branch 'refs/remotes/origin/master' into HDPI-4…

2db4061

…312-confirm-eviction-summary

Flyway version update.

a5e7fb6

hmcts-jenkins-j-to-z bot deployed to preview March 26, 2026 10:24 View deployment

Change of version in the flyway to the correct script this time :)

8595499

hmcts-jenkins-j-to-z bot deployed to preview March 26, 2026 10:41 View deployment

tvr-solirius added 2 commits March 26, 2026 12:08

Merge remote-tracking branch 'origin/master' into HDPI-4312-confirm-e…

3bcc795

…viction-summary

flyway version update.

d68f6e1

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

hmcts-jenkins-j-to-z bot deployed to preview March 26, 2026 13:44 View deployment

tvr-hmcts added enable_keep_helm enable_e2e_test Currently used to test the common e2e test call enable_e2e_enforcement_test labels Mar 26, 2026

hmcts-jenkins-j-to-z bot deployed to preview March 26, 2026 13:54 View deployment

Merge remote-tracking branch 'refs/remotes/origin/master' into HDPI-4…

1d6f98f

…312-confirm-eviction-summary

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

guygrewal77 reviewed Mar 27, 2026

View reviewed changes

tvr-solirius added 3 commits March 27, 2026 16:34

Refactor eviction summary formatting: extract date formatting to Date…

21df5f8

…Util and summary markup to MarkupContent constants. Remove inline formatter logic and private constructor in PageConfigurerHelper. Update mediator to use new utilities and constants.

Merge remote-tracking branch 'refs/remotes/origin/master' into HDPI-4…

cd9b42c

…312-confirm-eviction-summary

Flyway version update and fix of test

4541fd4

hmcts-jenkins-j-to-z bot deployed to preview March 27, 2026 17:16 View deployment

Merge remote-tracking branch 'refs/remotes/origin/master' into HDPI-4…

1b81801

…312-confirm-eviction-summary

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


		public interface EnforcementOrderRepository extends JpaRepository<EnforcementOrderEntity, UUID> {

		Optional<EnforcementOrderEntity> findByClaimId(UUID claimId);

Conversation

tvr-hmcts commented Mar 20, 2026

Uh oh!

github-actions bot commented Mar 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CCD diff summary

CaseField.json

AuthorisationCaseEvent/AuthorisationCaseEvent.json

AuthorisationCaseField/caseworker-pcs-solicitor.json

AuthorisationCaseField/DEFENDANT.json

CaseEvent/confirmEviction.json

CaseEventToFields/confirmEviction.json

CaseTypeTab/2_summary.json

Uh oh!

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!

Uh oh!

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!

tvr-hmcts Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

guygrewal77 Mar 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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

github-actions bot commented Mar 20, 2026 •

edited

Loading

tvr-hmcts Mar 30, 2026 •

edited

Loading

guygrewal77 Mar 27, 2026 •

edited

Loading