FPVTL-2392- Path finder changes for auto set

Dockerfile

@@ -1,7 +1,7 @@
 ARG APP_INSIGHTS_AGENT_VERSION=3.7.1
 
 # Application image
-FROM hmctsprod.azurecr.io/base/java:21-distroless
+FROM hmctspublic.azurecr.io/base/java:21-distroless
 
 # Change to non-root privilege
 USER hmcts

README.md

@@ -1,6 +1,5 @@
 # prl-cos-api
 
-
 [![Build Status](https://travis-ci.org/hmcts/prl-cos-api.svg?branch=master)](https://travis-ci.org/hmcts/prl-cos-api)
 
 ## Notes

charts/prl-cos/Chart.yaml

@@ -3,10 +3,10 @@ appVersion: "1.0"
 description: A Helm chart for prl-cos-api App
 name: prl-cos
 home: https://github.com/hmcts/prl-cos-api
-version: 0.0.70
+version: 0.0.69
 maintainers:
   - name: HMCTS Family Private Law team
 dependencies:
   - name: java
     version: 5.3.0
-    repository: 'oci://hmctsprod.azurecr.io/helm'
+    repository: 'oci://hmctspublic.azurecr.io/helm'

docker-compose.yml

@@ -6,7 +6,7 @@ services:
         - http_proxy
         - https_proxy
         - no_proxy
-    image: hmctsprod.azurecr.io/spring-boot/template
+    image: hmctspublic.azurecr.io/spring-boot/template
     environment:
       # these environment variables are used by java-logging library
       - ROOT_APPENDER

docs/cftlib.md

@@ -26,7 +26,7 @@ There is currently no support for
 The first time cftlib is run it needs to download Docker images from the Azure Registry. You must therefore login
 to Azure as follows:
 ```bash
-az acr login --name hmctsprod --subscription DCD-CNP-Prod
+az acr login --name hmctspublic --subscription DCD-CNP-Prod
 az acr login --name hmctsprivate --subscription DCD-CNP-Prod
 ```
 

infrastructure/.terraform-version

@@ -1 +1 @@
-1.14.8
+1.14.7

src/cftlib/resources/cftlib-am-role-assignments.json

@@ -1124,224 +1124,5 @@
         }
       }
     ]
