Merge branch 'master' into feat/civ-15759

hmcts · Dec 11, 2024 · 3204b9e · 3204b9e
2 parents 0442e72 + d85eab1
commit 3204b9e
Show file tree

Hide file tree

Showing 30 changed files with 1,267 additions and 549 deletions.
diff --git a/charts/civil-camunda/values.preview.template.yaml b/charts/civil-camunda/values.preview.template.yaml
@@ -114,6 +114,7 @@ java:
     HMC_HEARINGS_SUBSCRIPTION_ENABLED: false
     ACA_SERVICE_API_BASEURL: http://${SERVICE_NAME}-aac-manage-case-assignment
     HMC_API_URL: http://${SERVICE_NAME}-wiremock
+    ROLE_ASSIGNMENT_URL: http://am-role-assignment-service-aat.service.core-compute-aat.internal
   postgresql:
     enabled: true
     releaseNameOverride: ${SERVICE_NAME}-postgresql

diff --git a/src/main/resources/camunda/amend_restitch_bundle.bpmn b/src/main/resources/camunda/amend_restitch_bundle.bpmn
@@ -53,11 +53,11 @@
           <camunda:inputParameter name="caseEvent">NOTIFY_DEFENDANT_AMEND_RESTITCH_BUNDLE</camunda:inputParameter>
         </camunda:inputOutput>
       </bpmn:extensionElements>
-      <bpmn:incoming>Flow_1fxs0vt25554</bpmn:incoming>
-      <bpmn:outgoing>Flow_1xckrvu544555</bpmn:outgoing>
+      <bpmn:incoming>Flow_1515e3t</bpmn:incoming>
+      <bpmn:incoming>Flow_0vsvlpk</bpmn:incoming>
+      <bpmn:outgoing>Flow_1vazhq9</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="Flow_1xckrvu544555" sourceRef="NotifyDefendantAmendRestitchBundle" targetRef="Gateway_1ara2em" />
-    <bpmn:sequenceFlow id="Flow_1fxs0vt25554" sourceRef="NotifyClaimantAmendRestitchBundle" targetRef="NotifyDefendantAmendRestitchBundle" />
+    <bpmn:sequenceFlow id="Flow_1fxs0vt25554" sourceRef="NotifyClaimantAmendRestitchBundle" targetRef="Gateway_1s2jdns" />
     <bpmn:serviceTask id="CreateAmendRestitchBundleDashboardNotificationsForClaimant" name="Create Dashboard Notification For Claimant" camunda:type="external" camunda:topic="processCaseEvent">
       <bpmn:extensionElements>
         <camunda:inputOutput>
@@ -79,7 +79,7 @@
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_0qh9s34" sourceRef="CreateAmendRestitchBundleDashboardNotificationsForDefendant" targetRef="Activity_120199855" />
     <bpmn:exclusiveGateway id="Gateway_1ara2em">
-      <bpmn:incoming>Flow_1xckrvu544555</bpmn:incoming>
+      <bpmn:incoming>Flow_1vazhq9</bpmn:incoming>
       <bpmn:outgoing>Flow_08c69yt</bpmn:outgoing>
       <bpmn:outgoing>Flow_1fo8l9v</bpmn:outgoing>
     </bpmn:exclusiveGateway>
@@ -89,26 +89,60 @@
     <bpmn:sequenceFlow id="Flow_1fo8l9v" name="CUI Case Progression Disabled" sourceRef="Gateway_1ara2em" targetRef="Activity_120199855">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${empty flowFlags.CASE_PROGRESSION_ENABLED || !flowFlags.CASE_PROGRESSION_ENABLED}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
+    <bpmn:exclusiveGateway id="Gateway_1s2jdns">
+      <bpmn:incoming>Flow_1fxs0vt25554</bpmn:incoming>
+      <bpmn:outgoing>Flow_1515e3t</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0bpbxla</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_1515e3t" sourceRef="Gateway_1s2jdns" targetRef="NotifyDefendantAmendRestitchBundle">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${(!empty flowFlags.ONE_RESPONDENT_REPRESENTATIVE &amp;&amp; flowFlags.ONE_RESPONDENT_REPRESENTATIVE) || (!empty flowFlags.UNREPRESENTED_DEFENDANT_ONE &amp;&amp; flowFlags.UNREPRESENTED_DEFENDANT_ONE)}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_0bpbxla" sourceRef="Gateway_1s2jdns" targetRef="NotifyDefendant2AmendRestitchBundle">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${(!empty flowFlags.TWO_RESPONDENT_REPRESENTATIVES &amp;&amp; flowFlags.TWO_RESPONDENT_REPRESENTATIVES) || (!empty flowFlags.UNREPRESENTED_DEFENDANT_TWO &amp;&amp; flowFlags.UNREPRESENTED_DEFENDANT_TWO)} </bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:serviceTask id="NotifyDefendant2AmendRestitchBundle" name="Notify Defendant 2" camunda:type="external" camunda:topic="processCaseEvent">
+      <bpmn:extensionElements>
+        <camunda:inputOutput>
+          <camunda:inputParameter name="caseEvent">NOTIFY_DEFENDANT_TWO_AMEND_RESTITCH_BUNDLE</camunda:inputParameter>
+        </camunda:inputOutput>
+      </bpmn:extensionElements>
+      <bpmn:incoming>Flow_0bpbxla</bpmn:incoming>
+      <bpmn:outgoing>Flow_0vsvlpk</bpmn:outgoing>
+    </bpmn:serviceTask>
+    <bpmn:sequenceFlow id="Flow_0vsvlpk" sourceRef="NotifyDefendant2AmendRestitchBundle" targetRef="NotifyDefendantAmendRestitchBundle" />
+    <bpmn:sequenceFlow id="Flow_1vazhq9" sourceRef="NotifyDefendantAmendRestitchBundle" targetRef="Gateway_1ara2em" />
   </bpmn:process>
   <bpmn:error id="Error_0lou1w7" name="StartBusinessAbort" errorCode="ABORT" />
   <bpmn:message id="Message_07sm7e9" name="AMEND_RESTITCH_BUNDLE" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="AMEND_RESTITCH_BUNDLE">
