Fpvtl 2510 fix

build.gradle

@@ -707,4 +707,3 @@ bootWithCCD {
 test {
   useJUnitPlatform()
 }
-

charts/prl-cos/values.preview.template.yaml

@@ -105,5 +105,6 @@ java:
     COMMON_DATA_API: http://rd-commondata-api-aat.service.core-compute-aat.internal
     SEND_LETTER_URL: http://rpe-send-letter-service-{{ .Values.global.environment }}.service.core-compute-{{ .Values.global.environment }}.internal
     BARRISTER_FEATURE_ENABLED: true
+    AWAITING_INFORMATION_ENABLED: true
     CAFCASS_DATE_TIME_FEATURE_ENABLED: true
     APP_ENV: "preview"

src/main/java/uk/gov/hmcts/reform/prl/constants/PrlAppsConstants.java

@@ -1126,6 +1126,8 @@ public class PrlAppsConstants {
 
     public static final String CASE_STATUS = "caseStatus";
 
+    public static final String REQUEST_FURTHER_INFORMATION_DETAILS = "requestFurtherInformationDetails";
+
     public static final String FETCH_FEE_INVALID_APPLICATION_TYPE = "Invalid application type to fetch fee details: ";
     public static final String FETCH_FEE_ERROR = "Error while fetching fee details for application type: ";
     public static final String ENGLISH = "en";

src/main/java/uk/gov/hmcts/reform/prl/controllers/CallbackController.java

@@ -125,6 +125,8 @@
 import static uk.gov.hmcts.reform.prl.constants.PrlLaunchDarklyFlagConstants.TASK_LIST_V2_FLAG;
 import static uk.gov.hmcts.reform.prl.constants.PrlLaunchDarklyFlagConstants.TASK_LIST_V3_FLAG;
 import static uk.gov.hmcts.reform.prl.enums.Event.SEND_TO_GATEKEEPER;
+import static uk.gov.hmcts.reform.prl.enums.State.AWAITING_INFORMATION;
+import static uk.gov.hmcts.reform.prl.enums.State.CASE_ISSUED;
 import static uk.gov.hmcts.reform.prl.enums.State.SUBMITTED_PAID;
 import static uk.gov.hmcts.reform.prl.enums.YesOrNo.Yes;
 import static uk.gov.hmcts.reform.prl.utils.CaseUtils.getCaseData;
@@ -696,15 +698,25 @@ public AboutToStartOrSubmitCallbackResponse addCaseNumberSubmitted(
     ) {
         if (authorisationService.isAuthorized(authorisation, s2sToken)) {
             Map<String, Object> caseDataUpdated = callbackRequest.getCaseDetails().getData();
+            CaseData caseData = getCaseData(callbackRequest.getCaseDetails(), objectMapper);
             List<CaseEventDetail> eventsForCase = caseEventService.findEventsForCase(String.valueOf(callbackRequest.getCaseDetails().getId()));
 
-            Optional<String> previousState = eventsForCase.stream()
+            Optional<String> previousStateOpt = eventsForCase.stream()
                 .map(CaseEventDetail::getStateId)
                 .findFirst();
-            previousState.ifPresent(s -> caseDataUpdated.put(
-                VERIFY_CASE_NUMBER_ADDED,
-                SUBMITTED_PAID.getValue().equalsIgnoreCase(s) ? Yes.getDisplayedValue() : null
-            ));
+
+            if (previousStateOpt.isPresent()) {
+                String previousState = previousStateOpt.get();
+                if (AWAITING_INFORMATION.getValue().equalsIgnoreCase(previousState)) {
+                    caseDataUpdated.put(VERIFY_CASE_NUMBER_ADDED, Yes.getDisplayedValue());
+                    caseData = caseData.toBuilder().state(CASE_ISSUED).build();
+                    caseDataUpdated.putAll(caseSummaryTab.updateTab(caseData));
+                    caseDataUpdated.put(STATE_FIELD, CASE_ISSUED.getValue());
+                } else if (SUBMITTED_PAID.getValue().equalsIgnoreCase(previousState)) {
+                    caseDataUpdated.put(VERIFY_CASE_NUMBER_ADDED, Yes.getDisplayedValue());
+                }
+            }
+
             caseDataUpdated.put(ISSUE_DATE_FIELD, LocalDate.now());
             return AboutToStartOrSubmitCallbackResponse.builder()
                 .data(caseDataUpdated)
@@ -940,4 +952,3 @@ public AboutToStartOrSubmitCallbackResponse updateOtherPeoplePartyDetails(
         }
     }
 }
-

src/main/java/uk/gov/hmcts/reform/prl/controllers/RequestFurtherInformationController.java

@@ -0,0 +1,99 @@
+package uk.gov.hmcts.reform.prl.controllers;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
+import uk.gov.hmcts.reform.ccd.client.model.AboutToStartOrSubmitCallbackResponse;
+import uk.gov.hmcts.reform.ccd.client.model.CallbackRequest;
+import uk.gov.hmcts.reform.ccd.client.model.SubmittedCallbackResponse;
+import uk.gov.hmcts.reform.prl.constants.PrlAppsConstants;
+import uk.gov.hmcts.reform.prl.models.dto.ccd.CallbackResponse;
+import uk.gov.hmcts.reform.prl.services.AuthorisationService;
+import uk.gov.hmcts.reform.prl.services.FeatureToggleService;
+import uk.gov.hmcts.reform.prl.services.RequestFurtherInformationService;
+
+import static java.util.Collections.emptyList;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
+import static org.springframework.http.ResponseEntity.ok;
+import static uk.gov.hmcts.reform.prl.constants.PrlAppsConstants.INVALID_CLIENT;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor(onConstructor = @__(@Autowired))
+public class RequestFurtherInformationController {
+    private final RequestFurtherInformationService requestFurtherInformationService;
+    private final AuthorisationService authorisationService;
+    private final FeatureToggleService featureToggleService;
+    public static final String CONFIRMATION_HEADER = "confirmationHeader";
+
+    @PostMapping(path = "/submit-request-further-information", consumes = APPLICATION_JSON, produces = APPLICATION_JSON)
+    @Operation(description = "Awaiting On Information callback to update case data and set case status to awaiting information")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "Callback processed.",
+            content = @Content(mediaType = "application/json", schema = @Schema(implementation = AboutToStartOrSubmitCallbackResponse.class))),
+        @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content)})
+    @SecurityRequirement(name = "Bearer Authentication")
+    public AboutToStartOrSubmitCallbackResponse submitAwaitingInformation(
+        @RequestHeader(HttpHeaders.AUTHORIZATION) @Parameter(hidden = true) String authorisation,
+        @RequestHeader(PrlAppsConstants.SERVICE_AUTHORIZATION_HEADER) String s2sToken,
+        @RequestBody CallbackRequest callbackRequest
+    ) {
+        if (authorisationService.isAuthorized(authorisation, s2sToken)
+            && featureToggleService.isAwaitingInformationEnabled()) {
+            var caseDataUpdated = requestFurtherInformationService.addToCase(callbackRequest);
+            return AboutToStartOrSubmitCallbackResponse.builder().data(caseDataUpdated).build();
+        }
+        throw (new RuntimeException(INVALID_CLIENT));
+    }
+
+
+    @PostMapping(path = "/validate-request-further-information", consumes = APPLICATION_JSON, produces = APPLICATION_JSON)
+    @Operation(description = "Callback to validate review date")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "Child details are fetched"),
+        @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content)})
+    public CallbackResponse validateReviewDate(@RequestBody CallbackRequest callbackRequest) {
+        if (!featureToggleService.isAwaitingInformationEnabled()) {
+            return CallbackResponse.builder()
+                .errors(emptyList())
+                .build();
+        }
+        CallbackResponse build = CallbackResponse.builder()
+            .errors(requestFurtherInformationService.validate(callbackRequest))
+            .build();
+        return build;
+    }
+
+    @PostMapping(path = "/history-update", consumes = APPLICATION_JSON, produces = APPLICATION_JSON)
+    @Operation(description = "Callback to update History Tab with Awaiting Information . Returns service request reference if "
+        + "successful")
+    @ApiResponses(value = {
+        @ApiResponse(responseCode = "200", description = "Callback processed.",
+            content = @Content(mediaType = "application/json",
+                schema = @Schema(implementation = uk.gov.hmcts.reform.ccd.client.model.CallbackResponse.class))),
+        @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content)})
+    public ResponseEntity<SubmittedCallbackResponse> historyUpdated(
+        @RequestHeader(HttpHeaders.AUTHORIZATION) @Parameter(hidden = true) String authorisation,
+        @RequestHeader(PrlAppsConstants.SERVICE_AUTHORIZATION_HEADER) String s2sToken,
+        @RequestBody CallbackRequest callbackRequest) {
+        if (authorisationService.isAuthorized(authorisation, s2sToken)
+            && featureToggleService.isAwaitingInformationEnabled()) {
+            requestFurtherInformationService.updateHistoryTab(callbackRequest);
+            return ok(SubmittedCallbackResponse.builder().build());
+        }
+        throw (new RuntimeException(INVALID_CLIENT));
+    }
+}

