Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DTSCCI-1527 - Refactor Claim Dismissed Email Notifications #1193

Open
wants to merge 17 commits into
base: master
Choose a base branch
from
Open

DTSCCI-1527 - Refactor Claim Dismissed Email Notifications #1193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
42f0f34
DTSCCI-1461 - Replaced first Litigation notification event
guygrewal77 Jan 17, 2025
b5dd17c
Merge branch 'master' into DTSCCI-1461
nigeldunne Jan 20, 2025
07eaf4d
Merge branch 'master' into DTSCCI-1461
guygrewal77 Jan 27, 2025
71c281a
DTSCCI-1461 - Fixed unit test
guygrewal77 Jan 27, 2025
a14df85
Merge remote-tracking branch 'origin/DTSCCI-1461' into DTSCCI-1461
guygrewal77 Jan 27, 2025
f33664e
DTSCCI-1461 - Fixed unit test
guygrewal77 Jan 27, 2025
bb2674b
DTSCCI-1461 - Checkstyle fix
guygrewal77 Jan 27, 2025
633f0cc
DTSCCI-1461 - Checkstyle fix
guygrewal77 Jan 27, 2025
966d526
DTSCCI-1461 - workaround for Platops build failure
guygrewal77 Jan 28, 2025
4667477
DTSCCI-1461 - workaround for Platops build failure
guygrewal77 Jan 28, 2025
06c6c2d
Bumping chart version/ fixing aliases
hmcts-jenkins-a-to-c[bot] Jan 28, 2025
0435aff
DTSCCI-1461: Temp fix for camunda bpm repo
ruban72 Jan 29, 2025
7a9d4ac
DTSCCI-1527 - Updated Camunda diagram
guygrewal77 Jan 30, 2025
4386d27
DTSCCI-1527 - Updated Camunda test
guygrewal77 Jan 31, 2025
c44cdbb
DTSCCI-1527 - Refactored a step further
guygrewal77 Feb 3, 2025
28b3126
DTSCCI-1527 - Updated test and Camunda diagram
guygrewal77 Feb 3, 2025
add4bec
DTSCCI-1527 - Minor changes
guygrewal77 Feb 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/civil-camunda/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
description: A Helm chart for civil-camunda App
name: civil-camunda
home: https://github.com/hmcts/civil-camunda-bpmn-definition
version: 0.0.26
version: 0.0.28
maintainers:
- name: HMCTS Civil team

