Revert "Revert "Fpvtl 2095 c100 policy changes (#3589)" (#3673)" (#3685)

srochani · web-flow · commit 2d80100727a1 · 2026-03-31T18:09:37.000+01:00
This reverts commit c5911b2.
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/constants/PrlAppsConstants.java b/src/main/java/uk/gov/hmcts/reform/prl/constants/PrlAppsConstants.java
@@ -1145,6 +1145,7 @@ public class PrlAppsConstants {
     public static final String IS_INVOKED_FROM_TASK = "isInvokedFromTask";
     public static final String ALLOCATED_BARRISTER = "allocatedBarrister";
     public static final String CAFCASS_DATE_TIME = "cafcassDateTime";
+    public static final String PERMISSION_REQUIRED_DOCUMENT = "uploadOrderDocForPermission";
     public static final String MESSAGE_REPLY_DYNAMIC_LIST = "messageReplyDynamicList";
     public static final String MESSAGE_IDENTIFIER = "messageIdentifier";
     public static final String TASK_ASSOCIATED_WITH_MESSAGE = "taskAssociatedWithMessage";
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/enums/PermissionRequiredEnum.java b/src/main/java/uk/gov/hmcts/reform/prl/enums/PermissionRequiredEnum.java
@@ -22,8 +22,13 @@ public String getDisplayedValue() {
 
     @JsonCreator
     public static PermissionRequiredEnum getValue(String key) {
+        if ("Yes".equalsIgnoreCase(key)) {
+            return yes;
+        }
+        if ("No".equalsIgnoreCase(key)) {
+            return noNotRequired;
+        }
         return PermissionRequiredEnum.valueOf(key);
     }
-
 }
 
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/enums/SpokenOrWrittenWelshEnum.java b/src/main/java/uk/gov/hmcts/reform/prl/enums/SpokenOrWrittenWelshEnum.java
@@ -11,9 +11,9 @@
 public enum SpokenOrWrittenWelshEnum {
 
     @JsonProperty("spoken")
-    spoken("Will need to speak Welsh"),
+    spoken("Will want to speak Welsh"),
     @JsonProperty("written")
-    written("Will need to read and write in Welsh"),
+    written("Will want to read and write in Welsh"),
     @JsonProperty("both")
     both("Both");
 
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/enums/respondentsolicitor/RespondentWelshNeedsListEnum.java b/src/main/java/uk/gov/hmcts/reform/prl/enums/respondentsolicitor/RespondentWelshNeedsListEnum.java
@@ -13,10 +13,10 @@
 @JsonSerialize(using = CustomEnumSerializer.class)
 public enum RespondentWelshNeedsListEnum {
     @JsonProperty("speakWelsh")
-    speakWelsh("Will need to speak Welsh"),
+    speakWelsh("Will want to speak Welsh"),
 
     @JsonProperty("readAndWriteWelsh")
-    readAndWriteWelsh("Will need to read and write in Welsh");
+    readAndWriteWelsh("Will want to read and write in Welsh");
 
     private final String displayedValue;
 
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/mapper/citizen/CaseDataMapper.java b/src/main/java/uk/gov/hmcts/reform/prl/mapper/citizen/CaseDataMapper.java
@@ -18,6 +18,7 @@
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildReasonableAdjustmentsElements;
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildRespondentDetailsElements;
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildSafetyConcernsElements;
+import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildScreeningQuestionsElements;
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildUrgencyElements;
 import uk.gov.hmcts.reform.prl.models.dto.ccd.CaseData;
 
@@ -34,6 +35,7 @@
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataReasonableAdjustmentsElementsMapper.updateReasonableAdjustmentsElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataRespondentDetailsElementsMapper.updateRespondentDetailsElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataSafetyConcernsElementsMapper.updateSafetyConcernsElementsForCaseData;
+import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataScreeningQuestionsElementsMapper.updateScreeningQuestionsElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataTypeOfOrderElementsMapper.updateTypeOfOrderElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataUrgencyElementsMapper.updateUrgencyElementsForCaseData;
 
@@ -90,6 +92,12 @@ public CaseData buildUpdatedCaseData(CaseData caseData) throws JsonProcessingExc
             updateMiamElementsForCaseData(caseDataBuilder, c100RebuildMiamElements);
         }
 
+        if (isNotEmpty(c100RebuildData.getC100RebuildScreeningQuestions())) {
+            C100RebuildScreeningQuestionsElements c100RebuildScreeningQuestionsElements = mapper
+                .readValue(c100RebuildData.getC100RebuildScreeningQuestions(), C100RebuildScreeningQuestionsElements.class);
+            updateScreeningQuestionsElementsForCaseData(caseDataBuilder, c100RebuildScreeningQuestionsElements);
+        }
+
         if (isNotEmpty(c100RebuildData.getC100RebuildChildDetails())) {
             c100RebuildChildDetailsElements = mapper
                 .readValue(c100RebuildData.getC100RebuildChildDetails(), C100RebuildChildDetailsElements.class);
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/mapper/citizen/CaseDataScreeningQuestionsElementsMapper.java b/src/main/java/uk/gov/hmcts/reform/prl/mapper/citizen/CaseDataScreeningQuestionsElementsMapper.java
@@ -0,0 +1,66 @@
+package uk.gov.hmcts.reform.prl.mapper.citizen;
+
+import org.apache.commons.lang3.StringUtils;
+import uk.gov.hmcts.reform.prl.enums.PermissionRequiredEnum;
+import uk.gov.hmcts.reform.prl.enums.YesOrNo;
+import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildScreeningQuestionsElements;
+import uk.gov.hmcts.reform.prl.models.documents.Document;
+import uk.gov.hmcts.reform.prl.models.dto.ccd.CaseData;
+
+import java.util.List;
+
+import static org.apache.commons.lang3.ObjectUtils.isNotEmpty;
+
+
+public class CaseDataScreeningQuestionsElementsMapper {
+
+    public static final String NONE = "none";
+
+    private CaseDataScreeningQuestionsElementsMapper() {
+    }
+
+    public static void updateScreeningQuestionsElementsForCaseData(CaseData.CaseDataBuilder<?, ?> caseDataBuilder,
+                                                                   C100RebuildScreeningQuestionsElements c100RebuildScreeningQuestionsElements) {
+
+        caseDataBuilder
+            .applicationPermissionRequired(isNotEmpty(c100RebuildScreeningQuestionsElements.getSqCourtPermissionRequired())
+                                               ? PermissionRequiredEnum.getValue(c100RebuildScreeningQuestionsElements.getSqCourtPermissionRequired())
+                                               : null)
+            .orderInPlacePermissionRequired(isNotEmpty(c100RebuildScreeningQuestionsElements.getSqPermissionsWhy())
+                                                ? buildOrderInPlace(c100RebuildScreeningQuestionsElements.getSqPermissionsWhy()) : null)
+            .orderDetailsForPermissions(StringUtils.isNotEmpty(c100RebuildScreeningQuestionsElements.getSqCourtOrderPreventSubfield())
+                                            ? c100RebuildScreeningQuestionsElements.getSqCourtOrderPreventSubfield() : null)
+            .uploadOrderDocForPermission(isNotEmpty(c100RebuildScreeningQuestionsElements.getSqUploadDocumentSubfield())
+                                ? buildDocument(c100RebuildScreeningQuestionsElements.getSqUploadDocumentSubfield()) : null);
+    }
+
+    private static YesOrNo buildOrderInPlace(List<String> sqPermissionsWhy) {
+        if (sqPermissionsWhy == null || sqPermissionsWhy.isEmpty()) {
+            return null;
+        }
+
+        boolean hasNonEmptyValue = false;
+
+        for (String value : sqPermissionsWhy) {
+            if (StringUtils.isNotEmpty(value)) {
+                hasNonEmptyValue = true;
+
+                if (value.equalsIgnoreCase("courtOrderPrevent")) {
+                    return YesOrNo.Yes;
+                }
+            }
+        }
+        return hasNonEmptyValue ? YesOrNo.No : null;
+    }
+
+    static Document buildDocument(uk.gov.hmcts.reform.prl.models.documents.Document document) {
+        if (isNotEmpty(document)) {
+            return Document.builder()
+                .documentUrl(document.getDocumentUrl())
+                .documentBinaryUrl(document.getDocumentBinaryUrl())
+                .documentFileName(document.getDocumentFileName())
+                .build();
+        }
+        return null;
+    }
+}
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/mapper/citizen/CitizenPartyDetailsMapper.java b/src/main/java/uk/gov/hmcts/reform/prl/mapper/citizen/CitizenPartyDetailsMapper.java
@@ -33,6 +33,7 @@
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildReasonableAdjustmentsElements;
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildRespondentDetailsElements;
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildSafetyConcernsElements;
+import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildScreeningQuestionsElements;
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildUrgencyElements;
 import uk.gov.hmcts.reform.prl.models.complextypes.Child;
 import uk.gov.hmcts.reform.prl.models.complextypes.ChildDetailsRevised;
@@ -104,6 +105,7 @@
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataReasonableAdjustmentsElementsMapper.updateReasonableAdjustmentsElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataRespondentDetailsElementsMapper.updateRespondentDetailsElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataSafetyConcernsElementsMapper.updateSafetyConcernsElementsForCaseData;
+import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataScreeningQuestionsElementsMapper.updateScreeningQuestionsElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataTypeOfOrderElementsMapper.updateTypeOfOrderElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.mapper.citizen.CaseDataUrgencyElementsMapper.updateUrgencyElementsForCaseData;
 import static uk.gov.hmcts.reform.prl.utils.CommonUtils.getPartyResponse;
@@ -987,6 +989,12 @@ public CaseData buildUpdatedCaseData(CaseData caseData, C100RebuildData c100Rebu
             updateOtherProceedingsElementsForCaseData(caseDataBuilder, c100RebuildOtherProceedingsElements);
         }
 
+        if (StringUtils.isNotEmpty(c100RebuildData.getC100RebuildScreeningQuestions())) {
+            C100RebuildScreeningQuestionsElements c100RebuildScreeningQuestionsElements = mapper
+                .readValue(c100RebuildData.getC100RebuildScreeningQuestions(), C100RebuildScreeningQuestionsElements.class);
+            updateScreeningQuestionsElementsForCaseData(caseDataBuilder, c100RebuildScreeningQuestionsElements);
+        }
+
         if (StringUtils.isNotEmpty(c100RebuildData.getC100RebuildHearingUrgency())) {
             C100RebuildUrgencyElements c100RebuildUrgencyElements = mapper
                 .readValue(c100RebuildData.getC100RebuildHearingUrgency(), C100RebuildUrgencyElements.class);
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/mapper/welshlang/WelshLangMapper.java b/src/main/java/uk/gov/hmcts/reform/prl/mapper/welshlang/WelshLangMapper.java
@@ -609,10 +609,10 @@ private static Map<String, String> getCaWelshLangMap() {
          * Attending the hearing.*/
         welshMap.put("isWelshNeeded_yes", "Bydd");
         welshMap.put("isWelshNeeded_no", WELSH_NO_NA_FYDD);
-        welshMap.put(SpokenOrWrittenWelshEnum.spoken.getDisplayedValue(), "Byddant eisiau siarad Cymraeg");
+        welshMap.put(SpokenOrWrittenWelshEnum.spoken.getDisplayedValue(), "Bydd eisiau siarad Cymraeg");
         welshMap.put(
             SpokenOrWrittenWelshEnum.written.getDisplayedValue(),
-            "Byddant eisiau darllen ac ysgrifennu yn Gymraeg"
+            "Bydd eisiau darllen ac ysgrifennu yn Gymraeg"
         );
         welshMap.put(SpokenOrWrittenWelshEnum.both.getDisplayedValue(), "Y ddau");
         welshMap.put("isInterpreterNeeded_yes", "Bydd");
@@ -1274,10 +1274,10 @@ private static Map<String, String> getDaWelshLangMap() {
          */
         welshMap.put("isWelshNeeded_yes", "Bydd");
         welshMap.put("isWelshNeeded_no", WELSH_NO_NA_FYDD);
-        welshMap.put(SpokenOrWrittenWelshEnum.spoken.getDisplayedValue(), "Byddant eisiau siarad Cymraeg");
+        welshMap.put(SpokenOrWrittenWelshEnum.spoken.getDisplayedValue(), "Bydd eisiau siarad Cymraeg");
         welshMap.put(
             SpokenOrWrittenWelshEnum.written.getDisplayedValue(),
-            "Byddant eisiau darllen ac ysgrifennu yn Gymraeg"
+            "Bydd eisiau darllen ac ysgrifennu yn Gymraeg"
         );
         welshMap.put("isInterpreterNeeded_yes", "Ydw");
         welshMap.put("isInterpreterNeeded_no", WELSH_NO_NAC_YDW);
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/models/c100rebuild/C100RebuildScreeningQuestionsElements.java b/src/main/java/uk/gov/hmcts/reform/prl/models/c100rebuild/C100RebuildScreeningQuestionsElements.java
@@ -0,0 +1,37 @@
+package uk.gov.hmcts.reform.prl.models.c100rebuild;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import uk.gov.hmcts.reform.prl.models.documents.Document;
+
+import java.util.List;
+
+@Data
+@Builder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class C100RebuildScreeningQuestionsElements {
+
+    @JsonProperty("sq_writtenAgreement")
+    private String sqWrittenAgreement;
+    @JsonProperty("sq_alternativeRoutes")
+    private String sqAlternativeRoutes;
+    @JsonProperty("sq_legalRepresentation")
+    private String sqLegalRepresentation;
+    @JsonProperty("sq_courtPermissionRequired")
+    private String sqCourtPermissionRequired;
+    @JsonProperty("sq_permissionsWhy")
+    private List<String> sqPermissionsWhy;
+    @JsonProperty("sq_courtOrderPrevent_subfield")
+    private String sqCourtOrderPreventSubfield;
+    @JsonProperty("sq_uploadDocument_subfield")
+    private Document sqUploadDocumentSubfield;
+    @JsonProperty("sqPermissionsRequest")
+    private String sqPermissionsRequest;
+
+}
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/models/complextypes/applicationtab/TypeOfApplication.java b/src/main/java/uk/gov/hmcts/reform/prl/models/complextypes/applicationtab/TypeOfApplication.java
@@ -12,5 +12,8 @@ public class TypeOfApplication {
     private final String natureOfOrder;
     private final String applicationPermissionRequiredReason;
     private final String applicationPermissionRequired;
+    private final String orderInPlacePermissionRequired;
+    private final String orderDetailsForPermissions;
+    private final String uploadOrderDocForPermission;
 
 }
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/models/dto/ccd/BaseCaseData.java b/src/main/java/uk/gov/hmcts/reform/prl/models/dto/ccd/BaseCaseData.java
@@ -163,4 +163,8 @@ public class BaseCaseData {
     private TTL retainAndDisposeTimeToLive;
 
     private List<Element<Document>> miamDocumentsCopy;
+
+    private YesOrNo orderInPlacePermissionRequired;
+    private String orderDetailsForPermissions;
+    private Document uploadOrderDocForPermission;
 }
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/rpa/mappers/TypeOfApplicationMapper.java b/src/main/java/uk/gov/hmcts/reform/prl/rpa/mappers/TypeOfApplicationMapper.java
@@ -39,6 +39,16 @@ public JsonObject map(CaseData caseData) {
                     ? caseData.getApplicationPermissionRequired().getDisplayedValue() : null
             )
             .add("applicationPermissionRequiredReason", caseData.getApplicationPermissionRequiredReason())
+            .add(
+                "orderInPlacePermissionRequired",
+                caseData.getOrderInPlacePermissionRequired() != null
+                    ? caseData.getOrderInPlacePermissionRequired().getDisplayedValue() : null
+            )
+            .add(
+                "uploadOrderDocForPermission",
+                caseData.getUploadOrderDocForPermission() != null
+                    ? caseData.getUploadOrderDocForPermission().getDocumentFileName() : null
+            )
             .add("applicationDetails", caseData.getApplicationDetails())
             .build();
     }
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/services/ApplicationsTabService.java b/src/main/java/uk/gov/hmcts/reform/prl/services/ApplicationsTabService.java
@@ -608,6 +608,12 @@ public Map<String, Object> getTypeOfApplicationTable(CaseData caseData) {
                     ? caseData.getApplicationPermissionRequired().getDisplayedValue() : null)
             .applicationPermissionRequiredReason(caseData.getApplicationPermissionRequiredReason())
             .natureOfOrder(natureOfOrder)
+            .orderInPlacePermissionRequired(nonNull(caseData.getOrderInPlacePermissionRequired())
+                                                ? caseData.getOrderInPlacePermissionRequired().getDisplayedValue() : null)
+            .orderDetailsForPermissions(nonNull(caseData.getOrderDetailsForPermissions())
+                                            ? caseData.getOrderDetailsForPermissions() : null)
+            .uploadOrderDocForPermission(nonNull(caseData.getUploadOrderDocForPermission())
+                                            ? caseData.getUploadOrderDocForPermission().getDocumentFileName() : null)
             .build();
 
         return toMap(typeOfApplication);
diff --git a/src/main/java/uk/gov/hmcts/reform/prl/services/citizen/CitizenCaseUpdateService.java b/src/main/java/uk/gov/hmcts/reform/prl/services/citizen/CitizenCaseUpdateService.java
@@ -30,6 +30,7 @@
 import uk.gov.hmcts.reform.prl.models.complextypes.WithdrawApplication;
 import uk.gov.hmcts.reform.prl.models.complextypes.tab.summarytab.summary.CaseStatus;
 import uk.gov.hmcts.reform.prl.models.court.Court;
+import uk.gov.hmcts.reform.prl.models.documents.DocumentResponse;
 import uk.gov.hmcts.reform.prl.models.dto.ccd.CaseData;
 import uk.gov.hmcts.reform.prl.models.user.UserInfo;
 import uk.gov.hmcts.reform.prl.services.AddCaseNoteService;
@@ -53,6 +54,7 @@
 import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.AWP_HWF_REF_NUMBER;
 import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.AWP_WA_TASK_NAME;
 import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.CASE_NOTES;
+import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.PERMISSION_REQUIRED_DOCUMENT;
 import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.READY_FOR_DELETION_STATE;
 import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.STATE;
 import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.TASK_LIST_VERSION_V3;
@@ -205,6 +207,21 @@ public CaseDetails submitCitizenC100Application(String authToken,
         // Do not remove the next line as it will overwrite the case state change
         caseDataMapToBeUpdated.remove("state");
         Iterables.removeIf(caseDataMapToBeUpdated.values(), Objects::isNull);
+
+        String jsonData = citizenUpdatedCaseData.getC100RebuildData().getC100RebuildScreeningQuestions();
+
+        if (jsonData != null) {
+            DocumentResponse documentResponse =
+                objectMapper.readValue(jsonData, DocumentResponse.class);
+
+            if (documentResponse != null && documentResponse.getDocument() != null) {
+                caseDataMapToBeUpdated.put(
+                    PERMISSION_REQUIRED_DOCUMENT,
+                    documentResponse.getDocument()
+                );
+            }
+        }
+
         CaseDetails caseDetails = allTabService.submitUpdateForSpecificUserEvent(
             startAllTabsUpdateDataContent.authorisation(),
             caseId,
diff --git a/src/test/java/uk/gov/hmcts/reform/prl/mapper/citizen/CaseDataMapperTest.java b/src/test/java/uk/gov/hmcts/reform/prl/mapper/citizen/CaseDataMapperTest.java
@@ -11,6 +11,7 @@
 import org.mockito.MockitoAnnotations;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.skyscreamer.jsonassert.JSONAssert;
+import uk.gov.hmcts.reform.prl.enums.YesOrNo;
 import uk.gov.hmcts.reform.prl.models.c100rebuild.C100RebuildData;
 import uk.gov.hmcts.reform.prl.models.dto.ccd.CaseData;
 import uk.gov.hmcts.reform.prl.models.dto.ccd.DocumentManagementDetails;
@@ -479,4 +480,51 @@ public void testCaseWhen_No_haveSafetyConcerns() throws IOException {
 
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = {"classpath:c100-rebuild/saftycrns.json", "classpath:c100-rebuild/saftycrnsWithoutDomesticAbuse.json",
+        "classpath:c100-rebuild/saftycrnsWithoutChildAbuses.json"})
+    void testCaseDataMapperForScreeningQuestions(String resourcePath) throws IOException {
+        CaseData caseData1 = caseData.toBuilder()
+            .c100RebuildData(caseData.getC100RebuildData().toBuilder()
+                                 .c100RebuildScreeningQuestions(TestUtil.readFileFrom("classpath:c100-rebuild/sq.json"))
+                                 .build()).build();
+
+        CaseData updatedCaseData = caseDataMapper.buildUpdatedCaseData(caseData1);
+        assertNotNull(updatedCaseData);
+        assertEquals(YesOrNo.Yes, updatedCaseData.getOrderInPlacePermissionRequired());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"classpath:c100-rebuild/saftycrns.json", "classpath:c100-rebuild/saftycrnsWithoutDomesticAbuse.json",
+        "classpath:c100-rebuild/saftycrnsWithoutChildAbuses.json"})
+    void testOrderInPlace_WhenOtherValue_ReturnsNo(String resourcePath) throws IOException {
+        CaseData caseData1 = caseData.toBuilder()
+            .c100RebuildData(caseData.getC100RebuildData().toBuilder()
+                                 .c100RebuildScreeningQuestions(TestUtil.readFileFrom("classpath:c100-rebuild/sq2.json"))
+                                 .build()).build();
+
+        CaseData updated = caseDataMapper.buildUpdatedCaseData(caseData1);
+
+        assertEquals(YesOrNo.No, updated.getOrderInPlacePermissionRequired());
+    }
+
+    @ParameterizedTest
+    @ValueSource(strings = {"classpath:c100-rebuild/saftycrns.json", "classpath:c100-rebuild/saftycrnsWithoutDomesticAbuse.json",
+        "classpath:c100-rebuild/saftycrnsWithoutChildAbuses.json"})
+    void testScreeningQuestionsWhenNull() throws IOException {
+
+        CaseData caseData1 = caseData.toBuilder()
+            .c100RebuildData(caseData.getC100RebuildData().toBuilder()
+                                 .c100RebuildScreeningQuestions(null)
+                                 .build())
+            .build();
+
+        CaseData updated = caseDataMapper.buildUpdatedCaseData(caseData1);
+
+        assertNull(updated.getApplicationPermissionRequired());
+        assertNull(updated.getOrderDetailsForPermissions());
+        assertNull(updated.getOrderInPlacePermissionRequired());
+        assertNull(updated.getUploadOrderDocForPermission());
+    }
+
 }
diff --git a/src/test/java/uk/gov/hmcts/reform/prl/rpa/mappers/TypeOfApplicationMapperTest.java b/src/test/java/uk/gov/hmcts/reform/prl/rpa/mappers/TypeOfApplicationMapperTest.java
diff --git a/src/test/java/uk/gov/hmcts/reform/prl/services/ApplicationsTabServiceTest.java b/src/test/java/uk/gov/hmcts/reform/prl/services/ApplicationsTabServiceTest.java
diff --git a/src/test/java/uk/gov/hmcts/reform/prl/services/citizen/CitizenCaseUpdateServiceTest.java b/src/test/java/uk/gov/hmcts/reform/prl/services/citizen/CitizenCaseUpdateServiceTest.java
diff --git a/src/test/resources/c100-rebuild/sq.json b/src/test/resources/c100-rebuild/sq.json
diff --git a/src/test/resources/c100-rebuild/sq2.json b/src/test/resources/c100-rebuild/sq2.json

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,13 @@ public String getDisplayedValue() {`
`22`	`22`
`23`	`23`	`@JsonCreator`
`24`	`24`	`public static PermissionRequiredEnum getValue(String key) {`
	`25`	`+ if ("Yes".equalsIgnoreCase(key)) {`
	`26`	`+ return yes;`
	`27`	`+ }`
	`28`	`+ if ("No".equalsIgnoreCase(key)) {`
	`29`	`+ return noNotRequired;`
	`30`	`+ }`
`25`	`31`	`return PermissionRequiredEnum.valueOf(key);`
`26`	`32`	`}`
`27`		`-`
`28`	`33`	`}`
`29`	`34`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,8 @@ public class TypeOfApplication {`
`12`	`12`	`private final String natureOfOrder;`
`13`	`13`	`private final String applicationPermissionRequiredReason;`
`14`	`14`	`private final String applicationPermissionRequired;`
	`15`	`+ private final String orderInPlacePermissionRequired;`
	`16`	`+ private final String orderDetailsForPermissions;`
	`17`	`+ private final String uploadOrderDocForPermission;`
`15`	`18`
`16`	`19`	`}`