+      <bpmndi:BPMNEdge id="Flow_1fo8l9v_di" bpmnElement="Flow_1fo8l9v">
+        <di:waypoint x="890" y="182" />
+        <di:waypoint x="890" y="100" />
+        <di:waypoint x="1320" y="100" />
+        <di:waypoint x="1320" y="166" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="1005" y="50" width="59" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_08c69yt_di" bpmnElement="Flow_08c69yt">
+        <di:waypoint x="915" y="207" />
+        <di:waypoint x="970" y="207" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="910" y="220" width="59" height="40" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0qh9s34_di" bpmnElement="Flow_0qh9s34">
-        <di:waypoint x="1210" y="208" />
-        <di:waypoint x="1260" y="208" />
+        <di:waypoint x="1210" y="206" />
+        <di:waypoint x="1270" y="206" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1qw3fa2_di" bpmnElement="Flow_1qw3fa2545">
-        <di:waypoint x="1070" y="209" />
-        <di:waypoint x="1110" y="209" />
+        <di:waypoint x="1070" y="207" />
+        <di:waypoint x="1110" y="207" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1fxs0vt_di" bpmnElement="Flow_1fxs0vt25554">
         <di:waypoint x="520" y="207" />
-        <di:waypoint x="610" y="207" />
-      </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1xckrvu_di" bpmnElement="Flow_1xckrvu544555">
-        <di:waypoint x="710" y="209" />
-        <di:waypoint x="755" y="209" />
+        <di:waypoint x="585" y="207" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_1a5jscb_di" bpmnElement="Flow_78545522545">
         <di:waypoint x="330" y="207" />
@@ -123,24 +157,25 @@
         <di:waypoint x="280" y="115" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="Flow_0x2wz2v_di" bpmnElement="Flow_5845212254">
-        <di:waypoint x="1360" y="213" />
-        <di:waypoint x="1422" y="213" />
+        <di:waypoint x="1370" y="206" />
+        <di:waypoint x="1422" y="206" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_08c69yt_di" bpmnElement="Flow_08c69yt">
-        <di:waypoint x="805" y="209" />
-        <di:waypoint x="970" y="209" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="850" y="222" width="59" height="40" />
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNEdge id="Flow_1515e3t_di" bpmnElement="Flow_1515e3t">
+        <di:waypoint x="635" y="207" />
+        <di:waypoint x="690" y="207" />
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNEdge id="Flow_1fo8l9v_di" bpmnElement="Flow_1fo8l9v">
-        <di:waypoint x="780" y="184" />
-        <di:waypoint x="780" y="100" />
-        <di:waypoint x="1310" y="100" />
-        <di:waypoint x="1310" y="173" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="930" y="50" width="59" height="40" />
-        </bpmndi:BPMNLabel>
+      <bpmndi:BPMNEdge id="Flow_0bpbxla_di" bpmnElement="Flow_0bpbxla">
+        <di:waypoint x="610" y="232" />
+        <di:waypoint x="610" y="300" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0vsvlpk_di" bpmnElement="Flow_0vsvlpk">
+        <di:waypoint x="660" y="340" />
+        <di:waypoint x="740" y="340" />
+        <di:waypoint x="740" y="250" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1vazhq9_di" bpmnElement="Flow_1vazhq9">
+        <di:waypoint x="790" y="207" />
+        <di:waypoint x="865" y="207" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="Activity_0ipbyde_di" bpmnElement="NotifyClaimantAmendRestitchBundle">
         <dc:Bounds x="420" y="167" width="100" height="80" />
@@ -158,25 +193,32 @@
       <bpmndi:BPMNShape id="Event_1n2x861_di" bpmnElement="Event_55878855778">
         <dc:Bounds x="262" y="79" width="36" height="36" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_1s2jdns_di" bpmnElement="Gateway_1s2jdns" isMarkerVisible="true">
