Open
Conversation
…raft save and final submit
…nces with draft save and final submit tests
…amount and frequency
CCD diff summary👉 Full report: https://github.com/hmcts/pcs-api/actions/runs/23658646728?check_suite_focus=true ComplexTypes/1_HouseholdCircumstances.json
FixedLists/IncomeFrequency.json
|
Contributor
Plan Result (aat) |
arun-hmcts
requested review from
nicole-samuels,
saurabhvalsangkar-hmcts and
toby-plunkett
toby-plunkett
approved these changes
Mar 26, 2026
src/main/resources/db/migration/V071__add_regular_income_fields.sql
Outdated
Show resolved
Hide resolved
...n/java/uk/gov/hmcts/reform/pcs/ccd/domain/respondpossessionclaim/HouseholdCircumstances.java
Show resolved
Hide resolved
| private BigDecimal pensionAmount; | ||
|
|
||
| @CCD | ||
| private String pensionFrequency; |
Contributor
There was a problem hiding this comment.
I think these frequency fields should be enum types if possible, (here and in the entity).
| ADD COLUMN universal_credit_amount DECIMAL(18,2); | ||
|
|
||
| ALTER TABLE household_circumstances | ||
| ADD COLUMN universal_credit_frequency VARCHAR(60); |
Contributor
There was a problem hiding this comment.
Minor - did these column sizes come from the data model? If I'm reading the ticket correctly these would just be "WEEK" or "MONTH" so 60 characters seems a bit much.
...n/java/uk/gov/hmcts/reform/pcs/ccd/domain/respondpossessionclaim/HouseholdCircumstances.java
Outdated
Show resolved
Hide resolved
… migration SQL, and reduce VARCHAR sizes
| /** | ||
| * Enum representing the frequency of income and benefit payments. | ||
| */ | ||
| public enum IncomeFrequency implements HasLabel { |
Contributor
There was a problem hiding this comment.
maybe rename the enum to just 'Frequency' or something more generic? so this enum can be used for both the regular income and regular expenses.
scottstewart-sl
approved these changes
Mar 26, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Jira link
https://tools.hmcts.net/jira/browse/HDPI-3764
Change description
Adds regular income tracking fields
(income from jobs, pension, universal credit, other benefits, money from
elsewhere) to household circumstances for defendant possession claim
responses, with amount and frequency details for each income source.
Includes database migrations, domain/entity models, and comprehensive test
coverage for both draft save and final submit workflows, following proper
naming conventions and money field handling.
Testing done
Locally Tested
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?
Checklist