Merge origin/HDPI-3794-End-of-journey-CYA-and-SOT-BE into access-fix

Author: paddybasi

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

@@ -115,24 +115,29 @@ public class DefendantResponses {
     private LanguageUsed languageUsed;
 
     private EqualityAndDiversityQuestionsChoice equalityAndDiversityQuestionsChoice;
+
     @CCD
     private VerticalYesNo otherConsiderations;
 
     @CCD(max = 6400)
     private String otherConsiderationsDetails;
-    
+
     @CCD
     private VerticalYesNo makeCounterClaim;
 
     @CCD
     private VerticalYesNo counterClaimWantToUploadFiles;
+
     @CCD(
         access = {DefendantSolicitorAccess.class},
         typeOverride = FieldType.MultiSelectList,
         typeParameterOverride = "RespondToClaimSection"
     )
     private List<RespondToClaimSection> completedSections;
 
+    @CCD
+    private RTCStatementOfTruth statementOfTruth;
+
     @CCD
     private DefendantResponseStatus status;
 }

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

@@ -0,0 +1,22 @@
+package uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import uk.gov.hmcts.ccd.sdk.api.CCD;
+import uk.gov.hmcts.reform.pcs.ccd.domain.VerticalYesNo;
+
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class RTCStatementOfTruth {
+
+    @CCD
+    private VerticalYesNo accepted;
+
+    @CCD(max = 100)
+    private String fullName;
+
+}

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

@@ -13,6 +13,7 @@
 import uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim.DefendantResponses;
 import uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim.PossessionClaimResponse;
 import uk.gov.hmcts.reform.pcs.ccd.entity.ClaimEntity;
+import uk.gov.hmcts.reform.pcs.ccd.entity.claim.StatementOfTruthEntity;
 import uk.gov.hmcts.reform.pcs.ccd.entity.party.PartyEntity;
 import uk.gov.hmcts.reform.pcs.ccd.entity.respondpossessionclaim.CounterClaimEntity;
 import uk.gov.hmcts.reform.pcs.ccd.entity.respondpossessionclaim.CounterClaimPartyEntity;
@@ -30,6 +31,8 @@
 import java.util.UUID;
 import java.util.function.Supplier;
 
+import static uk.gov.hmcts.reform.pcs.ccd.util.YesOrNoConverter.toYesOrNo;
+
 /**
  * Service for managing defendant responses.
  * Handles saving defendant responses to the defendant_response table with optimal concurrency.
@@ -169,6 +172,8 @@ private void saveDefendantResponseInternal(
 
         buildAndLinkChildEntities(responseEntity, responses);
 
+        buildStatementOfTruth(responses, responseEntity);
+
         CounterClaimEntity savedCounterClaim = saveCounterClaim(responses, partyRef, claimRef, submittedAt);
 
         DefendantResponseEntity savedResponse = defendantResponseRepository.save(responseEntity);
@@ -313,6 +318,18 @@ private CounterClaimEntity saveCounterClaim(DefendantResponses responses,
         return counterClaimRepository.save(counterClaimEntity);
     }
 
+    private void buildStatementOfTruth(DefendantResponses responses, DefendantResponseEntity responseEntity) {
+        if (responses.getStatementOfTruth() == null || responses.getStatementOfTruth().getAccepted() == null) {
+            return;
+        }
+        StatementOfTruthEntity sot = StatementOfTruthEntity.builder()
+            .accepted(toYesOrNo(responses.getStatementOfTruth().getAccepted()))
+            .fullName(responses.getStatementOfTruth().getFullName())
+            .completedDate(LocalDateTime.now(utcClock))
+            .build();
+        responseEntity.setStatementOfTruth(sot);
+    }
+
     public boolean hasSubmittedResponse(long caseReference) {
         UUID userId = securityContextService.getCurrentUserId();
         if (userId == null) {

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

@@ -26,6 +26,7 @@
 import uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim.HouseholdCircumstances;
 import uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim.PaymentAgreement;
 import uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim.PossessionClaimResponse;
+import uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim.RTCStatementOfTruth;
 import uk.gov.hmcts.reform.pcs.ccd.domain.respondpossessionclaim.ReasonableAdjustments;
 import uk.gov.hmcts.reform.pcs.ccd.entity.ClaimEntity;
 import uk.gov.hmcts.reform.pcs.ccd.entity.PcsCaseEntity;
@@ -1393,6 +1394,62 @@ void shouldThrowExceptionWhenCurrentUserIdIsNull_WithPartyId() {
         verify(defendantResponseRepository, never()).save(any());
     }
 
+    @Test
+    void shouldSaveStatementOfTruthWhenAccepted() {
+        // Given
+        when(securityContextService.getCurrentUserId()).thenReturn(USER_ID);
+        stubPartyLookup();
+        stubClaimLookup();
+
+        DefendantResponses responses = DefendantResponses.builder()
+            .statementOfTruth(RTCStatementOfTruth.builder()
+                .accepted(VerticalYesNo.YES)
+                .fullName("John Doe")
+                .build())
+            .build();
+
+        PossessionClaimResponse possessionClaimResponse = PossessionClaimResponse.builder()
+            .defendantResponses(responses)
+            .build();
+
+        // When
+        underTest.saveDefendantResponse(CASE_REFERENCE, possessionClaimResponse);
+
+        // Then
+        verify(defendantResponseRepository).save(responseCaptor.capture());
+        DefendantResponseEntity saved = responseCaptor.getValue();
+
+        assertThat(saved.getStatementOfTruth()).isNotNull();
+        assertThat(saved.getStatementOfTruth().getAccepted()).isEqualTo(YesOrNo.YES);
+        assertThat(saved.getStatementOfTruth().getFullName()).isEqualTo("John Doe");
+        assertThat(saved.getStatementOfTruth().getCompletedDate()).isEqualTo("2026-04-22T21:00");
+    }
+
+    @Test
+    void shouldNotSaveStatementOfTruthWhenAcceptedIsNull() {
+        // Given
+        when(securityContextService.getCurrentUserId()).thenReturn(USER_ID);
+        stubPartyLookup();
+        stubClaimLookup();
+
+        DefendantResponses responses = DefendantResponses.builder()
+            .statementOfTruth(RTCStatementOfTruth.builder()
+                .accepted(null)
+                .build())
+            .build();
+
+        PossessionClaimResponse possessionClaimResponse = PossessionClaimResponse.builder()
+            .defendantResponses(responses)
+            .build();
+
+        // When
+        underTest.saveDefendantResponse(CASE_REFERENCE, possessionClaimResponse);
+
+        // Then
+        verify(defendantResponseRepository).save(responseCaptor.capture());
+        assertThat(responseCaptor.getValue().getStatementOfTruth()).isNull();
+    }
+
     @ParameterizedTest(name = "counterClaimWantToUploadFiles={0}")
     @MethodSource("counterClaimWantToUploadFilesPersistenceScenarios")
     void shouldPersistCounterClaimWantToUploadFiles(VerticalYesNo counterClaimWantToUploadFiles) {