Hdpi 2036 statement of truth screen english journey

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

@@ -45,7 +45,7 @@ public class PCSCase {
     // Field label constants - shared between domain annotations and validation
     public static final String NOTICE_EMAIL_EXPLANATION_LABEL = "Explain how it was served by email";
     public static final String NOTICE_OTHER_EXPLANATION_LABEL = "Explain what the other means were";
-    public static final String DETAILS_OF_OTHER_TYPE_OF_TENANCY_LICENCE_LABEL = 
+    public static final String DETAILS_OF_OTHER_TYPE_OF_TENANCY_LICENCE_LABEL =
         "Give details of the type of tenancy or licence agreement that's in place";
 
     @CCD(
@@ -734,4 +734,34 @@ public class PCSCase {
     )
     private WaysToPay waysToPay;
 
+    @CCD(label = "Completed by")
+    private StatementOfTruthCompletedBy statementOfTruthCompletedBy;
+
+    @CCD(
+        typeOverride = FieldType.MultiSelectList,
+        typeParameterOverride = "StatementOfTruthAgreementClaimant"
+    )
+    private List<StatementOfTruthAgreementClaimant> statementOfTruthAgreementClaimant;
+
+    @CCD(label = "Full name")
+    private String statementOfTruthFullNameClaimant;
+
+    @CCD(label = "Position or office held")
+    private String statementOfTruthPositionClaimant;
+
+    @CCD(
+        typeOverride = FieldType.MultiSelectList,
+        typeParameterOverride = "StatementOfTruthAgreementLegalRep"
+    )
+    private List<StatementOfTruthAgreementLegalRep> statementOfTruthAgreementLegalRep;
+
+    @CCD(label = "Full name")
+    private String statementOfTruthFullNameLegalRep;
+
+    @CCD(label = "Name of firm")
+    private String statementOfTruthFirmNameLegalRep;
+
+    @CCD(label = "Position or office held")
+    private String statementOfTruthPositionLegalRep;
+
 }

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

@@ -0,0 +1,23 @@
+package uk.gov.hmcts.reform.pcs.ccd.domain;
+
+import uk.gov.hmcts.ccd.sdk.api.CCD;
+import uk.gov.hmcts.ccd.sdk.api.HasLabel;
+
+public enum StatementOfTruthAgreementClaimant implements HasLabel {
+
+    @CCD(label = "I believe that the facts stated in this claim form are true.")
+    BELIEVE_TRUE("I believe that the facts stated in this claim form are true.");
+
+    private final String label;
+
+    StatementOfTruthAgreementClaimant(String label) {
+        this.label = label;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+
+}
+

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

@@ -0,0 +1,25 @@
+package uk.gov.hmcts.reform.pcs.ccd.domain;
+
+import uk.gov.hmcts.ccd.sdk.api.CCD;
+import uk.gov.hmcts.ccd.sdk.api.HasLabel;
+
+public enum StatementOfTruthAgreementLegalRep implements HasLabel {
+
+    @CCD(label = "The claimant believes that the facts stated in this claim form are true. "
+        + "I am authorised by the claimant to sign this statement.")
+    AGREED("The claimant believes that the facts stated in this claim form are true. "
+        + "I am authorised by the claimant to sign this statement.");
+
+    private final String label;
+
+    StatementOfTruthAgreementLegalRep(String label) {
+        this.label = label;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+
+}
+

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

@@ -0,0 +1,12 @@
+package uk.gov.hmcts.reform.pcs.ccd.domain;
+
+import uk.gov.hmcts.ccd.sdk.api.CCD;
+
+public enum StatementOfTruthCompletedBy {
+
+  @CCD(label = "Claimant") CLAIMANT,
+
+  @CCD(label = "Claimant's legal representative (as defined by CPR 2.3 (1))")
+  LEGAL_REPRESENTATIVE
+
+}

src/main/java/uk/gov/hmcts/reform/pcs/ccd/entity/PcsCaseEntity.java

@@ -25,6 +25,7 @@
 import uk.gov.hmcts.reform.pcs.ccd.model.Defendant;
 import uk.gov.hmcts.reform.pcs.ccd.model.PartyDocumentDto;
 import uk.gov.hmcts.reform.pcs.ccd.model.PossessionGrounds;
+import uk.gov.hmcts.reform.pcs.ccd.model.StatementOfTruth;
 import uk.gov.hmcts.reform.pcs.postcodecourt.model.LegislativeCountry;
 
 import java.util.HashSet;
@@ -94,6 +95,10 @@ public class PcsCaseEntity {
     @JdbcTypeCode(SqlTypes.JSON)
     private List<PartyDocumentDto> partyDocuments;
 
+    @Column(name = "statement_of_truth")
+    @JdbcTypeCode(SqlTypes.JSON)
+    private StatementOfTruth statementOfTruth;
+
     public void addClaim(ClaimEntity claim) {
         claims.add(claim);
         claim.setPcsCase(this);

src/main/java/uk/gov/hmcts/reform/pcs/ccd/event/ResumePossessionClaim.java

@@ -213,6 +213,7 @@ public void configureDecentralised(DecentralisedConfigBuilder<PCSCase, State, Us
             .add(new CompletingYourClaim())
             .add(new StatementOfTruth());
 
+
     }
 
     private PCSCase start(EventPayload<PCSCase, State> eventPayload) {

src/main/java/uk/gov/hmcts/reform/pcs/ccd/model/StatementOfTruth.java

@@ -0,0 +1,35 @@
+package uk.gov.hmcts.reform.pcs.ccd.model;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class StatementOfTruth {
+
+    private String completedBy;
+
+    private List<String> agreementClaimant;
+
+    private String fullNameClaimant;
+
+    private String positionClaimant;
+
+    private List<String> agreementLegalRep;
+
+    private String fullNameLegalRep;
+
+    private String firmNameLegalRep;
+
+    private String positionLegalRep;
+
+}
+

src/main/java/uk/gov/hmcts/reform/pcs/ccd/page/makeaclaim/StatementOfTruth.java

@@ -2,26 +2,42 @@
 
 import uk.gov.hmcts.reform.pcs.ccd.common.CcdPageConfiguration;
 import uk.gov.hmcts.reform.pcs.ccd.common.PageBuilder;
+import uk.gov.hmcts.reform.pcs.ccd.domain.PCSCase;
 
 public class StatementOfTruth implements CcdPageConfiguration {
 
     @Override
     public void addTo(PageBuilder pageBuilder) {
-        pageBuilder
-            .page("statementOfTruth")
+        pageBuilder.page("statementOfTruth")
             .pageLabel("Statement of truth")
             .showCondition("completionNextStep=\"SUBMIT_AND_PAY_NOW\"")
-
-            // ---------- Horizontal separator ----------
-            .label("statementOfTruth-separator", "---")
-            .label(
-                "statementOfTruth-content",
+            .label("statementOfTruth-hr", "---")
+            .label("statementOfTruth-body",
                 """
-                <h2 class="govuk-heading-l">Statement of truth</h2>
-                <p class="govuk-body govuk-!-font-size-19">
-                  This is a placeholder page for the statement of truth functionality.
+                <p class="govuk-body">
+                  I understand that proceedings for contempt of court may be brought against
+                  anyone who makes, or causes to be made, a false statement in a document
+                  verified by a statement of truth without an honest belief in its truth.
                 </p>
                 """
-            );
+            )
+            .mandatory(PCSCase::getStatementOfTruthCompletedBy)
+            .mandatory(PCSCase::getStatementOfTruthAgreementClaimant,
+                "statementOfTruthCompletedBy=\"CLAIMANT\"")
+            .mandatory(PCSCase::getStatementOfTruthFullNameClaimant,
+                "statementOfTruthCompletedBy=\"CLAIMANT\"")
+            .mandatory(PCSCase::getStatementOfTruthPositionClaimant,
+                "statementOfTruthCompletedBy=\"CLAIMANT\"")
+            .mandatory(PCSCase::getStatementOfTruthAgreementLegalRep,
+                "statementOfTruthCompletedBy=\"LEGAL_REPRESENTATIVE\"")
+            .mandatory(PCSCase::getStatementOfTruthFullNameLegalRep,
+                "statementOfTruthCompletedBy=\"LEGAL_REPRESENTATIVE\"")
+            .mandatory(PCSCase::getStatementOfTruthFirmNameLegalRep,
+                "statementOfTruthCompletedBy=\"LEGAL_REPRESENTATIVE\"")
+            .mandatory(PCSCase::getStatementOfTruthPositionLegalRep,
+                "statementOfTruthCompletedBy=\"LEGAL_REPRESENTATIVE\"");
+
     }
+
+
 }

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

@@ -29,6 +29,7 @@ public class PcsCaseMergeService {
     private final ModelMapper modelMapper;
     private final TenancyLicenceService tenancyLicenceService;
     private final DefendantMapper defendantMapper;
+    private final StatementOfTruthService statementOfTruthService;
 
     public void mergeCaseData(PcsCaseEntity pcsCaseEntity, PCSCase pcsCase) {
 
@@ -59,6 +60,7 @@ public void mergeCaseData(PcsCaseEntity pcsCaseEntity, PCSCase pcsCase) {
         pcsCaseEntity.setTenancyLicence(tenancyLicenceService.buildTenancyLicence(pcsCase));
         pcsCaseEntity.setPossessionGrounds(buildPossessionGrounds(pcsCase));
         pcsCaseEntity.setDefendants(defendantMapper.mapFromDefendantDetails(pcsCase.getDefendants()));
+        pcsCaseEntity.setStatementOfTruth(statementOfTruthService.buildStatementOfTruth(pcsCase));
     }
 
     private void setPcqIdForCurrentUser(UUID pcqId, PcsCaseEntity pcsCaseEntity) {

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

@@ -0,0 +1,51 @@
+package uk.gov.hmcts.reform.pcs.ccd.service;
+
+import org.springframework.stereotype.Service;
+import uk.gov.hmcts.ccd.sdk.api.HasLabel;
+import uk.gov.hmcts.reform.pcs.ccd.domain.PCSCase;
+import uk.gov.hmcts.reform.pcs.ccd.domain.StatementOfTruthCompletedBy;
+import uk.gov.hmcts.reform.pcs.ccd.model.StatementOfTruth;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+@Service
+public class StatementOfTruthService {
+
+    public StatementOfTruth buildStatementOfTruth(PCSCase pcsCase) {
+        if (pcsCase.getStatementOfTruthCompletedBy() == null) {
+            return null;
+        }
+
+        StatementOfTruth.StatementOfTruthBuilder builder = StatementOfTruth.builder()
+            .completedBy(pcsCase.getStatementOfTruthCompletedBy() != null
+                ? pcsCase.getStatementOfTruthCompletedBy().name() : null);
+
+        if (pcsCase.getStatementOfTruthCompletedBy() == StatementOfTruthCompletedBy.CLAIMANT) {
+            builder.agreementClaimant(mapToLabels(pcsCase.getStatementOfTruthAgreementClaimant()))
+                .fullNameClaimant(pcsCase.getStatementOfTruthFullNameClaimant())
+                .positionClaimant(pcsCase.getStatementOfTruthPositionClaimant());
+        } else if (pcsCase.getStatementOfTruthCompletedBy() == StatementOfTruthCompletedBy.LEGAL_REPRESENTATIVE) {
+            builder.agreementLegalRep(mapToLabels(pcsCase.getStatementOfTruthAgreementLegalRep()))
+                .fullNameLegalRep(pcsCase.getStatementOfTruthFullNameLegalRep())
+                .firmNameLegalRep(pcsCase.getStatementOfTruthFirmNameLegalRep())
+                .positionLegalRep(pcsCase.getStatementOfTruthPositionLegalRep());
+        }
+
+        return builder.build();
+    }
+
+    private <T extends HasLabel> List<String> mapToLabels(List<T> items) {
+        return Optional.ofNullable(items)
+            .orElse(Collections.emptyList())
+            .stream()
+            .map(HasLabel::getLabel)
+            .collect(Collectors.toList());
+    }
+
+}
+
+
+

src/main/resources/db/migration/V035__add_statement_of_truth_column.sql

@@ -0,0 +1,2 @@
+ALTER TABLE pcs_case ADD COLUMN statement_of_truth JSONB;
+

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

@@ -47,6 +47,8 @@ class PcsCaseMergeServiceTest {
     private TenancyLicenceService tenancyLicenceService;
     @Mock
     private DefendantMapper defendantMapper;
+    @Mock
+    private StatementOfTruthService statementOfTruthService;
 
     private PcsCaseMergeService underTest;
 
@@ -55,7 +57,7 @@ void setUp() {
         MapperConfig config = new MapperConfig();
         modelMapper = spy(config.modelMapper());
         underTest = new PcsCaseMergeService(securityContextService, modelMapper, tenancyLicenceService,
-                                            defendantMapper);
+                                            defendantMapper, statementOfTruthService);
     }
 
     @Test