Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
076dd17
HDPI-5191:Created migration scripts
libanAbdirahman1 Mar 9, 2026
b7d3ab2
HDPI-5191:WIP
libanAbdirahman1 Mar 9, 2026
18a1e85
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 9, 2026
9ed80fc
HDPI-5191:Added relevant services,updated entities & tests
libanAbdirahman1 Mar 9, 2026
80c070e
HDPI-5191:Adding tests for new services
libanAbdirahman1 Mar 10, 2026
005607b
HDPI-5191:Removing not null constraint on new columns
libanAbdirahman1 Mar 10, 2026
657663e
HDPI-5191:Updating draft save logic & updating tests
libanAbdirahman1 Mar 10, 2026
09682e3
HDPI-5191:Hardcoding statement of truth entity values for testing
libanAbdirahman1 Mar 10, 2026
4666ef5
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 10, 2026
9a5d956
HDPI-5191:Removing not null constraints
libanAbdirahman1 Mar 10, 2026
9bc64a7
Adding extra columns to defendant response table as per data model
libanAbdirahman1 Mar 11, 2026
49bf45f
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 11, 2026
d693e81
HDPI-5191:Fixing migration script
libanAbdirahman1 Mar 11, 2026
c6c7800
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 11, 2026
ccb3ae9
HDPI-5191:minor refactoring & Added party attribute assertation table
libanAbdirahman1 Mar 12, 2026
7f60a14
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 12, 2026
1f3c929
HDPI-5191:Refactored submit event handler validation
libanAbdirahman1 Mar 12, 2026
f227c03
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 12, 2026
920697a
HDPI-5191:Renamed migration script
libanAbdirahman1 Mar 12, 2026
b5c4c4d
HDPI-5191:Updated party attribute enums
libanAbdirahman1 Mar 12, 2026
7711c3e
HDPI-5191:Updating migration as per data model
libanAbdirahman1 Mar 12, 2026
4aa5603
add repaymentPlanAgreed and repaymentAgreedDetails
AmandaRichards Mar 12, 2026
6f711b4
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 12, 2026
c3fa1d2
HDPI-5191:Updating tests post merge
libanAbdirahman1 Mar 12, 2026
76cf58b
merge master
AmandaRichards Mar 12, 2026
de4438c
fix tenancy test merge
AmandaRichards Mar 13, 2026
65f37ad
HDPI-5191:Actioning review comments
libanAbdirahman1 Mar 13, 2026
a02ee82
HDPI-5191:Actioning more review comments
libanAbdirahman1 Mar 13, 2026
d12f6d7
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 13, 2026
e21172e
merge master
AmandaRichards Mar 16, 2026
01c8be5
HDPI-5191:Moved draft domain classes inside defendant response domain
libanAbdirahman1 Mar 16, 2026
662a4ab
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 16, 2026
7f8a672
Merge remote-tracking branch 'origin/HDPI-5191-Persist-respond-to-cla…
AmandaRichards Mar 16, 2026
26b58cf
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 16, 2026
11842c7
HDPI-5191:Fixing build post merge
libanAbdirahman1 Mar 16, 2026
f19941b
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 17, 2026
a7b0aa0
Merge remote-tracking branch 'origin' into HDPI-5191-Persist-respond-…
libanAbdirahman1 Mar 17, 2026
1b185e3
merge master HDPI-5191
AmandaRichards Mar 17, 2026
46b1275
HDPI-5191:Actioning minor review comments
libanAbdirahman1 Mar 18, 2026
e9ef55c
HDPI-5191:Renaming & dropping columns as per data model
libanAbdirahman1 Mar 18, 2026
7bd3341
Merge remote-tracking branch 'origin/HDPI-5191-Persist-respond-to-cla…
AmandaRichards Mar 19, 2026
61ac4b9
update tests
AmandaRichards Mar 19, 2026
94ba06d
merge master
AmandaRichards Mar 19, 2026
65a2318
merge master
AmandaRichards Mar 19, 2026
d582e6c
merge master
AmandaRichards Mar 20, 2026
ffd2c0a
add searchable = false
AmandaRichards Mar 20, 2026
140ef2d
Merge branch 'master' into HDPI-3542-repayment
PadmaDeenadayalan Mar 25, 2026
6b02342
Merge branch 'master' into HDPI-3542-repayment
PadmaDeenadayalan Mar 25, 2026
3d2ca0d
Merge branch 'master' into HDPI-3542-repayment
PadmaDeenadayalan Mar 25, 2026
ba05ba9
Merge branch 'master' into HDPI-3542-repayment
PadmaDeenadayalan Mar 26, 2026
0114cfe
Merge branch 'master' into HDPI-3542-repayment
PadmaDeenadayalan Mar 26, 2026
72bec70
Merge branch 'master' into HDPI-3542-repayment
PadmaDeenadayalan Mar 26, 2026
2b3c363
Merge branch 'master' into HDPI-3542-repayment
PadmaDeenadayalan Mar 27, 2026
9db2c3a
Merge branch 'master' into HDPI-3542-repayment
AmandaRichards Mar 30, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import lombok.NoArgsConstructor;
import uk.gov.hmcts.ccd.sdk.api.CCD;
import uk.gov.hmcts.ccd.sdk.type.YesOrNo;
import uk.gov.hmcts.reform.pcs.ccd.domain.YesNoNotSure;

