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.

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

Updated the task initiation DMN acccording to PRL-5766 #169

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
</rule>
<rule id="DecisionRule_0apzh7f">
<inputEntry id="UnaryTests_1sc5v50">
<text>"DECISION_OUTCOME"</text>
<text>"JUDICIAL_REVIEW", "PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME"</text>
</inputEntry>
<inputEntry id="UnaryTests_0e0k7ss">
<text>"draftAnOrder"</text>
</inputEntry>
<inputEntry id="UnaryTests_1ppyzd0">
<text>"DECISION_OUTCOME"</text>
<text>"JUDICIAL_REVIEW", "PREPARE_FOR_HEARING_CONDUCT_HEARING","DECISION_OUTCOME"</text>
</inputEntry>
<outputEntry id="LiteralExpression_0dxmk9p">
<text>"Cancel"</text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1264,7 +1264,7 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
<text>"description"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1ggjpaq">
<text>"[Update Hearing Actuals](/cases/case-details/${[CASE_REFERENCE]}/trigger/)"</text>
<text>"[Update Hearing Actuals](/cases/case-details/${[CASE_REFERENCE]}/hearings)"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0szy8u7">
<text></text>
Expand Down Expand Up @@ -1940,4 +1940,4 @@ taskAttributes. taskType else if(taskType != null) then taskType else null</text
</dmndi:DMNShape>
</dmndi:DMNDiagram>
</dmndi:DMNDI>
</definitions>
</definitions>
18 changes: 9 additions & 9 deletions src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:camunda="http://camunda.org/schema/1.0/dmn" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" id="wa-initiation-definition" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.13.0">
<definitions xmlns="https://www.omg.org/spec/DMN/20191111/MODEL/" xmlns:camunda="http://camunda.org/schema/1.0/dmn" xmlns:biodi="http://bpmn.io/schema/dmn/biodi/2.0" xmlns:dmndi="https://www.omg.org/spec/DMN/20191111/DMNDI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" id="wa-initiation-definition" name="DRD" namespace="http://camunda.org/schema/1.0/dmn" exporter="Camunda Modeler" exporterVersion="5.11.0">
<decision id="wa-task-initiation-privatelaw-prlapps" name="Private Law Task initiation DMN">
<decisionTable id="DecisionTable_0jtevuc" hitPolicy="COLLECT" biodi:annotationsWidth="400">
<input id="Input_1" label="Event Id" biodi:width="216" camunda:inputVariable="eventId">
Expand Down Expand Up @@ -3602,7 +3602,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then
</rule>
<rule id="DecisionRule_0z5s2qi">
<inputEntry id="UnaryTests_1xhq1rj">
<text>"hmcCaseUpdPrepForHearing"</text>
<text>"enableUpdateHearingActualTask"</text>
</inputEntry>
<inputEntry id="UnaryTests_1iw6d2r">
<text>"JUDICIAL_REVIEW", "PREPARE_FOR_HEARING_CONDUCT_HEARING"</text>
Expand All @@ -3614,7 +3614,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0kpkunw">
<text>"TO BE REMOVED LATER"</text>
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_11ioqfs">
<text></text>
Expand Down Expand Up @@ -3688,7 +3688,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then
</rule>
<rule id="DecisionRule_0ip67cc">
<inputEntry id="UnaryTests_03d0lry">
<text>"hmcCaseUpdPrepForHearing"</text>
<text>"enableUpdateHearingActualTask"</text>
</inputEntry>
<inputEntry id="UnaryTests_1lsoqm7">
<text>"JUDICIAL_REVIEW", "PREPARE_FOR_HEARING_CONDUCT_HEARING"</text>
Expand All @@ -3700,7 +3700,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_06vhodi">
<text>"TO BE REMOVED LATER"</text>
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_12aaa92">
<text></text>
Expand Down Expand Up @@ -3774,7 +3774,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then
</rule>
<rule id="DecisionRule_0bu2jfj">
<inputEntry id="UnaryTests_1sy5sab">
<text>"hmcCaseUpdDecOutcome"</text>
<text>"enableRequestSolicitorOrderTask"</text>
</inputEntry>
<inputEntry id="UnaryTests_1c225g3">
<text>"DECISION_OUTCOME"</text>
Expand All @@ -3786,7 +3786,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_09a30yi">
<text>"TO BE REMOVED LATER"</text>
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1bc6ynb">
<text></text>
Expand Down Expand Up @@ -3862,7 +3862,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then
</rule>
<rule id="DecisionRule_0dr66m3">
<inputEntry id="UnaryTests_1wkw41q">
<text>"hmcCaseUpdDecOutcome"</text>
<text>"enableRequestSolicitorOrderTask"</text>
</inputEntry>
<inputEntry id="UnaryTests_1tz6dvs">
<text>"DECISION_OUTCOME"</text>
Expand All @@ -3874,7 +3874,7 @@ and additionalData.Data.isHearingTaskNeeded != null) then
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0lvgsm5">
<text>"TO BE REMOVED LATER"</text>
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_00oxowq">
<text></text>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1116,4 +1116,4 @@
</dmndi:DMNShape>
</dmndi:DMNDiagram>
</dmndi:DMNDI>
</definitions>
</definitions>
2 changes: 1 addition & 1 deletion src/main/resources/wa-task-types-privatelaw-prlapps.dmn
Original file line number Diff line number Diff line change
Expand Up @@ -774,4 +774,4 @@
</dmndi:DMNShape>
</dmndi:DMNDiagram>
</dmndi:DMNDI>
</definitions>
</definitions>
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,6 @@ void when_given_task_type_then_return_dueDateIntervalDays_and_validate_descripti
"name", "dueDateIntervalDays",
"value", "1"
)));

