Skip to content

HDPI-5188 - Warrant of Restitution update data model#1554

Open
guygrewal77 wants to merge 90 commits intomasterfrom
HDPI-5188-warrant-of-rest-update-data-model
Open

HDPI-5188 - Warrant of Restitution update data model#1554
guygrewal77 wants to merge 90 commits intomasterfrom
HDPI-5188-warrant-of-rest-update-data-model

Conversation

@guygrewal77
Copy link
Copy Markdown
Contributor

@guygrewal77 guygrewal77 commented Mar 23, 2026

Jira link

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

Change description

This PR carries out some schema changes to introduce the columns for the warrant of restitution domain model. The corresponding entity classes are implemented and also the functionality to persist the data for the pages implemented so far. Alongside the unit tests have been updated for the changes and refactoring work carried out to use Risk Profile and Document persistence.

Testing done

XUI testing to perform Warrant of Possession and Warrant of Restitution journeys to confirm the data is pre-populated from Warrant into Warrant of Restitution pages like Risk Profile, Vulnerable People.

Checked DB to confirm the data is persisted as expected in the various tables except Statement of Truth which isn't implemented yet. Document persistence was tested on PR env. There currently isn't the description column in the Document table in the DB.

Security Vulnerability Assessment

CVE Suppression: Are there any CVEs present in the codebase (either newly introduced or pre-existing) that are being intentionally suppressed or ignored by this commit?

  • Yes
  • No

Checklist

  • commit messages are meaningful and follow good commit message guidelines
  • README and other documentation has been updated / added (if needed)
  • tests have been updated / new tests has been added (if needed)
  • Does this PR introduce a breaking change

tvr-solirius and others added 30 commits February 17, 2026 18:16
…nforcement-Writ-Details

# Conflicts:
#	src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/warrant/EnforcementOrderService.java
#	src/main/resources/testing-support/Create-Case-Make-A-Claim-Basic-Case.json
#	src/main/resources/testing-support/Create-Enforcement-Writ-Basic-Case.json
…rcementWritEntity, database schema, and associated tests.
…try-with-resources for safe InputStream handling.
…itEntity` and `WritRepository` respectively. Update references across services and tests for consistency.
…ntOrderService` to delegate specific processing logic for Writ and Warrant to their respective strategies. Update services, mappers, and tests accordingly.
…nforcement-Writ-Details

# Conflicts:
#	src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/warrant/EnforcementOrderService.java
#	src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/EnforcementOrderServiceTest.java
…he codebase, update related methods, mappers, tests, and test resources for consistency and readability.
… imports across services, strategies, and tests. Annotate `saveAndClearDraftData` with `@Transactional`.
…pdate related file paths and constants for consistency.
…le paths to align with renamed `testcasegeneration` directory.
…y across enforcement order services. Streamline null checks in mappers and update associated tests.
…nforcement-Writ-Details

# Conflicts:
#	src/main/java/uk/gov/hmcts/reform/pcs/ccd/repository/enforcetheorder/EnforcementWarrantRepository.java
#	src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/EnforcementOrderService.java
#	src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/mapper/EnforcementWarrantMapper.java
#	src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/EnforcementOrderServiceTest.java
#	src/test/java/uk/gov/hmcts/reform/pcs/testingsupport/EnforcementDMTest.java
# Conflicts:
#	src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/EnforcementOrderService.java
#	src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/enforcetheorder/EnforcementOrderServiceTest.java
Update of tests to accomodate the change.
@guygrewal77 guygrewal77 added enable_e2e_test Currently used to test the common e2e test call enable_e2e_enforcement_test labels Mar 27, 2026
applyRawWarrantRestDetails(enforcementOrder.getRawWarrantRestDetails(), riskProfileEntity);
}
default -> {
} // Not needed for other enforcement types
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirm Eviction will use this I suspect.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants