Merge branch 'master' into feat/CIV-13154-13155

hmcts · Apr 19, 2024 · 3ced95b · 3ced95b
2 parents 550bb82 + 044c79a
commit 3ced95b
Show file tree

Hide file tree

Showing 37 changed files with 1,491 additions and 908 deletions.
diff --git a/bin/utils/ccd-import-definition.sh b/bin/utils/ccd-import-definition.sh
@@ -15,7 +15,7 @@ serviceToken=$(${dir}/idam-lease-service-token.sh ccd_gw $(docker run --rm toolb
 version="n/a"
 newVersion="n/a"
 
-if [[ "${ENVIRONMENT}" == "preview" ]]; then
+if [ "${ENVIRONMENT}" == "preview" ] || [ "${ENVIRONMENT}" == "aat" ]; then
   version=$(curl --insecure --silent --show-error -X GET \
     ${CCD_DEFINITION_STORE_API_BASE_URL:-http://localhost:4451}/api/data/case-type/CIVIL/version \
     -H "Authorization: Bearer ${userToken}" \
@@ -33,7 +33,8 @@ uploadResponse=$(curl --insecure --silent -w "\n%{http_code}"  --show-error --ma
 upload_http_code=$(echo "$uploadResponse" | tail -n1)
 upload_response_content=$(echo "$uploadResponse" | sed '$d')
 
-if [ "${ENVIRONMENT}" == "preview" ] && [ "${upload_http_code}" != "201" ]; then
+if [ "${ENVIRONMENT}" == "preview" ] || [ "${ENVIRONMENT}" == "aat" ]; then
+ if [ "${upload_http_code}" != "201" ]; then
   echo "Bypassing audit check as on preview - will wait 45s and then verify the version has changed"
   sleep 45
 
@@ -47,7 +48,7 @@ if [ "${ENVIRONMENT}" == "preview" ] && [ "${upload_http_code}" != "201" ]; then
       echo "Version has not changed - the definition was not imported successfully"
       exit 1
     fi
-
+ fi
   echo "CCD definition version has changed, definition successfully uploaded"
   exit 0
 fi

diff --git a/charts/civil-camunda/values.aat.template.yaml b/charts/civil-camunda/values.aat.template.yaml
@@ -102,9 +102,7 @@ java:
     CMC_DB_PASSWORD: ${POSTGRES_PASSWORD}
     CMC_DB_CONNECTION_OPTIONS: '?sslmode=allow'
     REFERENCE_DATABASE_MIGRATION: true
-    FEIGN_CLIENT_CONFIG_REMOTERUNTIMESERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
-    FEIGN_CLIENT_CONFIG_REMOTEEXTERNALTASKSERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
-    FEIGN_CLIENT_CONFIG_REMOTEREPOSITORYSERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
+    CAMUNDA_URL: http://${SERVICE_NAME}-camunda/engine-rest/
     TESTING_SUPPORT_ENABLED: true
     POLLING_EVENT_EMITTER_ENABLED: false
     LAUNCH_DARKLY_ENV: camunda-staging

diff --git a/charts/civil-camunda/values.preview.template.yaml b/charts/civil-camunda/values.preview.template.yaml
@@ -106,9 +106,7 @@ java:
     CMC_DB_USERNAME: "{{ .Values.postgresql.auth.username}}"
     CMC_DB_PASSWORD: "{{ .Values.postgresql.auth.password}}"
     REFERENCE_DATABASE_MIGRATION: true
-    FEIGN_CLIENT_CONFIG_REMOTERUNTIMESERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
-    FEIGN_CLIENT_CONFIG_REMOTEEXTERNALTASKSERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
-    FEIGN_CLIENT_CONFIG_REMOTEREPOSITORYSERVICE_URL: http://${SERVICE_NAME}-camunda/engine-rest/
+    CAMUNDA_URL: http://${SERVICE_NAME}-camunda/engine-rest/
     STITCHING_API_ENABLED: false
     POLLING_EVENT_EMITTER_ENABLED: false
     SERVICE_REQUEST_UPDATE: https://${SERVICE_FQDN}/service-request-update

diff --git a/src/main/resources/camunda/applicant_trial_ready_notify_others.bpmn b/src/main/resources/camunda/applicant_trial_ready_notify_others.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0rn46su" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.13.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="Definitions_0rn46su" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.9.0">
   <bpmn:process id="APPLICANT_TRIAL_READY_NOTIFY_OTHERS" name="Applicant trial ready notify others" isExecutable="true">
     <bpmn:startEvent id="Event_0t2zome" name="Start">
       <bpmn:outgoing>Flow_08myj65</bpmn:outgoing>
@@ -14,6 +14,7 @@
         <camunda:in variables="all" />
       </bpmn:extensionElements>
       <bpmn:incoming>Flow_1mcw97n</bpmn:incoming>
+      <bpmn:incoming>Flow_1ui9efm</bpmn:incoming>
       <bpmn:outgoing>Flow_1hce35l</bpmn:outgoing>
     </bpmn:callActivity>
     <bpmn:serviceTask id="OtherTrialReadyNotifyRespondentSolicitor1" name="Notify Respondent solicitor 1" camunda:type="external" camunda:topic="processCaseEvent">
@@ -75,17 +76,28 @@
       <bpmn:incoming>Flow_1gsn98m</bpmn:incoming>
       <bpmn:outgoing>Flow_0g0jkyp</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_0g0jkyp" sourceRef="GenerateTrialReadyFormApplicant" targetRef="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty" />
+    <bpmn:sequenceFlow id="Flow_0g0jkyp" sourceRef="GenerateTrialReadyFormApplicant" targetRef="Gateway_01l4u29" />
     <bpmn:serviceTask id="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty" name="Generate Dashboard Notification For Defendant" camunda:type="external" camunda:topic="processCaseEvent">
       <bpmn:extensionElements>
         <camunda:inputOutput>
           <camunda:inputParameter name="caseEvent">CREATE_DASHBOARD_NOTIFICATION_TRIAL_ARRANGEMENTS_NOTIFY_DEFENDANT</camunda:inputParameter>
         </camunda:inputOutput>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_0g0jkyp</bpmn:incoming>
+      <bpmn:incoming>Flow_1lr6m8a</bpmn:incoming>
       <bpmn:outgoing>Flow_1mcw97n</bpmn:outgoing>
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_1mcw97n" sourceRef="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty" targetRef="Activity_0wretog" />
+    <bpmn:exclusiveGateway id="Gateway_01l4u29">
+      <bpmn:incoming>Flow_0g0jkyp</bpmn:incoming>
+      <bpmn:outgoing>Flow_1lr6m8a</bpmn:outgoing>
+      <bpmn:outgoing>Flow_1ui9efm</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_1lr6m8a" name="Dashboard Service Enabled" sourceRef="Gateway_01l4u29" targetRef="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!empty flowFlags.DASHBOARD_SERVICE_ENABLED &amp;&amp; flowFlags.DASHBOARD_SERVICE_ENABLED}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_1ui9efm" name="Dashboard Service Disabled" sourceRef="Gateway_01l4u29" targetRef="Activity_0wretog">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${empty flowFlags.DASHBOARD_SERVICE_ENABLED || !flowFlags.DASHBOARD_SERVICE_ENABLED}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
     <bpmn:textAnnotation id="TextAnnotation_0i3yd0i">
       <bpmn:text>Two Respondent Representatives?</bpmn:text>
     </bpmn:textAnnotation>
@@ -102,6 +114,10 @@
           <dc:Bounds x="158" y="285" width="25" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_03lhz3m_di" bpmnElement="OtherTrialReadyNotifyRespondentSolicitor1">
+        <dc:Bounds x="630" y="220" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_0emdthr_di" bpmnElement="TrialReadyProcess">
         <dc:Bounds x="230" y="220" width="100" height="80" />
       </bpmndi:BPMNShape>
@@ -114,24 +130,23 @@
       <bpmndi:BPMNShape id="Activity_1dxqaq3_di" bpmnElement="OtherTrialReadyNotifyRespondentSolicitor2">
         <dc:Bounds x="540" y="90" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_07kc2xy_di" bpmnElement="GenerateTrialReadyFormApplicant">
+        <dc:Bounds x="770" y="220" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="TextAnnotation_0i3yd0i_di" bpmnElement="TextAnnotation_0i3yd0i">
         <dc:Bounds x="422" y="310" width="120" height="40" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_03lhz3m_di" bpmnElement="OtherTrialReadyNotifyRespondentSolicitor1">
-        <dc:Bounds x="630" y="220" width="100" height="80" />
-        <bpmndi:BPMNLabel />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_07kc2xy_di" bpmnElement="GenerateTrialReadyFormApplicant">
-        <dc:Bounds x="770" y="220" width="100" height="80" />
+      <bpmndi:BPMNShape id="Gateway_01l4u29_di" bpmnElement="Gateway_01l4u29" isMarkerVisible="true">
+        <dc:Bounds x="905" y="235" width="50" height="50" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0r8yo0r_di" bpmnElement="Event_0r8yo0r">
-        <dc:Bounds x="1192" y="242" width="36" height="36" />
+        <dc:Bounds x="1392" y="242" width="36" height="36" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Activity_1x5rl4x_di" bpmnElement="Activity_0wretog">
-        <dc:Bounds x="1050" y="220" width="100" height="80" />
+        <dc:Bounds x="1230" y="220" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_0axnyik" bpmnElement="GenerateDefendantDashboardNotificationTrialArrangementsNotifyParty">
-        <dc:Bounds x="920" y="220" width="100" height="80" />
+        <dc:Bounds x="1050" y="220" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_1fn0bf1_di" bpmnElement="Event_1fn0bf1">
@@ -141,8 +156,8 @@
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="Flow_1hce35l_di" bpmnElement="Flow_1hce35l">
-        <di:waypoint x="1150" y="260" />
-        <di:waypoint x="1192" y="260" />
+        <di:waypoint x="1330" y="260" />
+        <di:waypoint x="1392" y="260" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1gsn98m_di" bpmnElement="Flow_1gsn98m">
         <di:waypoint x="730" y="260" />
@@ -182,15 +197,31 @@
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0g0jkyp_di" bpmnElement="Flow_0g0jkyp">
         <di:waypoint x="870" y="260" />
-        <di:waypoint x="920" y="260" />
+        <di:waypoint x="905" y="260" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1mcw97n_di" bpmnElement="Flow_1mcw97n">
+        <di:waypoint x="1150" y="260" />
+        <di:waypoint x="1230" y="260" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Association_0ycet74_di" bpmnElement="Association_0ycet74">
         <di:waypoint x="470" y="285" />
         <di:waypoint x="470" y="310" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1mcw97n_di" bpmnElement="Flow_1mcw97n">
-        <di:waypoint x="1020" y="260" />
+      <bpmndi:BPMNEdge id="Flow_1lr6m8a_di" bpmnElement="Flow_1lr6m8a">
+        <di:waypoint x="955" y="260" />
         <di:waypoint x="1050" y="260" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="949" y="266" width="81" height="27" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1ui9efm_di" bpmnElement="Flow_1ui9efm">
+        <di:waypoint x="930" y="235" />
+        <di:waypoint x="930" y="130" />
+        <di:waypoint x="1280" y="130" />
+        <di:waypoint x="1280" y="220" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="938" y="136" width="83" height="27" />
+        </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>