Expand Down
2 changes: 1 addition & 1 deletion charts/civil-camunda/values.aat.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ tags:
java:
applicationPort: 4000
aadIdentityName: civil
image: 'hmctspublic.azurecr.io/civil/service:latest'
image: 'hmctsprivatetemp.azurecr.io/civil/service:latest'
imagePullPolicy: Always
ingressHost: ${SERVICE_FQDN}
devcpuRequests: 500m
Expand Down
1 change: 1 addition & 0 deletions charts/civil-camunda/values.preview.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ ccd:
camunda-bpm:
enabled: true
java:
image: hmctsprivatetemp.azurecr.io/camunda/bpm:latest
keyVaults: []
releaseNameOverride: ${SERVICE_NAME}-camunda
ingressHost: camunda-${SERVICE_FQDN}
Expand Down
149 changes: 45 additions & 104 deletions src/main/resources/camunda/add_defendant_litigation_friend.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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: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" id="Definitions_1lfk8so" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="4.9.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" id="Definitions_1lfk8so" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.28.0">
<bpmn:process id="ADD_DEFENDANT_LITIGATION_FRIEND" name="Add defendant litigation friend" isExecutable="true" camunda:historyTimeToLive="P90D">
<bpmn:startEvent id="Event_0kkfooq" name="Start">
<bpmn:outgoing>Flow_0h29dto</bpmn:outgoing>
Expand Down Expand Up @@ -34,147 +34,88 @@
<bpmn:errorEventDefinition id="ErrorEventDefinition_1a4cujn" />
</bpmn:boundaryEvent>
<bpmn:sequenceFlow id="Flow_0h29dto" sourceRef="Event_0kkfooq" targetRef="Activity_18synbb" />
<bpmn:sequenceFlow id="Flow_1kz0hux" sourceRef="Activity_18synbb" targetRef="LitigationFriendAddedNotifyApplicantSolicitor1" />
<bpmn:sequenceFlow id="Flow_1kz0hux" sourceRef="Activity_18synbb" targetRef="LitigationFriendAddedNotifyRelevantParties" />
<bpmn:sequenceFlow id="Flow_000871z" sourceRef="Event_152jcow" targetRef="Event_0vj0pv5" />
<bpmn:sequenceFlow id="Flow_0hzoh57" sourceRef="Activity_1tqimyo" targetRef="Event_0i8j65q" />
<bpmn:serviceTask id="LitigationFriendAddedNotifyApplicantSolicitor1" name="Notify applicant solicitor 1" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:serviceTask id="LitigationFriendAddedNotifyRelevantParties" name="Notify process for litigation" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="caseEvent">NOTIFY_APPLICANT_SOLICITOR1_FOR_LITIGATION_FRIEND_ADDED</camunda:inputParameter>
<camunda:inputParameter name="caseEvent">NOTIFY_EVENT</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1kz0hux</bpmn:incoming>
<bpmn:outgoing>Flow_17ysgkl</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_17ysgkl" sourceRef="LitigationFriendAddedNotifyApplicantSolicitor1" targetRef="LitigationFriendAddedNotifyRespondentSolicitor1" />
<bpmn:serviceTask id="LitigationFriendAddedNotifyRespondentSolicitor1" name="Notify respondent solicitor 1" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="caseEvent">NOTIFY_RESPONDENT_SOLICITOR1_FOR_LITIGATION_FRIEND_ADDED</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_17ysgkl</bpmn:incoming>
<bpmn:outgoing>Flow_1ymcht3</bpmn:outgoing>
<bpmn:outgoing>Flow_0gyr54o</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:serviceTask id="NotifyRoboticsOnContinuousFeed" 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_0qs189n</bpmn:incoming>
<bpmn:incoming>Flow_0yuf407</bpmn:incoming>
<bpmn:incoming>Flow_0gyr54o</bpmn:incoming>
<bpmn:outgoing>Flow_RPA_Continuous_Feed_Completed</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_RPA_Continuous_Feed_Completed" sourceRef="NotifyRoboticsOnContinuousFeed" targetRef="Activity_1tqimyo" />
<bpmn:serviceTask id="LitigationFriendAddedNotifyRespondentSolicitor2" name="Notify respondent solicitor 2" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="caseEvent">NOTIFY_RESPONDENT_SOLICITOR2_FOR_LITIGATION_FRIEND_ADDED</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1awd2ov</bpmn:incoming>
<bpmn:outgoing>Flow_0yuf407</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:exclusiveGateway id="Gateway_Two_Representative">
<bpmn:incoming>Flow_1ymcht3</bpmn:incoming>
<bpmn:outgoing>Flow_1awd2ov</bpmn:outgoing>
<bpmn:outgoing>Flow_0qs189n</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="Flow_1ymcht3" sourceRef="LitigationFriendAddedNotifyRespondentSolicitor1" targetRef="Gateway_Two_Representative" />
<bpmn:sequenceFlow id="Flow_1awd2ov" name="1 v 2&#10;(Different Representatives)" sourceRef="Gateway_Two_Representative" targetRef="LitigationFriendAddedNotifyRespondentSolicitor2">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!empty flowFlags.TWO_RESPONDENT_REPRESENTATIVES &amp;&amp; flowFlags.TWO_RESPONDENT_REPRESENTATIVES}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_0qs189n" sourceRef="Gateway_Two_Representative" targetRef="NotifyRoboticsOnContinuousFeed" />
<bpmn:sequenceFlow id="Flow_0yuf407" sourceRef="LitigationFriendAddedNotifyRespondentSolicitor2" targetRef="NotifyRoboticsOnContinuousFeed" />
<bpmn:sequenceFlow id="Flow_0gyr54o" sourceRef="LitigationFriendAddedNotifyRelevantParties" targetRef="NotifyRoboticsOnContinuousFeed" />
</bpmn:process>
<bpmn:message id="Message_0zm9rfj" name="ADD_DEFENDANT_LITIGATION_FRIEND" />
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="ADD_DEFENDANT_LITIGATION_FRIEND">
<bpmndi:BPMNEdge id="Flow_1awd2ov_di" bpmnElement="Flow_1awd2ov">
<di:waypoint x="720" y="242" />
<di:waypoint x="720" y="100" />
<di:waypoint x="760" y="100" />
<bpmndi:BPMNLabel>
<dc:Bounds x="638" y="160" width="84" height="40" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1ymcht3_di" bpmnElement="Flow_1ymcht3">
<di:waypoint x="605" y="267" />
<di:waypoint x="695" y="267" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1kfaf2c_di" bpmnElement="Flow_RPA_Continuous_Feed_Completed">
<di:waypoint x="950" y="267" />
<di:waypoint x="990" y="267" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_17ysgkl_di" bpmnElement="Flow_17ysgkl">
<di:waypoint x="470" y="267" />
<di:waypoint x="505" y="267" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0hzoh57_di" bpmnElement="Flow_0hzoh57">
<di:waypoint x="1090" y="267" />
<di:waypoint x="1132" y="267" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_000871z_di" bpmnElement="Flow_000871z">
<di:waypoint x="280" y="209" />
<di:waypoint x="280" y="175" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1kz0hux_di" bpmnElement="Flow_1kz0hux">
<di:waypoint x="330" y="267" />
<di:waypoint x="370" y="267" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0h29dto_di" bpmnElement="Flow_0h29dto">
<di:waypoint x="188" y="270" />
<di:waypoint x="230" y="270" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0qs189n_di" bpmnElement="Flow_0qs189n">
<di:waypoint x="745" y="267" />
<di:waypoint x="850" y="267" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0yuf407_di" bpmnElement="Flow_0yuf407">
<di:waypoint x="860" y="100" />
<di:waypoint x="900" y="100" />
<di:waypoint x="900" y="227" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="Event_14vi3oh_di" bpmnElement="Event_0kkfooq">
<dc:Bounds x="152" y="252" width="36" height="36" />
<dc:Bounds x="152" y="192" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="158" y="295" width="24" height="14" />
<dc:Bounds x="158" y="235" width="24" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_18synbb_di" bpmnElement="Activity_18synbb">
<dc:Bounds x="230" y="227" width="100" height="80" />
<dc:Bounds x="230" y="167" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0vj0pv5_di" bpmnElement="Event_0vj0pv5">
<dc:Bounds x="262" y="139" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0kyj41c_di" bpmnElement="LitigationFriendAddedNotifyApplicantSolicitor1">
<dc:Bounds x="370" y="227" width="100" height="80" />
<dc:Bounds x="262" y="79" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1eqzvl4_di" bpmnElement="LitigationFriendAddedNotifyRespondentSolicitor1">
<dc:Bounds x="505" y="227" width="100" height="80" />
<bpmndi:BPMNShape id="Activity_1tqimyo_di" bpmnElement="Activity_1tqimyo">
<dc:Bounds x="990" y="167" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1xffphv_di" bpmnElement="LitigationFriendAddedNotifyRespondentSolicitor2">
<dc:Bounds x="760" y="60" width="100" height="80" />
<bpmndi:BPMNShape id="Event_0i8j65q_di" bpmnElement="Event_0i8j65q">
<dc:Bounds x="1132" y="189" width="36" height="36" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Gateway_01wc2z0_di" bpmnElement="Gateway_Two_Representative" isMarkerVisible="true">
<dc:Bounds x="695" y="242" width="50" height="50" />
<bpmndi:BPMNShape id="Activity_0kyj41c_di" bpmnElement="LitigationFriendAddedNotifyRelevantParties">
<dc:Bounds x="460" y="167" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_0o99i8k_di" bpmnElement="NotifyRoboticsOnContinuousFeed">
<dc:Bounds x="850" y="227" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Activity_1tqimyo_di" bpmnElement="Activity_1tqimyo">
<dc:Bounds x="990" y="227" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_0i8j65q_di" bpmnElement="Event_0i8j65q">
<dc:Bounds x="1132" y="249" width="36" height="36" />
<dc:Bounds x="720" y="167" width="100" height="80" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_152jcow_di" bpmnElement="Event_152jcow">
<dc:Bounds x="262" y="209" width="36" height="36" />
<dc:Bounds x="262" y="149" width="36" height="36" />
<bpmndi:BPMNLabel>
<dc:Bounds x="296" y="190" width="27" height="14" />
<dc:Bounds x="296" y="130" width="27" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Flow_0h29dto_di" bpmnElement="Flow_0h29dto">
<di:waypoint x="188" y="210" />
<di:waypoint x="230" y="210" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1kz0hux_di" bpmnElement="Flow_1kz0hux">
<di:waypoint x="330" y="207" />
<di:waypoint x="460" y="207" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_000871z_di" bpmnElement="Flow_000871z">
<di:waypoint x="280" y="149" />
<di:waypoint x="280" y="115" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0hzoh57_di" bpmnElement="Flow_0hzoh57">
<di:waypoint x="1090" y="207" />
<di:waypoint x="1132" y="207" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1kfaf2c_di" bpmnElement="Flow_RPA_Continuous_Feed_Completed">
<di:waypoint x="820" y="207" />
<di:waypoint x="990" y="207" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_0gyr54o_di" bpmnElement="Flow_0gyr54o">
<di:waypoint x="560" y="207" />
<di:waypoint x="720" y="207" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
Loading