+        <dc:Bounds x="585" y="182" width="50" height="50" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_1smbj8l" bpmnElement="NotifyDefendantAmendRestitchBundle">
-        <dc:Bounds x="610" y="167" width="100" height="80" />
+        <dc:Bounds x="690" y="167" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Gateway_1ara2em_di" bpmnElement="Gateway_1ara2em" isMarkerVisible="true">
-        <dc:Bounds x="755" y="184" width="50" height="50" />
+        <dc:Bounds x="865" y="182" width="50" height="50" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Event_1h61h5s_di" bpmnElement="Event_878884254">
-        <dc:Bounds x="1422" y="195" width="36" height="36" />
-      </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="Activity_1j68eid_di" bpmnElement="Activity_120199855">
-        <dc:Bounds x="1260" y="173" width="100" height="80" />
+      <bpmndi:BPMNShape id="BPMNShape_1qfub25" bpmnElement="CreateAmendRestitchBundleDashboardNotificationsForClaimant">
+        <dc:Bounds x="970" y="167" width="100" height="80" />
+        <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="BPMNShape_0qwga33" bpmnElement="CreateAmendRestitchBundleDashboardNotificationsForDefendant">
-        <dc:Bounds x="1110" y="169" width="100" height="80" />
+        <dc:Bounds x="1110" y="167" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNShape id="BPMNShape_1qfub25" bpmnElement="CreateAmendRestitchBundleDashboardNotificationsForClaimant">
-        <dc:Bounds x="970" y="169" width="100" height="80" />
+      <bpmndi:BPMNShape id="Activity_1j68eid_di" bpmnElement="Activity_120199855">
+        <dc:Bounds x="1270" y="166" width="100" height="80" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1h61h5s_di" bpmnElement="Event_878884254">
+        <dc:Bounds x="1422" y="188" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="BPMNShape_1wcxvje" bpmnElement="NotifyDefendant2AmendRestitchBundle">
+        <dc:Bounds x="560" y="300" width="100" height="80" />
         <bpmndi:BPMNLabel />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="Event_0kza4it_di" bpmnElement="Event_0kza4it">

diff --git a/src/main/resources/camunda/apply_noc_decision_defendant_lip.bpmn b/src/main/resources/camunda/apply_noc_decision_defendant_lip.bpmn
@@ -1,9 +1,9 @@
 <?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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1xagno6" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.18.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.15.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:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:modeler="http://camunda.org/schema/modeler/1.0" id="Definitions_1xagno6" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.7.0" modeler:executionPlatform="Camunda Platform" modeler:executionPlatformVersion="7.15.0">
   <bpmn:collaboration id="Collaboration_0lkiw1g">
     <bpmn:participant id="Participant_1nspjir" name="Apply NoC Decision for Defendant Lip" processRef="APPLY_NOC_DECISION_DEFENDANT_LIP" />
   </bpmn:collaboration>
-  <bpmn:process id="APPLY_NOC_DECISION_DEFENDANT_LIP" name="Apply noc decision lip" isExecutable="true" camunda:historyTimeToLive="P90D">
+  <bpmn:process id="APPLY_NOC_DECISION_DEFENDANT_LIP" name="Apply noc decision defendant lip" isExecutable="true" camunda:historyTimeToLive="P90D">
     <bpmn:endEvent id="Event_0l4t4tn">
       <bpmn:incoming>Flow_1s0jw89</bpmn:incoming>
     </bpmn:endEvent>
@@ -68,15 +68,15 @@
     </bpmn:serviceTask>
     <bpmn:sequenceFlow id="Flow_165r3xc" sourceRef="NotifyDefendant1SolicitorRepresented" targetRef="NotifyClaimantLipDefendantRepresented" />
     <bpmn:sequenceFlow id="Flow_0lzi8gi" name="Yes" sourceRef="Gateway_02x3bwe" targetRef="Activity_EndBusinessProcess">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${empty flowFlags.LIP_CASE || !flowFlags.LIP_CASE}</bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${(empty flowFlags.LIP_CASE || !flowFlags.LIP_CASE) || (!empty flowFlags.DEFENDANT_NOC_ONLINE &amp;&amp; flowFlags.DEFENDANT_NOC_ONLINE)}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:exclusiveGateway id="Gateway_02x3bwe" name="Claimant Represented?">
       <bpmn:incoming>Flow_0djf8zx</bpmn:incoming>
       <bpmn:outgoing>Flow_0lzi8gi</bpmn:outgoing>
       <bpmn:outgoing>Flow_1yk0wbv</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:sequenceFlow id="Flow_1yk0wbv" name="No" sourceRef="Gateway_02x3bwe" targetRef="ProceedOffline">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!empty flowFlags.LIP_CASE &amp;&amp; flowFlags.LIP_CASE}</bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${(!empty flowFlags.LIP_CASE &amp;&amp; flowFlags.LIP_CASE) &amp;&amp; (empty flowFlags.DEFENDANT_NOC_ONLINE || !flowFlags.DEFENDANT_NOC_ONLINE)}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="Flow_14idif2" sourceRef="NotifyRoboticsOnCaseHandedOffline" targetRef="Activity_EndBusinessProcess" />
     <bpmn:serviceTask id="ProceedOffline" name="Proceed offline" camunda:type="external" camunda:topic="processCaseEvent">