Skip to content

Commit

Permalink
CIV-14009 Defendant LiP Claim Paid in Full Letter (#1014)
Browse files Browse the repository at this point in the history 
* CIV-14010: Initial Commit - WIP

* CIV-14010: Few more changes to tests - WIP

* CIV-14010: Few more changes to tests - WIP

* CIV-14010: Fixed tests

* CIV-14009 Add new Settle Claim letter block

* CIV-14010: Renamed test class

* CIV-14010: Removed commented data

* CIV-14010: Updated message name

* CIV-14010: Updated message name and Id

* CIV-14009 Merge changes from 14010

* CIV-14009 update Camunda

---------

Co-authored-by: JamiS <[email protected]>
Co-authored-by: Azam <[email protected]>
  • Loading branch information
@hmcts-version1-ignacio @sjamihmcts @Azam-Hmcts
3 people authored Jul 24, 2024
1 parent 6db3f0e commit 89d6709
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 9 deletions.
30 changes: 24 additions & 6 deletions src/main/resources/camunda/settle_claim_paid_in_full_notification.bpmn
View file
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
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

0 comments on commit 89d6709

Please sign in to comment.