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

Jump to bottom

CIV-14009 Defendant LiP Claim Paid in Full Letter #1014

Merged
merged 19 commits into from
Jul 24, 2024
Merged

CIV-14009 Defendant LiP Claim Paid in Full Letter #1014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
1dd131a
CIV-14010: Initial Commit - WIP
sjamihmcts Jun 6, 2024
4dc1de8
CIV-14010: Few more changes to tests - WIP
sjamihmcts Jun 7, 2024
3abd109
CIV-14009 merge from 14010
hmcts-version1-ignacio Jun 7, 2024
5abd19f
CIV-14010: Few more changes to tests - WIP
sjamihmcts Jun 7, 2024
3a481a5
CIV-14010: Fixed tests
sjamihmcts Jun 7, 2024
12ff8eb
Merge branch 'feat/CIV-14010_Camunda' into feat/CIV-14009
hmcts-version1-ignacio Jun 7, 2024
ec63701
CIV-14009 Add new Settle Claim letter block
hmcts-version1-ignacio Jun 7, 2024
1d6f3c7
CIV-14010: Renamed test class
sjamihmcts Jun 7, 2024
cce288e
CIV-14010: Removed commented data
sjamihmcts Jun 7, 2024
3092e8c
CIV-14010: Updated message name
sjamihmcts Jun 10, 2024
64cc5fa
Merge branch 'master' into feat/CIV-14010_Camunda
sjamihmcts Jun 10, 2024
4017836
CIV-14010: Updated message name and Id
sjamihmcts Jun 10, 2024
151cf30
Merge branch 'feat/CIV-14010_Camunda' into feat/CIV-14009
hmcts-version1-ignacio Jun 11, 2024
21e917a
CIV-14009 Merge changes from 14010
hmcts-version1-ignacio Jun 11, 2024
d01c213
Merge branch 'master' into feat/CIV-14009
hmcts-version1-ignacio Jul 17, 2024
9693d79
CIV-14009 update Camunda
hmcts-version1-ignacio Jul 17, 2024
4a8b2c7
Merge branch 'master' into feat/CIV-14009
hmcts-version1-ignacio Jul 19, 2024
2cd9c66
Merge branch 'master' into feat/CIV-14009
Azam-Hmcts Jul 22, 2024
7edad9c
Merge branch 'master' into feat/CIV-14009
Azam-Hmcts Jul 23, 2024
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
30 changes: 24 additions & 6 deletions src/main/resources/camunda/settle_claim_paid_in_full_notification.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: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.19.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.5.1">
<bpmn:process id="SETTLE_CLAIM_MARKED_PAID_IN_FULL_ID" name="Settle Claim Marked As Paid In Full notification" isExecutable="true">
<bpmn:startEvent id="Event_0t2zome" name="Start">
<bpmn:outgoing>Flow_08myj65</bpmn:outgoing>
Expand Down Expand Up @@ -47,7 +47,7 @@
<bpmn:sequenceFlow id="Flow_1dra5bz" sourceRef="NotifyDefendantSettleClaimMarkedPaidInFull1" targetRef="Gateway_19b5dvl" />
<bpmn:exclusiveGateway id="Gateway_19b5dvl">
<bpmn:incoming>Flow_1dra5bz</bpmn:incoming>
<bpmn:incoming>Flow_1903dbe</bpmn:incoming>
<bpmn:incoming>Flow_1qzuuvj</bpmn:incoming>
<bpmn:outgoing>Flow_Two_Respondent_Representatives</bpmn:outgoing>
<bpmn:outgoing>Flow_06dicjn</bpmn:outgoing>
</bpmn:exclusiveGateway>
Expand Down Expand Up @@ -79,10 +79,20 @@
<bpmn:sequenceFlow id="Flow_18lw9cr" sourceRef="Gateway_1owdo9t" targetRef="NotifyDefendantSettleClaimMarkedPaidInFull1">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${empty flowFlags.UNREPRESENTED_DEFENDANT_ONE || (!empty flowFlags.UNREPRESENTED_DEFENDANT_ONE &amp;&amp; !flowFlags.UNREPRESENTED_DEFENDANT_ONE)}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_1903dbe" name="LiP Defendant1" sourceRef="Gateway_1owdo9t" targetRef="Gateway_19b5dvl">
<bpmn:sequenceFlow id="Flow_1903dbe" name="LiP Defendant1" sourceRef="Gateway_1owdo9t" targetRef="SendLetterSettleClaimMarkedPaidInFullDefendantLiP">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!empty flowFlags.UNREPRESENTED_DEFENDANT_ONE &amp;&amp; flowFlags.UNREPRESENTED_DEFENDANT_ONE}</bpmn:conditionExpression>
</bpmn:sequenceFlow>
<bpmn:sequenceFlow id="Flow_1v0m92k" sourceRef="NotifyDefendantSettleClaimMarkedPaidInFull2" targetRef="Activity_0wretog" />
<bpmn:serviceTask id="SendLetterSettleClaimMarkedPaidInFullDefendantLiP" name="Generate, print and post letter to Defendant LiP" camunda:type="external" camunda:topic="processCaseEvent">
<bpmn:extensionElements>
<camunda:inputOutput>
<camunda:inputParameter name="caseEvent">SEND_SETTLE_CLAIM_PAID_IN_FULL_LETTER_TO_LIP_DEFENDANT1</camunda:inputParameter>
</camunda:inputOutput>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1903dbe</bpmn:incoming>
<bpmn:outgoing>Flow_1qzuuvj</bpmn:outgoing>
</bpmn:serviceTask>
<bpmn:sequenceFlow id="Flow_1qzuuvj" sourceRef="SendLetterSettleClaimMarkedPaidInFullDefendantLiP" targetRef="Gateway_19b5dvl" />
<bpmn:textAnnotation id="TextAnnotation_0i3yd0i">
<bpmn:text>Two Respondent Representatives?</bpmn:text>
</bpmn:textAnnotation>
Expand Down Expand Up @@ -126,6 +136,10 @@
<bpmndi:BPMNShape id="Gateway_1owdo9t_di" bpmnElement="Gateway_1owdo9t" isMarkerVisible="true">
<dc:Bounds x="475" y="235" width="50" height="50" />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="BPMNShape_0v61hmc" bpmnElement="SendLetterSettleClaimMarkedPaidInFullDefendantLiP">
<dc:Bounds x="600" y="340" width="100" height="80" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="TextAnnotation_0i3yd0i_di" bpmnElement="TextAnnotation_0i3yd0i">
<dc:Bounds x="880" y="280" width="120" height="40" />
</bpmndi:BPMNShape>
Expand Down Expand Up @@ -188,10 +202,9 @@
<bpmndi:BPMNEdge id="Flow_1903dbe_di" bpmnElement="Flow_1903dbe">
<di:waypoint x="500" y="285" />
<di:waypoint x="500" y="380" />
<di:waypoint x="810" y="380" />
<di:waypoint x="810" y="285" />
<di:waypoint x="600" y="380" />
<bpmndi:BPMNLabel>
<dc:Bounds x="619" y="362" width="76" height="14" />
<dc:Bounds x="513" y="343" width="76" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1v0m92k_di" bpmnElement="Flow_1v0m92k">
Expand All @@ -200,6 +213,11 @@
<di:waypoint x="1112" y="260" />
<di:waypoint x="1150" y="260" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Flow_1qzuuvj_di" bpmnElement="Flow_1qzuuvj">
<di:waypoint x="700" y="380" />
<di:waypoint x="810" y="380" />
<di:waypoint x="810" y="285" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0ycet74_di" bpmnElement="Association_0ycet74">
<di:waypoint x="829" y="266" />
<di:waypoint x="880" y="284" />
Expand Down
17 changes: 14 additions & 3 deletions src/test/java/uk/gov/hmcts/reform/civil/bpmn/SettleClaimPaidInFullNotificationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ class SettleClaimPaidInFullNotificationTest extends BpmnBaseTest {
public static final String NOTIFY_SOLICITOR1_DEFENDANT_SETTLE_CLAIM_MARKED_PAID_IN_FULL_ACTIVITY_ID = "NotifyDefendantSettleClaimMarkedPaidInFull1";
public static final String NOTIFY_SOLICITOR2_DEFENDANT_SETTLE_CLAIM_MARKED_PAID_IN_FULL_EVENT_ID2 = "NOTIFY_SOLICITOR2_DEFENDANT_SETTLE_CLAIM_MARKED_PAID_IN_FULL";
public static final String NOTIFY_SOLICITOR2_DEFENDANT_SETTLE_CLAIM_MARKED_PAID_IN_FULL_ACTIVITY_ID = "NotifyDefendantSettleClaimMarkedPaidInFull2";
public static final String SEND_SETTLE_CLAIM_PAID_IN_FULL_LETTER_TO_LIP_DEFENDANT1_ID = "SendLetterSettleClaimMarkedPaidInFullDefendantLiP";
public static final String SEND_SETTLE_CLAIM_PAID_IN_FULL_LETTER_TO_LIP_DEFENDANT1_EVENT = "SEND_SETTLE_CLAIM_PAID_IN_FULL_LETTER_TO_LIP_DEFENDANT1";

public SettleClaimPaidInFullNotificationTest() {
super("settle_claim_paid_in_full_notification.bpmn", PROCESS_ID);
Expand Down Expand Up @@ -62,17 +64,26 @@ void shouldSuccessfullyComplete(boolean twoRepresentatives, boolean isLiPDefenda
variables
);

if (!isLiPDefendant) {
ExternalTask dashboardDefendant = assertNextExternalTask(PROCESS_CASE_EVENT);
if (isLiPDefendant) {
//complete the notification to Respondent
assertCompleteExternalTask(
dashboardDefendant,
PROCESS_CASE_EVENT,
SEND_SETTLE_CLAIM_PAID_IN_FULL_LETTER_TO_LIP_DEFENDANT1_EVENT,
SEND_SETTLE_CLAIM_PAID_IN_FULL_LETTER_TO_LIP_DEFENDANT1_ID,
variables
);

} else {
//complete the notification to Respondent
ExternalTask dashboardDefendant = assertNextExternalTask(PROCESS_CASE_EVENT);
assertCompleteExternalTask(
dashboardDefendant,
PROCESS_CASE_EVENT,
NOTIFY_SOLICITOR1_DEFENDANT_SETTLE_CLAIM_MARKED_PAID_IN_FULL_EVENT_ID1,
NOTIFY_SOLICITOR1_DEFENDANT_SETTLE_CLAIM_MARKED_PAID_IN_FULL_ACTIVITY_ID,
variables
);

}

if (twoRepresentatives || (isLiPDefendant && !isLiPDefendant2)) {
Expand Down
Loading