assertDescriptionField(taskType, dmnDecisionTableResult);
}

Expand Down Expand Up @@ -1365,7 +1364,6 @@ private void assertDescriptionField(String taskType, DmnDecisionTableResult dmnD
assertThat(descriptionResultList.size(), is(1));

String description = getDescriptionBasedOnTaskType(taskType);

assertTrue(descriptionResultList.contains(Map.of(
"name", "description",
"value", description
Expand Down Expand Up @@ -1418,7 +1416,7 @@ private static String getDescriptionBasedOnTaskType(String taskType) {

case "updateHearingActualsFL401":
case "updateHearingActualsC100":
return "[Update Hearing Actuals](/cases/case-details/${[CASE_REFERENCE]}/trigger/)";
return "[Update Hearing Actuals](/cases/case-details/${[CASE_REFERENCE]}/hearings)";

case "requestSolicitorOrderFL401":
case "requestSolicitorOrderC100":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -378,11 +378,10 @@ static Stream<Arguments> scenarioProvider() {
)
),*/
Arguments.of(
"hmcCaseUpdPrepForHearing",
"enableUpdateHearingActualTask",
"PREPARE_FOR_HEARING_CONDUCT_HEARING",
mapAdditionalData("{\n"
+ " \"Data\":{\n"
+ " \"performingUser\":\"" + "TO BE REMOVED LATER" + "\"\n,"
+ " \"caseTypeOfApplication\":\"" + "C100" + "\"\n"
+ " }"
+ "}"),
Expand Down Expand Up @@ -687,11 +686,10 @@ static Stream<Arguments> scenarioProvider() {
)
),
Arguments.of(
"hmcCaseUpdPrepForHearing",
"enableUpdateHearingActualTask",
"PREPARE_FOR_HEARING_CONDUCT_HEARING",
mapAdditionalData("{\n"
+ " \"Data\":{\n"
+ " \"performingUser\":\"" + "TO BE REMOVED LATER" + "\"\n,"
+ " \"caseTypeOfApplication\":\"" + "FL401" + "\"\n"
+ " }"
+ "}"),
Expand All @@ -704,11 +702,10 @@ static Stream<Arguments> scenarioProvider() {
)
),
Arguments.of(
"hmcCaseUpdPrepForHearing",
"enableUpdateHearingActualTask",
"JUDICIAL_REVIEW",
mapAdditionalData("{\n"
+ " \"Data\":{\n"
+ " \"performingUser\":\"" + "TO BE REMOVED LATER" + "\"\n,"
+ " \"caseTypeOfApplication\":\"" + "C100" + "\"\n"
+ " }"
+ "}"),
Expand All @@ -721,11 +718,10 @@ static Stream<Arguments> scenarioProvider() {
)
),
Arguments.of(
"hmcCaseUpdPrepForHearing",
"enableUpdateHearingActualTask",
"JUDICIAL_REVIEW",
mapAdditionalData("{\n"
+ " \"Data\":{\n"
+ " \"performingUser\":\"" + "TO BE REMOVED LATER" + "\"\n,"
+ " \"caseTypeOfApplication\":\"" + "FL401" + "\"\n"
+ " }"
+ "}"),
Expand Down