preview environment fix

Jenkinsfile_CNP

@@ -7,6 +7,7 @@ import uk.gov.hmcts.contino.AppPipelineDsl
 def type = "java"
 def product = "civil"
 def component = "general-apps-ccd-definition"
+def camundaBranch = "master"
 AppPipelineConfig pipelineConf
 
 static Map<String, Object> secret(String secretName, String envVariable) {
@@ -81,8 +82,8 @@ withPipeline(type, product, component) {
           ./bin/pull-latest-release-asset.sh civil-ccd-definition civil-ccd-definition.zip
           ./bin/pull-latest-release-asset.sh civil-general-apps-ccd-definition civil-general-apps-ccd-definition.zip
           ./bin/pull-latest-release-asset.sh civil-camunda-bpmn-definition civil-camunda-bpmn-definition.zip
-          #./bin/import-ccd-definition.sh "-e *-prod.json,*-nonprod.json,*LRspec.json"
-          #./bin/import-general-apps-ccd-definition.sh "-e *-prod.json,*-nonprod.json,*LRspec.json"
+          ./bin/import-ccd-definition.sh "-e *-prod.json,*-nonprod.json,*LRspec.json"
+          ./bin/import-general-apps-ccd-definition.sh "-e *-prod.json,*-nonprod.json,*LRspec.json"
           ./bin/import-bpmn-diagram.sh .
         """
         env.URL="https://xui-civil-general-apps-ccd-definition-pr-${CHANGE_ID}.service.core-compute-preview.internal"

bin/add-roles.sh

@@ -6,7 +6,7 @@
 ./bin/utils/ccd-add-role.sh "caseworker-approver"
 ./bin/utils/ccd-add-role.sh "prd-admin"
 
-roles=("solicitor" "systemupdate" "admin" "staff")
+roles=("solicitor" "systemupdate" "admin" "staff" "judge")
 for role in "${roles[@]}"
 do
   ./bin/utils/ccd-add-role.sh "caseworker-civil-${role}"

bin/import-general-apps-ccd-definition.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-definition_input_dir=$(realpath 'ccd-definition')
+definition_input_dir=$(realpath 'ga-ccd-definition')
 definition_output_file="$(realpath ".")/build/ccd-development-config/ccd-civil-apps-dev.xlsx"
 params="$@"
 
-./bin/utils/import-ccd-definition.sh "${definition_input_dir}" "${definition_output_file}" "${params}"
+./bin/utils/import-ccd-definition.sh "${definition_input_dir}" "${definition_output_file}" "${params}"

bin/pull-latest-camunda-files.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+branchName=$1
+
+#Checkout specific branch pf  civil camunda bpmn definition 
+git clone https://github.com/hmcts/civil-camunda-bpmn-definition.git
+cd civil-camunda-bpmn-definition
+
+echo "Switch to ${branchName} branch on civil-camunda-bpmn-definition"
+git checkout ${branchName}
+cd ..
+
+#Copy camunda folder to civil-ccd-def which contians bpmn files
+cp -r ./civil-camunda-bpmn-definition/src/main/resources/camunda .
+rm -rf ./civil-camunda-bpmn-definition
+
+#upload bpmn files to environment      
+./bin/import-bpmn-diagram.sh .

bin/variables/load-preview-environment-variables.sh

@@ -14,4 +14,5 @@ echo "export CCD_DEFINITION_STORE_API_BASE_URL=https://ccd-definition-store-civi
 echo "export CAMUNDA_BASE_URL=https://camunda-civil-general-apps-ccd-definition-pr-${pr}.service.core-compute-preview.internal"
 
 # definition placeholders
-echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-service-civil-general-apps-ccd-definition-pr-${pr}.service.core-compute-preview.internal"
+echo "export CCD_DEF_CASE_SERVICE_BASE_URL=http://civil-service-civil-general-apps-ccd-definition-pr-${pr}.service.core-compute-preview.internal"
+echo "export CCD_DEF_GEN_APP_SERVICE_BASE_URL=http://civil-general-apps-ccd-definition-pr-${pr}.service.core-compute-preview.internal"

charts/civil-general-apps-ccd-definition/values.aat.template.yaml

@@ -63,7 +63,7 @@ java:
     DOCUMENT_MANAGEMENT_SECURED: true
 
 idam-pr:
-  releaseNameOverride: ${SERVICE_NAME}-xui-idam-pr
+  releaseNameOverride: ${SERVICE_NAME}-idam-pr
   enabled: true
   redirect_uris:
     XUI:
@@ -141,6 +141,7 @@ ccd:
         IDAM_OAUTH2_DATA_STORE_CLIENT_SECRET: ${IDAM_OAUTH2_DATA_STORE_CLIENT_SECRET}
         IDAM_DATA_STORE_SYSTEM_USER_USERNAME: ${IDAM_DATA_STORE_SYSTEM_USER_USERNAME}
         IDAM_DATA_STORE_SYSTEM_USER_PASSWORD: ${IDAM_DATA_STORE_SYSTEM_USER_PASSWORD}
+        ROLE_ASSIGNMENT_URL: http://${SERVICE_NAME}-am-role-assignment-serv
       keyVaults: []
       ingressHost: civil-ga-ccd-service-data-store-staging-aat.service.core-compute-aat.internal
   am-role-assignment-service:

charts/civil-general-apps-ccd-definition/values.preview.template.yaml

@@ -45,7 +45,7 @@ java:
         - launch-darkly-sdk-key
         - robotics-notification-multipartyrecipient
   environment:
-    CORE_CASE_DATA_API_URL: http://${SERVICE_NAME}-ccd-data-store-api
+    CORE_CASE_DATA_API_URL: http://ccd-data-store-api-${SERVICE_FQDN}
     OIDC_ISSUER: https://forgerock-am.service.core-compute-idam-aat2.internal:8443/openam/oauth2/realms/root/realms/hmcts
     CMC_DB_HOST: ${SERVICE_NAME}-postgresql
     CMC_DB_USERNAME: ${POSTGRES_USER}
@@ -201,6 +201,7 @@ ccd:
         IDAM_OAUTH2_DATA_STORE_CLIENT_SECRET: ${IDAM_OAUTH2_DATA_STORE_CLIENT_SECRET}
         IDAM_DATA_STORE_SYSTEM_USER_USERNAME: ${IDAM_DATA_STORE_SYSTEM_USER_USERNAME}
         IDAM_DATA_STORE_SYSTEM_USER_PASSWORD: ${IDAM_DATA_STORE_SYSTEM_USER_PASSWORD}
+        ROLE_ASSIGNMENT_URL: http://${SERVICE_NAME}-am-role-assignment-serv
       keyVaults: []
       ingressHost: ccd-data-store-api-${SERVICE_FQDN}
   am-role-assignment-service:

ccd-definition/Banner.json → ga-ccd-definition/Banner.json

@@ -1,6 +1,6 @@
-[
-  {
-    "BannerEnabled": "No",
-    "BannerDescription": " "
-  }
-]
+[
+  {
+    "BannerEnabled": "No",
+    "BannerDescription": " "
+  }
+]

ccd-definition/CaseEventToFields/ApplicationResponseGAspec.json → ga-ccd-definition/CaseEventToFields/ApplicationResponseGAspec.json

@@ -1,26 +1,26 @@
-[
-    {
-        "CaseTypeID": "GENERALAPPLICATION",
-        "CaseEventID": "RESPOND_TO_APPLICATION",
-        "CaseFieldID": "generalAppRespondent1Representative",
-        "DisplayContext": "MANDATORY",
-        "PageID": "GARespondent1RespScreen",
-        "PageDisplayOrder": 1,
-        "PageFieldDisplayOrder": 1,
-        "PageColumnNumber": 1,
-        "ShowSummaryChangeOption": "Y"
-    },
-    {
-        "CaseTypeID": "GENERALAPPLICATION",
-        "CaseEventID": "RESPOND_TO_APPLICATION",
-        "CaseFieldID": "hearingDetailsResp",
-        "DisplayContext": "COMPLEX",
-        "PageID": "GARespHearingScreen",
-        "CallBackURLMidEvent": "${CCD_DEF_GEN_APP_SERVICE_BASE_URL}/cases/callbacks/mid/hearing-screen-response",
-        "RetriesTimeoutURLMidEvent": 0,
-        "PageDisplayOrder": 2,
-        "PageFieldDisplayOrder": 2,
-        "PageColumnNumber": 1,
-        "ShowSummaryChangeOption": "Y"
-    }
+[
+    {
+        "CaseTypeID": "GENERALAPPLICATION",
+        "CaseEventID": "RESPOND_TO_APPLICATION",
+        "CaseFieldID": "generalAppRespondent1Representative",
+        "DisplayContext": "MANDATORY",
+        "PageID": "GARespondent1RespScreen",
+        "PageDisplayOrder": 1,
+        "PageFieldDisplayOrder": 1,
+        "PageColumnNumber": 1,
+        "ShowSummaryChangeOption": "Y"
+    },
+    {
+        "CaseTypeID": "GENERALAPPLICATION",
+        "CaseEventID": "RESPOND_TO_APPLICATION",
+        "CaseFieldID": "hearingDetailsResp",
+        "DisplayContext": "COMPLEX",
+        "PageID": "GARespHearingScreen",
+        "CallBackURLMidEvent": "${CCD_DEF_GEN_APP_SERVICE_BASE_URL}/cases/callbacks/mid/hearing-screen-response",
+        "RetriesTimeoutURLMidEvent": 0,
+        "PageDisplayOrder": 2,
+        "PageFieldDisplayOrder": 2,
+        "PageColumnNumber": 1,
+        "ShowSummaryChangeOption": "Y"
+    }
 ]

ccd-definition/CaseRoles.json → ga-ccd-definition/CaseRoles.json

@@ -1,50 +1,50 @@
-[
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "[APPLICANTSOLICITORONE]",
-    "Name": "Applicant Solicitor 1",
-    "Description": "Applicant Solicitor 1 role",
-    "JurisdictionID": "CIVIL",
-    "SecurityClassification": "Public"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "[APPLICANTSOLICITORTWO]",
-    "Name": "Applicant Solicitor 2",
-    "Description": "Applicant Solicitor 2 role",
-    "JurisdictionID": "CIVIL",
-    "SecurityClassification": "Public"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "[RESPONDENTSOLICITORONE]",
-    "Name": "Respondent Solicitor 1",
-    "Description": "Respondent Solicitor 1 role",
-    "JurisdictionID": "CIVIL",
-    "SecurityClassification": "Public"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "[RESPONDENTSOLICITORTWO]",
-    "Name": "Respondent Solicitor 2",
-    "Description": "Respondent Solicitor 2 role",
-    "JurisdictionID": "CIVIL",
-    "SecurityClassification": "Public"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "[CREATOR]",
-    "Name": "Creator",
-    "Description": "Creator of case",
-    "JurisdictionID": "CIVIL",
-    "SecurityClassification": "Public"
-  },
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "ID": "[JUDGE]",
-    "Name": "Judge",
-    "Description": "Judge",
-    "JurisdictionID": "CIVIL",
-    "SecurityClassification": "Public"
-  }
-]
+[
+  {
+    "CaseTypeID": "GENERALAPPLICATION",
+    "ID": "[APPLICANTSOLICITORONE]",
+    "Name": "Applicant Solicitor 1",
+    "Description": "Applicant Solicitor 1 role",
+    "JurisdictionID": "CIVIL",
+    "SecurityClassification": "Public"
+  },
+  {
+    "CaseTypeID": "GENERALAPPLICATION",
+    "ID": "[APPLICANTSOLICITORTWO]",
+    "Name": "Applicant Solicitor 2",
+    "Description": "Applicant Solicitor 2 role",
+    "JurisdictionID": "CIVIL",
+    "SecurityClassification": "Public"
+  },
+  {
+    "CaseTypeID": "GENERALAPPLICATION",
+    "ID": "[RESPONDENTSOLICITORONE]",
+    "Name": "Respondent Solicitor 1",
+    "Description": "Respondent Solicitor 1 role",
+    "JurisdictionID": "CIVIL",
+    "SecurityClassification": "Public"
+  },
+  {
+    "CaseTypeID": "GENERALAPPLICATION",
+    "ID": "[RESPONDENTSOLICITORTWO]",
+    "Name": "Respondent Solicitor 2",
+    "Description": "Respondent Solicitor 2 role",
+    "JurisdictionID": "CIVIL",
+    "SecurityClassification": "Public"
+  },
+  {
+    "CaseTypeID": "GENERALAPPLICATION",
+    "ID": "[CREATOR]",
+    "Name": "Creator",
+    "Description": "Creator of case",
+    "JurisdictionID": "CIVIL",
+    "SecurityClassification": "Public"
+  },
+  {
+    "CaseTypeID": "GENERALAPPLICATION",
+    "ID": "[JUDGE]",
+    "Name": "Judge",
+    "Description": "Judge",
+    "JurisdictionID": "CIVIL",
+    "SecurityClassification": "Public"
+  }
+]

ccd-definition/CaseType.json → ga-ccd-definition/CaseType.json

@@ -1,10 +1,10 @@
-[
-  {
-    "LiveFrom": "22/11/2021",
-    "ID": "GENERALAPPLICATION",
-    "Name": "Civil General Application",
-    "Description": "Civil General Application",
-    "JurisdictionID": "CIVIL",
-    "SecurityClassification": "Public"
-  }
-]
+[
+  {
+    "LiveFrom": "22/11/2021",
+    "ID": "GENERALAPPLICATION",
+    "Name": "Civil General Application",
+    "Description": "Civil General Application",
+    "JurisdictionID": "CIVIL",
+    "SecurityClassification": "Public"
+  }
+]

ccd-definition/ComplexTypes/GARespondentRepresentativeGAspec.json → ga-ccd-definition/ComplexTypes/GARespondentRepresentativeGAspec.json

@@ -1,10 +1,10 @@
-[
-    {
-      "ID": "GARespondentRepresentativeGAspec",
-      "ListElementCode": "hasAgreed",
-      "FieldType": "YesOrNo",
-      "ElementLabel": " ",
-      "SecurityClassification": "Public"
-    }
-  ]
+[
+    {
+      "ID": "GARespondentRepresentativeGAspec",
+      "ListElementCode": "hasAgreed",
+      "FieldType": "YesOrNo",
+      "ElementLabel": " ",
+      "SecurityClassification": "Public"
+    }
+  ]
 

ccd-definition/Jurisdiction.json → ga-ccd-definition/Jurisdiction.json

@@ -1,9 +1,9 @@
-[
-  {
-    "LiveFrom": "22/11/2021",
-    "ID": "CIVIL",
-    "Name": "Civil",
-    "Description": "Civil Jurisdiction",
-    "Shuttered": false
-  }
-]
+[
+  {
+    "LiveFrom": "22/11/2021",
+    "ID": "CIVIL",
+    "Name": "Civil",
+    "Description": "Civil Jurisdiction",
+    "Shuttered": false
+  }
+]

ccd-definition/SearchInputFields.json → ga-ccd-definition/SearchInputFields.json

@@ -1,8 +1,8 @@
-[
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "[CASE_REFERENCE]",
-    "Label": "CCD Case Number",
-    "DisplayOrder": 1
-  }
-]
+[
+  {
+    "CaseTypeID": "GENERALAPPLICATION",
+    "CaseFieldID": "[CASE_REFERENCE]",
+    "Label": "CCD Case Number",
+    "DisplayOrder": 1
+  }
+]

ccd-definition/SearchResultFields.json → ga-ccd-definition/SearchResultFields.json

@@ -1,8 +1,8 @@
-[
-  {
-    "CaseTypeID": "GENERALAPPLICATION",
-    "CaseFieldID": "[CASE_REFERENCE]",
-    "Label": "CCD Case Number",
-    "DisplayOrder": 1
-  }
-]
+[
+  {
+    "CaseTypeID": "GENERALAPPLICATION",
+    "CaseFieldID": "[CASE_REFERENCE]",
+    "Label": "CCD Case Number",
+    "DisplayOrder": 1
+  }
+]