Skip to content

Commit

Permalink
Merge branch 'master' into feat/CIV_15959
Browse files Browse the repository at this point in the history
  • Loading branch information
@neeta-hmcts
neeta-hmcts authored Dec 13, 2024
2 parents 00d1b3e + ded6411 commit cc74ab0
Show file tree
Hide file tree
Showing 9 changed files with 540 additions and 252 deletions.
1 change: 1 addition & 0 deletions charts/civil-camunda/values.preview.template.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
71 changes: 61 additions & 10 deletions src/main/resources/camunda/claimant_response_cui.bpmn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
<bpmn:incoming>Flow_08src12</bpmn:incoming>
<bpmn:outgoing>Flow_1daatex</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1daatex" sourceRef="SendJudgmentDetailsToCJES" targetRef="GenerateClaimantCCJDashboardNotification" />
<bpmn:sequenceFlow id="Flow_1daatex" sourceRef="SendJudgmentDetailsToCJES" targetRef="Gateway_08rlyk5" />
<bpmn:sequenceFlow id="Flow_0ia7tek" name="Applicant accept or reject repayment plan (full/part admit) and request CCJ" sourceRef="Gateway_RPA_FLOW" targetRef="ProceedOffline">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${flowState != "MAIN.IN_MEDIATION" &amp;&amp; (!empty flowFlags.LIP_JUDGMENT_ADMISSION &amp;&amp; flowFlags.LIP_JUDGMENT_ADMISSION) &amp;&amp; !(!empty flowFlags.JO_ONLINE_LIVE_ENABLED &amp;&amp; flowFlags.JO_ONLINE_LIVE_ENABLED)}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
Expand Down Expand Up @@ -385,10 +385,32 @@
<camunda:inputParameter name="caseEvent">CREATE_DASHBOARD_NOTIFICATION_JUDGEMENT_BY_ADMISSION_CLAIMANT</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1daatex</bpmn:incoming>
<bpmn:incoming>Flow_1awykzw</bpmn:incoming>
<bpmn:incoming>Flow_IS_JO_LIVE_FEED_ACTIVE_DISABLED</bpmn:incoming>
<bpmn:outgoing>Flow_0sfs0bs</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_0sfs0bs" sourceRef="GenerateClaimantCCJDashboardNotification" targetRef="GenerateDefendantCCJDashboardNotification" />
<bpmn:serviceTask id="NotifyJoRoboticsOnContinuousFeed" name="Notify RPA on Continuous Feed" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="caseEvent">NOTIFY_RPA_ON_CONTINUOUS_FEED</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_IS_JO_LIVE_FEED_ACTIVE_ENABLED</bpmn:incoming>
<bpmn:outgoing>Flow_1awykzw</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1awykzw" sourceRef="NotifyJoRoboticsOnContinuousFeed" targetRef="GenerateClaimantCCJDashboardNotification" />
<bpmn:exclusiveGateway id="Gateway_08rlyk5">
<bpmn:incoming>Flow_1daatex</bpmn:incoming>
<bpmn:outgoing>Flow_IS_JO_LIVE_FEED_ACTIVE_ENABLED</bpmn:outgoing>
<bpmn:outgoing>Flow_IS_JO_LIVE_FEED_ACTIVE_DISABLED</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_IS_JO_LIVE_FEED_ACTIVE_ENABLED" name="JO live feed active enabled" sourceRef="Gateway_08rlyk5" targetRef="NotifyJoRoboticsOnContinuousFeed">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!empty flowFlags.IS_JO_LIVE_FEED_ACTIVE &amp;&amp; flowFlags.IS_JO_LIVE_FEED_ACTIVE}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_IS_JO_LIVE_FEED_ACTIVE_DISABLED" name="JO live feed active disabled" sourceRef="Gateway_08rlyk5" targetRef="GenerateClaimantCCJDashboardNotification">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${empty flowFlags.IS_JO_LIVE_FEED_ACTIVE || !flowFlags.IS_JO_LIVE_FEED_ACTIVE}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
</bpmn:process>
<bpmn:message id="Message_0ttrrz3" name="CLAIMANT_RESPONSE_CUI" />
<bpmn:error id="Error_1alq6sw" name="StartBusinessAbort" errorCode="ABORT" />
Expand Down Expand Up @@ -529,14 +551,23 @@
<dc:Bounds x="2180" y="610" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_13k0xop" bpmnElement="GenerateClaimantCCJDashboardNotification">
<dc:Bounds x="2040" y="880" width="100" height="80" />
<bpmndi:BPMNShape id="BPMNShape_149txem" bpmnElement="GenerateDefendantCCJDashboardNotification">
<dc:Bounds x="2380" y="880" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_149txem" bpmnElement="GenerateDefendantCCJDashboardNotification">
<dc:Bounds x="2200" y="880" width="100" height="80" />
<bpmndi:BPMNShape id="BPMNShape_13k0xop" bpmnElement="GenerateClaimantCCJDashboardNotification">
<dc:Bounds x="2210" y="880" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_072bzew" bpmnElement="NotifyJoRoboticsOnContinuousFeed">
<dc:Bounds x="2060" y="960" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0ux7g49" bpmnElement="Gateway_08rlyk5" isMarkerVisible="true">
<dc:Bounds x="1955" y="895" width="50" height="50" />
<bpmndi:BPMNLabel>
<dc:Bounds x="738" y="412" width="87" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0yhzfu9_di" bpmnElement="Event_0yhzfu9">
<dc:Bounds x="272" y="445" width="36" height="36" />
</bpmndi:BPMNShape>
Expand Down Expand Up @@ -765,7 +796,7 @@
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1daatex_di" bpmnElement="Flow_1daatex">
<di:waypoint x="1910" y="920" />
<di:waypoint x="2040" y="920" />
<di:waypoint x="1955" y="920" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0ia7tek_di" bpmnElement="Flow_0ia7tek">
<di:waypoint x="1530" y="528" />
Expand Down Expand Up @@ -807,13 +838,33 @@
<di:waypoint x="2230" y="730" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1fywd24_di" bpmnElement="Flow_1fywd24">
<di:waypoint x="2300" y="920" />
<di:waypoint x="2480" y="920" />
<di:waypoint x="2510" y="920" />
<di:waypoint x="2510" y="543" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0sfs0bs_di" bpmnElement="Flow_0sfs0bs">
<di:waypoint x="2140" y="920" />
<di:waypoint x="2200" y="920" />
<di:waypoint x="2310" y="920" />
<di:waypoint x="2380" y="920" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1awykzw_di" bpmnElement="Flow_1awykzw">
<di:waypoint x="2160" y="1000" />
<di:waypoint x="2260" y="1000" />
<di:waypoint x="2260" y="960" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1r88ew9_di" bpmnElement="Flow_IS_JO_LIVE_FEED_ACTIVE_ENABLED">
<di:waypoint x="1980" y="945" />
<di:waypoint x="1980" y="1000" />
<di:waypoint x="2060" y="1000" />
<bpmndi:BPMNLabel>
<dc:Bounds x="1973" y="1006" width="72" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0ukjeq0_di" bpmnElement="Flow_IS_JO_LIVE_FEED_ACTIVE_DISABLED">
<di:waypoint x="2005" y="920" />
<di:waypoint x="2210" y="920" />
<bpmndi:BPMNLabel>
<dc:Bounds x="2014" y="886" width="73" height="27" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
Expand Down
Loading

0 comments on commit cc74ab0

Please sign in to comment.