src/main/java/uk/gov/hmcts/reform/prl/enums/CaseEvent.java

@@ -76,7 +76,9 @@ public enum CaseEvent {
     AMEND_OTHER_PEOPLE_IN_THE_CASE_REVISED("amendOtherPeopleInTheCaseRevised"),
     APPLICANT_DETAILS("applicantsDetails"),
     REVIEW_ADDITIONAL_APPLICATION("reviewAdditionalApplication"),
-    CLOSE_REVIEW_RA_REQUEST_TASK("closeReviewRARequestTask");
+    CLOSE_REVIEW_RA_REQUEST_TASK("closeReviewRARequestTask"),
+    REQUEST_FURTHER_INFORMATION("requestFurtherInformation"),
+    REQUEST_FURTHER_INFORMATION_HISTORY("requestFurtherInformationHistory");
 
     private final String value;
 

src/main/java/uk/gov/hmcts/reform/prl/enums/State.java

@@ -30,7 +30,9 @@ public enum State {
     READY_FOR_DELETION("READY_FOR_DELETION", "Ready for deletion"),
     DECISION_OUTCOME("DECISION_OUTCOME","Hearing Outcome"),
     PROCEEDS_IN_HERITAGE_SYSTEM("PROCEEDS_IN_HERITAGE_SYSTEM",
-                                "Proceeding in offline mode in familyman system");
+                                "Proceeding in offline mode in familyman system"),
+    AWAITING_INFORMATION("AWAITING_INFORMATION",
+                                    "Awaiting information");
 
     private final String value;
     private final String label;

src/main/java/uk/gov/hmcts/reform/prl/enums/awaitinginformation/RequestFurtherInformationReasonEnum.java

@@ -0,0 +1,44 @@
+package uk.gov.hmcts.reform.prl.enums.awaitinginformation;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import lombok.RequiredArgsConstructor;
+import uk.gov.hmcts.reform.prl.enums.CustomEnumSerializer;
+
+@RequiredArgsConstructor
+@JsonSerialize(using = CustomEnumSerializer.class)
+public enum RequestFurtherInformationReasonEnum {
+
+    @JsonProperty("miamFurtherInformation")
+    miamFurtherInformation("miamFurtherInformation", "MIAM - further information required"),
+    @JsonProperty("dwpHmrcWhereaboutsUnknown")
+    dwpHmrcWhereaboutsUnknown("dwpHmrcWhereaboutsUnknown", "DWP/HMRC - whereabouts unknown"),
+    @JsonProperty("applicantFurtherInformation")
+    applicantFurtherInformation("applicantFurtherInformation", "Applicant - further information required"),
+    @JsonProperty("applicantClarifyConfidentialDetails")
+    applicantClarifyConfidentialDetails("applicantClarifyConfidentialDetails", "Applicant - clarify confidential details"),
+    @JsonProperty("respondentFurtherInformation")
+    respondentFurtherInformation("respondentFurtherInformation", "Respondent - further information required"),
+    @JsonProperty("helpWithFeesFurtherAction")
+    helpWithFeesFurtherAction("helpWithFeesFurtherAction", "Help with Fees - further action required"),
+    @JsonProperty("ctscRefundRequired")
+    ctscRefundRequired("ctscRefundRequired", "CTSC - Refund required"),
+    @JsonProperty("other")
+    other("other", "Another reason that has not been listed");
+
+    private final String id;
+    private final String displayedValue;
+
+    @JsonValue
+    public String getDisplayedValue() {
+        return displayedValue;
+    }
+
+    @JsonCreator
+    public static RequestFurtherInformationReasonEnum getValue(String key) {
+        return RequestFurtherInformationReasonEnum.valueOf(key);
+    }
+
+}

src/main/java/uk/gov/hmcts/reform/prl/models/Features.java

@@ -9,7 +9,8 @@ public enum Features {
 
     IS_BARRISTER_FEATURE_ENABLED("barristerFeatureEnabled"),
     IS_CAFCASS_DATE_TIME_FEATURE_ENABLED("cafcassDateTimeFeatureEnabled"),
-    IS_OS_COURT_LOOKUP_ENABLED("osCourtLookupEnabled");
+    IS_OS_COURT_LOOKUP_ENABLED("osCourtLookupEnabled"),
+    IS_AWAITING_INFORMATION_ENABLED("awaitingInformationEnabled");
 
     private final String name;
 }

src/main/java/uk/gov/hmcts/reform/prl/models/dto/ccd/RequestFurtherInformation.java

@@ -0,0 +1,22 @@
+package uk.gov.hmcts.reform.prl.models.dto.ccd;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import uk.gov.hmcts.reform.prl.enums.awaitinginformation.RequestFurtherInformationReasonEnum;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class RequestFurtherInformation {
+    @JsonProperty("reviewByDate")
+    private LocalDate reviewDate;
+    @JsonProperty("requestFurtherInformationReasonList")
+    private List<RequestFurtherInformationReasonEnum> requestFurtherInformationReasonEnum;
+}

src/main/java/uk/gov/hmcts/reform/prl/services/FeatureToggleService.java

@@ -55,4 +55,8 @@ public boolean isCafcassDateTimeFeatureEnabled() {
     public boolean isOsCourtLookupFeatureEnabled() {
         return isFeatureEnabled(IS_OS_COURT_LOOKUP_ENABLED);
     }
+
+    public boolean isAwaitingInformationEnabled() {
+        return isFeatureEnabled(Features.IS_AWAITING_INFORMATION_ENABLED);
+    }
 }

src/main/java/uk/gov/hmcts/reform/prl/services/HelpWithFeesService.java

@@ -97,7 +97,8 @@ public ResponseEntity<SubmittedCallbackResponse> handleSubmitted() {
     public Map<String, Object> setCaseStatus(CallbackRequest callbackRequest, String authorisation) {
         Map<String, Object> caseDataUpdated = callbackRequest.getCaseDetails().getData();
         CaseData caseData = CaseUtils.getCaseData(callbackRequest.getCaseDetails(), objectMapper);
-        if (callbackRequest.getCaseDetails().getState().equalsIgnoreCase((State.SUBMITTED_NOT_PAID.getValue()))) {
+        if (callbackRequest.getCaseDetails().getState().equalsIgnoreCase(State.SUBMITTED_NOT_PAID.getValue())
+            || callbackRequest.getCaseDetails().getState().equalsIgnoreCase(State.AWAITING_INFORMATION.getValue())) {
             caseDataUpdated.put(CASE_STATUS, CaseStatus.builder()
                 .state(SUBMITTED_PAID.getLabel())
                 .build());
@@ -176,7 +177,10 @@ public Map<String, Object> handleAboutToStart(CaseDetails caseDetails) {
         CaseData caseData = CaseUtils.getCaseData(caseDetails, objectMapper);
 
         if (null != caseData) {
-            if (State.SUBMITTED_NOT_PAID.getValue().equalsIgnoreCase(caseDetails.getState()) && YesOrNo.Yes.equals(caseData.getHelpWithFees())) {
+            if ((State.SUBMITTED_NOT_PAID.getValue().equalsIgnoreCase(caseDetails.getState())
+                || State.AWAITING_INFORMATION.getValue().equalsIgnoreCase(caseDetails.getState()))
+                && YesOrNo.Yes.equals(caseData.getHelpWithFees())) {
+
                 String dynamicElement = String.format("Child arrangements application C100 - %s",
                                                       CommonUtils.formatLocalDateTime(caseData.getCaseSubmittedTimeStamp(),
                                                                                       DATE_TIME_OF_SUBMISSION_FORMAT));
@@ -236,7 +240,8 @@ public Map<String, Object> populateHwfDynamicData(CaseDetails caseDetails) {
         CaseData caseData = CaseUtils.getCaseData(caseDetails, objectMapper);
         Map<String, Object> caseDataUpdated = caseDetails.getData();
         log.info("case state :" + caseDetails.getState());
-        if (State.SUBMITTED_NOT_PAID.getValue().equalsIgnoreCase(caseDetails.getState())) {
+        if (State.SUBMITTED_NOT_PAID.getValue().equalsIgnoreCase(caseDetails.getState())
+            || State.AWAITING_INFORMATION.getValue().equalsIgnoreCase(caseDetails.getState())) {
             log.info("populate data for C100 application");
             caseDataUpdated.put(HWF_APPLICATION_DYNAMIC_DATA_LABEL,
                                 String.format(