HDPI-4203-data-persistence-missing-pages

src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/respondpossessionclaim/DefendantResponses.java

@@ -45,7 +45,7 @@ public class DefendantResponses {
     private BigDecimal rentArrearsAmount;
 
     @CCD
-    private YesNoNotSure noticeReceived;
+    private YesNoNotSure possessionNoticeReceived;
 
     @CCD
     private LocalDate noticeReceivedDate;

src/main/java/uk/gov/hmcts/reform/pcs/ccd/domain/respondpossessionclaim/PaymentAgreement.java

@@ -16,6 +16,9 @@ public class PaymentAgreement {
 
     @CCD
     private YesOrNo anyPaymentsMade;
+
+    @CCD(max = 500)
+    private String paymentDetails;
 
     @CCD(searchable = false)
     private YesNoNotSure repaymentPlanAgreed;

src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/DefendantResponseService.java

@@ -117,7 +117,7 @@ private DefendantResponseEntity buildDefendantResponseEntity(ClaimEntity claimRe
             .claim(claimRef)
             .party(partyRef)
             .freeLegalAdvice(responses.getFreeLegalAdvice())
-            .possessionNoticeReceived(responses.getNoticeReceived())
+            .possessionNoticeReceived(responses.getPossessionNoticeReceived())
             .defendantNameConfirmation(responses.getDefendantNameConfirmation())
             .landlordRegistered(responses.getLandlordRegistered())
             .writtenTerms(responses.getWrittenTerms())

src/main/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/PaymentAgreementService.java

@@ -15,6 +15,7 @@ public PaymentAgreementEntity createPaymentAgreementEntity(PaymentAgreement paym
 
         PaymentAgreementEntity paymentAgreementEntity = PaymentAgreementEntity.builder()
             .anyPaymentsMade(paymentAgreement.getAnyPaymentsMade())
+            .paymentDetails(paymentAgreement.getPaymentDetails())
             .repaymentPlanAgreed(paymentAgreement.getRepaymentPlanAgreed())
             .repaymentAgreedDetails(paymentAgreement.getRepaymentAgreedDetails())
             .build();

src/test/java/uk/gov/hmcts/reform/pcs/ccd/page/respondpossessionsclaim/RespondToPossessionDraftSavePageTest.java

@@ -64,7 +64,7 @@ void shouldReturnPartialUpdate() {
             .build();
 
         DefendantResponses responses = DefendantResponses.builder()
-            .noticeReceived(YesNoNotSure.NO)
+            .possessionNoticeReceived(YesNoNotSure.NO)
             .build();
 
         PCSCase caseData = buildCaseData(PossessionClaimResponse.builder()

src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/DefendantResponseServiceTest.java

@@ -123,7 +123,7 @@ void shouldSaveDefendantResponseWithJpaProxies() {
 
         DefendantResponses responses = DefendantResponses.builder()
             .freeLegalAdvice(YesNoPreferNotToSay.YES)
-            .noticeReceived(YesNoNotSure.YES)
+            .possessionNoticeReceived(YesNoNotSure.YES)
             .noticeReceivedDate(LocalDate.of(2024, 1, 15))
             .rentArrearsAmountConfirmation(YesNoNotSure.NO)
             .landlordRegistered(YesNoNotSure.YES)
@@ -235,6 +235,43 @@ void shouldSaveDefendantResponseWhenReceivedFreeLegalAdviceIsNull() {
         assertThat(savedResponse.getFreeLegalAdvice()).isNull();
     }
 
+    @ParameterizedTest(name = "possessionNoticeReceived={0}")
+    @MethodSource("possessionNoticeReceivedScenarios")
+    void shouldPersistPossessionNoticeReceived(YesNoNotSure possessionNoticeReceived) {
+        // Given
+        when(securityContextService.getCurrentUserId()).thenReturn(USER_ID);
+        when(defendantResponseRepository.existsByClaimPcsCaseCaseReferenceAndPartyIdamId(
+            CASE_REFERENCE, USER_ID)).thenReturn(false);
+        stubPartyLookup();
+        stubClaimLookup();
+
+        DefendantResponses responses = DefendantResponses.builder()
+            .possessionNoticeReceived(possessionNoticeReceived)
+            .build();
+
+        PossessionClaimResponse possessionClaimResponse = PossessionClaimResponse.builder()
+            .defendantResponses(responses)
+            .build();
+
+        // When
+        underTest.saveDefendantResponse(CASE_REFERENCE, possessionClaimResponse);
+
+        // Then
+        verify(defendantResponseRepository).save(responseCaptor.capture());
+        DefendantResponseEntity savedResponse = responseCaptor.getValue();
+
+        assertThat(savedResponse.getPossessionNoticeReceived()).isEqualTo(possessionNoticeReceived);
+    }
+
+    private static Stream<Arguments> possessionNoticeReceivedScenarios() {
+        return Stream.of(
+            Arguments.of(YesNoNotSure.YES),
+            Arguments.of(YesNoNotSure.NO),
+            Arguments.of(YesNoNotSure.NOT_SURE),
+            Arguments.of((YesNoNotSure) null)
+        );
+    }
+
     @ParameterizedTest(name = "landlordRegistered={0}")
     @MethodSource("landlordRegisteredPersistenceScenarios")
     void shouldPersistLandlordRegistered(YesNoNotSure landlordRegistered) {

src/test/java/uk/gov/hmcts/reform/pcs/ccd/service/respondpossessionclaim/PaymentAgreementServiceTest.java

@@ -108,6 +108,30 @@ private static Stream<Arguments> repaymentAgreedDetailsScenarios() {
         );
     }
 
+    @ParameterizedTest
+    @MethodSource("paymentDetailsScenarios")
+    void shouldMapPaymentDetailsField(String expected) {
+        // Given
+        PaymentAgreement model = PaymentAgreement.builder()
+                .paymentDetails(expected)
+                .build();
+
+        // When
+        PaymentAgreementEntity entity = underTest.createPaymentAgreementEntity(model);
+
+        // Then
+        assertThat(entity).isNotNull();
+        assertThat(entity.getPaymentDetails()).isEqualTo(expected);
+    }
+
+    private static Stream<Arguments> paymentDetailsScenarios() {
+        return Stream.of(
+                Arguments.of("Paid £500 on 01/01/2024"),
+                Arguments.of(""),
+                Arguments.of((String) null)
+        );
+    }
+
 
 }