-  },
-  {
-    "email": "prl-aat-superuser@justice.gov.uk",
-    "id": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-    "roleAssignments": [
-      {
-        "id": "953f4f99-6c21-4a1a-a6e5-2d2f98a5b799",
-        "actorIdType": "IDAM",
-        "actorId": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-        "roleType": "ORGANISATION",
-        "roleName": "hearing-manager",
-        "classification": "PUBLIC",
-        "grantType": "STANDARD",
-        "roleCategory": "CTSC",
-        "readOnly": false,
-        "created": "2025-05-16T13:40:59.631096Z",
-        "attributes": {
-          "substantive": "N",
-          "primaryLocation": "234946",
-          "jurisdiction": "PRIVATELAW"
-        }
-      },
-      {
-        "id": "00923682-3331-4467-acc3-f28d06843759",
-        "actorIdType": "IDAM",
-        "actorId": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-        "roleType": "ORGANISATION",
-        "roleName": "task-supervisor",
-        "classification": "PUBLIC",
-        "grantType": "STANDARD",
-        "roleCategory": "CTSC",
-        "readOnly": false,
-        "created": "2025-05-16T13:40:59.631129Z",
-        "attributes": {
-          "substantive": "N",
-          "primaryLocation": "234946",
-          "jurisdiction": "PRIVATELAW",
-          "workTypes": "routine_work,hearing_work,applications"
-        },
-        "authorisations": [
-          "SKILL:ABA5:CHECKAPPLICATIONC100",
-          "SKILL:ABA5:SERVEAPPLICATIONC100",
-          "SKILL:ABA5:HEARINGMANAGEMENTC100",
-          "SKILL:ABA5:ORDERMANAGEMENTC100",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEC100",
-          "SKILL:ABA5:CHECKAPPLICATIONFL401",
-          "SKILL:ABA5:SERVEAPPLICATIONFL401",
-          "SKILL:ABA5:HEARINGMANAGEMENTFL401",
-          "SKILL:ABA5:ORDERMANAGEMENTFL401",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEFL401",
-          "SKILL:ABA5:GATEKEEPING",
-          "SKILL:ABA5:GATEKEEPINGC100",
-          "SKILL:ABA5:GATEKEEPINGFL401"
-        ]
-      },
-      {
-        "id": "92644aa5-b573-4802-a776-7192753865b8",
-        "actorIdType": "IDAM",
-        "actorId": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-        "roleType": "ORGANISATION",
-        "roleName": "hmcts-ctsc",
-        "classification": "PRIVATE",
-        "grantType": "BASIC",
-        "roleCategory": "CTSC",
-        "readOnly": true,
-        "created": "2025-05-16T13:40:59.63118Z",
-        "attributes": {
-          "substantive": "N"
-        }
-      },
-      {
-        "id": "c5b29c3b-651a-463d-918e-aa52519eb713",
-        "actorIdType": "IDAM",
-        "actorId": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-        "roleType": "ORGANISATION",
-        "roleName": "ctsc-team-leader",
-        "classification": "PUBLIC",
-        "grantType": "STANDARD",
-        "roleCategory": "CTSC",
-        "readOnly": false,
-        "created": "2025-05-16T13:40:59.631185Z",
-        "attributes": {
-          "substantive": "Y",
-          "primaryLocation": "234946",
-          "jurisdiction": "PRIVATELAW",
-          "workTypes": "routine_work,hearing_work,applications"
-        },
-        "authorisations": [
-          "SKILL:ABA5:CHECKAPPLICATIONC100",
-          "SKILL:ABA5:SERVEAPPLICATIONC100",
-          "SKILL:ABA5:HEARINGMANAGEMENTC100",
-          "SKILL:ABA5:ORDERMANAGEMENTC100",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEC100",
-          "SKILL:ABA5:CHECKAPPLICATIONFL401",
-          "SKILL:ABA5:SERVEAPPLICATIONFL401",
-          "SKILL:ABA5:HEARINGMANAGEMENTFL401",
-          "SKILL:ABA5:ORDERMANAGEMENTFL401",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEFL401",
-          "SKILL:ABA5:GATEKEEPING",
-          "SKILL:ABA5:GATEKEEPINGC100",
-          "SKILL:ABA5:GATEKEEPINGFL401"
-        ]
-      },
-      {
-        "id": "080b8ded-d101-4af8-bcca-fa487fb4bcc8",
-        "actorIdType": "IDAM",
-        "actorId": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-        "roleType": "ORGANISATION",
-        "roleName": "specific-access-approver-ctsc",
-        "classification": "PUBLIC",
-        "grantType": "STANDARD",
-        "roleCategory": "CTSC",
-        "readOnly": false,
-        "created": "2025-05-16T13:40:59.631201Z",
-        "attributes": {
-          "substantive": "N",
-          "primaryLocation": "234946",
-          "jurisdiction": "PRIVATELAW",
-          "workTypes": "access_requests"
-        },
-        "authorisations": [
-          "SKILL:ABA5:CHECKAPPLICATIONC100",
-          "SKILL:ABA5:SERVEAPPLICATIONC100",
-          "SKILL:ABA5:HEARINGMANAGEMENTC100",
-          "SKILL:ABA5:ORDERMANAGEMENTC100",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEC100",
-          "SKILL:ABA5:CHECKAPPLICATIONFL401",
-          "SKILL:ABA5:SERVEAPPLICATIONFL401",
-          "SKILL:ABA5:HEARINGMANAGEMENTFL401",
-          "SKILL:ABA5:ORDERMANAGEMENTFL401",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEFL401",
-          "SKILL:ABA5:GATEKEEPING",
-          "SKILL:ABA5:GATEKEEPINGC100",
-          "SKILL:ABA5:GATEKEEPINGFL401"
-        ]
-      },
-      {
-        "id": "693e3730-794c-4872-836b-ff51b5f44575",
-        "actorIdType": "IDAM",
-        "actorId": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-        "roleType": "ORGANISATION",
-        "roleName": "hearing-viewer",
-        "classification": "PUBLIC",
-        "grantType": "STANDARD",
-        "roleCategory": "CTSC",
-        "readOnly": false,
-        "created": "2025-05-16T13:40:59.631216Z",
-        "attributes": {
-          "substantive": "N",
-          "primaryLocation": "234946",
-          "jurisdiction": "PRIVATELAW"
-        }
-      },
-      {
-        "id": "1469c0fb-632e-4b86-abbd-55aa206af41a",
-        "actorIdType": "IDAM",
-        "actorId": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-        "roleType": "ORGANISATION",
-        "roleName": "case-allocator",
-        "classification": "PUBLIC",
-        "grantType": "STANDARD",
-        "roleCategory": "CTSC",
-        "readOnly": false,
-        "created": "2025-05-16T13:40:59.631221Z",
-        "attributes": {
-          "substantive": "N",
-          "primaryLocation": "234946",
-          "jurisdiction": "PRIVATELAW"
-        },
-        "authorisations": [
-          "SKILL:ABA5:CHECKAPPLICATIONC100",
-          "SKILL:ABA5:SERVEAPPLICATIONC100",
-          "SKILL:ABA5:HEARINGMANAGEMENTC100",
-          "SKILL:ABA5:ORDERMANAGEMENTC100",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEC100",
-          "SKILL:ABA5:CHECKAPPLICATIONFL401",
-          "SKILL:ABA5:SERVEAPPLICATIONFL401",
-          "SKILL:ABA5:HEARINGMANAGEMENTFL401",
-          "SKILL:ABA5:ORDERMANAGEMENTFL401",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEFL401",
-          "SKILL:ABA5:GATEKEEPING",
-          "SKILL:ABA5:GATEKEEPINGC100",
-          "SKILL:ABA5:GATEKEEPINGFL401"
-        ]
-      },
-      {
-        "id": "db1cfffd-047e-477c-88da-859cd44b6a3b",
-        "actorIdType": "IDAM",
-        "actorId": "aaedee95-6065-481c-b2ea-59f1aa9b8355",
-        "roleType": "ORGANISATION",
-        "roleName": "ctsc",
-        "classification": "PUBLIC",
-        "grantType": "STANDARD",
-        "roleCategory": "CTSC",
-        "readOnly": false,
-        "created": "2025-05-16T13:40:59.631234Z",
-        "attributes": {
-          "substantive": "Y",
-          "primaryLocation": "234946",
-          "jurisdiction": "PRIVATELAW",
-          "workTypes": "routine_work,hearing_work,applications"
-        },
-        "authorisations": [
-          "SKILL:ABA5:CHECKAPPLICATIONC100",
-          "SKILL:ABA5:SERVEAPPLICATIONC100",
-          "SKILL:ABA5:HEARINGMANAGEMENTC100",
-          "SKILL:ABA5:ORDERMANAGEMENTC100",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEC100",
-          "SKILL:ABA5:CHECKAPPLICATIONFL401",
-          "SKILL:ABA5:SERVEAPPLICATIONFL401",
-          "SKILL:ABA5:HEARINGMANAGEMENTFL401",
-          "SKILL:ABA5:ORDERMANAGEMENTFL401",
-          "SKILL:ABA5:REVIEWCORRESPONDENCEFL401",
-          "SKILL:ABA5:GATEKEEPING",
-          "SKILL:ABA5:GATEKEEPINGC100",
-          "SKILL:ABA5:GATEKEEPINGFL401"
-        ]
-      }
-    ]
   }
 ]