@Builder
@Data
Expand All @@ -16,4 +17,10 @@ public class PaymentAgreement {
@CCD
private YesOrNo anyPaymentsMade;

@CCD(searchable = false)
private YesNoNotSure repaymentPlanAgreed;

@CCD
private String repaymentAgreedDetails;

}
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ public PaymentAgreementEntity createPaymentAgreementEntity(PaymentAgreement paym

PaymentAgreementEntity paymentAgreementEntity = PaymentAgreementEntity.builder()
.anyPaymentsMade(paymentAgreement.getAnyPaymentsMade())
.repaymentPlanAgreed(paymentAgreement.getRepaymentPlanAgreed())
.repaymentAgreedDetails(paymentAgreement.getRepaymentAgreedDetails())
.build();

return paymentAgreementEntity;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.junit.jupiter.params.provider.MethodSource;
import org.mockito.junit.jupiter.MockitoExtension;
import uk.gov.hmcts.ccd.sdk.type.YesOrNo;
import uk.gov.hmcts.reform.pcs.ccd.domain.YesNoNotSure;
import uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim.PaymentAgreement;
import uk.gov.hmcts.reform.pcs.ccd.entity.respondpossessionclaim.PaymentAgreementEntity;

Expand Down Expand Up @@ -58,5 +59,55 @@ void shouldReturnNullWhenPaymentAgreementIsNull() {
assertThat(entity).isNull();
}

@ParameterizedTest
@MethodSource("repaymentPlanAgreedScenarios")
void shouldMapRepaymentPlanAgreedField(YesNoNotSure expected) {
// Given
PaymentAgreement model = PaymentAgreement.builder()
.repaymentPlanAgreed(expected)
.build();

// When
PaymentAgreementEntity entity = underTest.createPaymentAgreementEntity(model);

// Then
assertThat(entity).isNotNull();
assertThat(entity.getRepaymentPlanAgreed()).isEqualTo(expected);
}

private static Stream<Arguments> repaymentPlanAgreedScenarios() {
return Stream.of(
Arguments.of(YesNoNotSure.YES),
Arguments.of(YesNoNotSure.NO),
Arguments.of(YesNoNotSure.NOT_SURE),
Arguments.of((YesNoNotSure) null)
);
}

@ParameterizedTest
@MethodSource("repaymentAgreedDetailsScenarios")
void shouldMapRepaymentAgreedDetailsField(String expected) {
// Given
PaymentAgreement model = PaymentAgreement.builder()
.repaymentAgreedDetails(expected)
.build();

// When
PaymentAgreementEntity entity = underTest.createPaymentAgreementEntity(model);

// Then
assertThat(entity).isNotNull();
assertThat(entity.getRepaymentAgreedDetails()).isEqualTo(expected);
}

private static Stream<Arguments> repaymentAgreedDetailsScenarios() {
return Stream.of(
Arguments.of("Monthly installments"),
Arguments.of(""),
Arguments.of((String) null)
);
}


}

Loading