src/functionalTest/java/uk/gov/hmcts/reform/prl/controllers/ManageOrdersControllerFunctionalTest.java

@@ -515,10 +515,6 @@ public void givenRequestBody_WhenPostRequestTestSendCafcassCymruOrderEmail() thr
             .body("data.serveOtherPartiesCA", equalTo(null))
             .body("data.cafcassCymruServedOptions", equalTo(null))
             .body("data.emailInformationCaOnlyC47a", equalTo(null))
-            .body("data.localAuthoritySolicitorOrganisationPolicy",
-                  equalTo(null))
-            .body("data.localAuthority.isLocalAuthorityInvolvedInCase",equalTo("No"))
-            .body("data.localAuthority.localAuthoritySolicitorOrganisationName",      equalTo(null))
             .body("data.orderCollection[0].value.serveOrderDetails.cafcassCymruServed",
                   equalTo("Yes"))
             .body("data.orderCollection[0].value.serveOrderDetails.cafcassCymruEmail",

src/functionalTest/resources/requests/cafcass-cymru-send-email-request.json

@@ -17,18 +17,6 @@
       "performingAction": null,
       "judgeLaReviewRequired": null,
       "markedToServeEmailNotification": "No",
-      "localAuthority": {
-        "isLocalAuthorityInvolvedInCase": "Yes",
-        "localAuthoritySolicitorOrganisationName": "Local Authority Private Law AAT Test Organisation"
-      },
-      "localAuthoritySolicitorOrganisationPolicy": {
-        "Organisation": {
-          "OrganisationID": "I1SL2TZ",
-          "OrganisationName": "Local Authority Private Law AAT Test Organisation"
-        },
-        "OrgPolicyReference": null,
-        "OrgPolicyCaseAssignedRole": "[LASOLICITOR]"
-      },
       "applicants": [
         {
           "id": "97e25c77-f915-4b4e-8436-89a0d1678813",
@@ -196,7 +184,7 @@
             },
             "c21OrderOptions": "c21WithdrawApplication",
             "isOrderUploaded": "No",
-            "orderClosesCase": "Yes",
+            "orderClosesCase": "No",
             "serveOrderDetails": {
               "otherParties": "",
               "cafcassServed": "No",

src/integrationTest/java/uk/gov/hmcts/reform/prl/controllers/ResubmitControllerIntegrationTest.java

@@ -88,7 +88,7 @@ public void testResubmitApplication() throws Exception {
     @Test
     public void testFl401ResubmitApplication() throws Exception {
         String url = "/fl401/resubmit-application";
-        String jsonRequest = ResourceLoader.loadJson("requests/fl401-resubmit-application.json");
+        String jsonRequest = ResourceLoader.loadJson("CallbackRequest.json");
 
         when(authorisationService.isAuthorized(anyString(), anyString())).thenReturn(true);
 

src/integrationTest/java/uk/gov/hmcts/reform/prl/controllers/cafcass/CafCassControllerIntegrationTest.java

@@ -4,6 +4,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -19,15 +20,13 @@
 import uk.gov.hmcts.reform.prl.services.cafcass.CafcassCaseDataService;
 
 import java.util.ArrayList;
-import java.util.List;
 import java.util.Optional;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.setup.MockMvcBuilders.webAppContextSetup;
-import static uk.gov.hmcts.reform.prl.constants.cafcass.CafcassAppConstants.CAFCASS_USER_ROLE;
 import static uk.gov.hmcts.reform.prl.util.TestConstants.AUTHORISATION_HEADER;
 import static uk.gov.hmcts.reform.prl.util.TestConstants.CAFCASS_END_DATE_PARAM;
 import static uk.gov.hmcts.reform.prl.util.TestConstants.CAFCASS_END_DATE_PARAM_VALUE;
@@ -68,11 +67,10 @@ public void setUp() {
 
     @Test
     public void givenValidDatetimeRangeSearchCasesByCafCassControllerReturnOkStatus() throws Exception {
-        when(userInfo.getRoles()).thenReturn(List.of(CAFCASS_USER_ROLE));
-        when(authorisationService.authoriseService("Bearer " + TEST_SERVICE_AUTH_TOKEN)).thenReturn(true);
-        when(authTokenGenerator.generate()).thenReturn(TEST_SERVICE_AUTH_TOKEN);
-        when(authorisationService.authoriseUser(TEST_AUTH_TOKEN)).thenReturn(Optional.of(userInfo));
-        when(cafcassCaseDataService.getCaseData(anyString(), anyString(), anyString()))
+        Mockito.when(authorisationService.authoriseService(any())).thenReturn(true);
+        Mockito.when(authTokenGenerator.generate()).thenReturn(TEST_SERVICE_AUTH_TOKEN);
+        Mockito.when(authorisationService.authoriseUser(any())).thenReturn(Optional.of(userInfo));
+        Mockito.when(cafcassCaseDataService.getCaseData(anyString(), anyString(), anyString()))
             .thenReturn(CafCassResponse.builder().cases(new ArrayList<>()).build());
 
         mockMvc.perform(get(SEARCH_CASE_ENDPOINT)