Skip to content

Commit

Permalink
Conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@AlokDatta
AlokDatta committed Feb 8, 2024
1 parent 361e555 commit 699c2ae
Show file tree
Hide file tree
Showing 2 changed files with 126 additions and 78 deletions.
202 changes: 125 additions & 77 deletions src/main/resources/wa-task-initiation-privatelaw-prlapps.dmn
View file
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.1.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.19.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 @@ -4008,203 +4008,251 @@ and additionalData.Data.isHearingTaskNeeded != null) then
<text>"reviewDocsFL401"</text>
</outputEntry>
</rule>
<rule id="DecisionRule_1yk2hfv">
<inputEntry id="UnaryTests_0xj6r97">
<rule id="DecisionRule_0qv9tjo">
<inputEntry id="UnaryTests_0z8e4ec">
<text>"c100RequestSupport"</text>
</inputEntry>
<inputEntry id="UnaryTests_0ythdqe">
<inputEntry id="UnaryTests_02hv9xs">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1gw9o67">
<inputEntry id="UnaryTests_0e57rs3">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0poup59">
<inputEntry id="UnaryTests_1f65swl">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1awb3mj">
<inputEntry id="UnaryTests_1qhkrn7">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_02skm7m">
<inputEntry id="UnaryTests_042z28r">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_19vlzcz">
<inputEntry id="UnaryTests_1iwo0xn">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_00pk60e">
<inputEntry id="UnaryTests_1pge81m">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1nhvfvl">
<inputEntry id="UnaryTests_0ce190y">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_07yfnjr">
<inputEntry id="UnaryTests_1iee4ae">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1pvl1x3">
<inputEntry id="UnaryTests_06ysf5g">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1nbzlts">
<inputEntry id="UnaryTests_1jj2v4s">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0fafx8u">
<inputEntry id="UnaryTests_0ahd4c1">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1fvbttv">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1xkbkdp">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1m6udd2">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0i11fb4">
<text>"reviewRaRequestsC100"</text>
</outputEntry>
<outputEntry id="LiteralExpression_10e6ljz">
<outputEntry id="LiteralExpression_1487914">
<text>"Review RA request"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0f8b3vh">
<outputEntry id="LiteralExpression_1evnror">
<text></text>
</outputEntry>
<outputEntry id="LiteralExpression_0xpl0xq">
<outputEntry id="LiteralExpression_0mjf95h">
<text>"reviewRAC100"</text>
</outputEntry>
</rule>
<rule id="DecisionRule_1xap93g">
<inputEntry id="UnaryTests_0g5ps1f">
<text>"fl401RequestSupport"</text>
<rule id="DecisionRule_1v2z6as">
<inputEntry id="UnaryTests_0w8xeem">
<text>"c100ManageSupport"</text>
</inputEntry>
<inputEntry id="UnaryTests_1owf3ec">
<inputEntry id="UnaryTests_0v5s5sc">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1eqoaj5">
<inputEntry id="UnaryTests_098is1i">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1vz7di9">
<inputEntry id="UnaryTests_16pvr6l">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0o0zfdq">
<inputEntry id="UnaryTests_0x6gj58">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1gfpjpe">
<inputEntry id="UnaryTests_0oonke3">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_18i3ads">
<inputEntry id="UnaryTests_03pnkn6">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1b8plo3">
<inputEntry id="UnaryTests_1q89pd7">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_12p7zbv">
<inputEntry id="UnaryTests_19jgfma">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_13lmvx3">
<inputEntry id="UnaryTests_1cd7vpp">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0bquih2">
<inputEntry id="UnaryTests_0hgx7aa">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_004w99w">
<inputEntry id="UnaryTests_0ldbdkr">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_1u8bfk8">
<text>"reviewRaRequestsFL401"</text>
<inputEntry id="UnaryTests_1p6msr9">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_178tyk6">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0nbmxo3">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0g4pmfe">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_1agnaty">
<text>"reviewInactiveRaRequestsC100"</text>
</outputEntry>
<outputEntry id="LiteralExpression_02bii4t">
<text>"Review RA request"</text>
<outputEntry id="LiteralExpression_0d2v6wk">
<text>"Review inactive RA request"</text>
</outputEntry>
<outputEntry id="LiteralExpression_15drf6j">
<outputEntry id="LiteralExpression_13q28dd">
<text></text>
</outputEntry>
<outputEntry id="LiteralExpression_1me96xn">
<text>"reviewRAFL401"</text>
<outputEntry id="LiteralExpression_08trltf">
<text>"reviewInactiveRAC100"</text>
</outputEntry>
</rule>
<rule id="DecisionRule_1dykfg4">
<inputEntry id="UnaryTests_10bq6dw">
<text>"c100ManageSupport"</text>
<rule id="DecisionRule_0jez1p1">
<inputEntry id="UnaryTests_0f7fp2s">
<text>"fl401RequestSupport"</text>
</inputEntry>
<inputEntry id="UnaryTests_1rudede">
<inputEntry id="UnaryTests_1ywjzf7">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_08r676d">
<inputEntry id="UnaryTests_0cswsin">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0vk8a50">
<inputEntry id="UnaryTests_0u09np3">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0hzla3j">
<inputEntry id="UnaryTests_1gmc4cu">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0r5y0v5">
<inputEntry id="UnaryTests_1arx7lf">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0p4q6lx">
<inputEntry id="UnaryTests_1dv1tuf">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0k7diy4">
<inputEntry id="UnaryTests_0acgcmm">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1tccgyq">
<inputEntry id="UnaryTests_1s2uaqc">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0jpck35">
<inputEntry id="UnaryTests_0gu561p">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0by11x4">
<inputEntry id="UnaryTests_1h2e9if">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_00l2njk">
<inputEntry id="UnaryTests_01kirfp">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0l0no3k">
<text>"reviewInactiveRaRequestsC100"</text>
<inputEntry id="UnaryTests_0o27dkz">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1mss6sn">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_13artzc">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1j4jvrc">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_17siwnh">
<text>"reviewRaRequestsFL401"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0stxyz9">
<text>"Review inactive RA request"</text>
<outputEntry id="LiteralExpression_0tzrvpy">
<text>"Review RA request"</text>
</outputEntry>
<outputEntry id="LiteralExpression_1hhmx2f">
<outputEntry id="LiteralExpression_0boazox">
<text></text>
</outputEntry>
<outputEntry id="LiteralExpression_0r1dnhu">
<text>"reviewInactiveRAC100"</text>
<outputEntry id="LiteralExpression_1v6qqvg">
<text>"reviewRAFL401"</text>
</outputEntry>
</rule>
<rule id="DecisionRule_0ausnm8">
<inputEntry id="UnaryTests_10ek504">
<rule id="DecisionRule_0hubeqk">
<inputEntry id="UnaryTests_10dwxgm">
<text>"fl401ManageSupport"</text>
</inputEntry>
<inputEntry id="UnaryTests_1j1d03c">
<inputEntry id="UnaryTests_0ism510">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_14wh6oz">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0zgrty2">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0os1q5e">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1lrhwnw">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1pod1jv">
<inputEntry id="UnaryTests_0wjsdg8">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0qywzkl">
<inputEntry id="UnaryTests_1p0lknx">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0p1m9ik">
<inputEntry id="UnaryTests_1nc3asf">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0e20pem">
<inputEntry id="UnaryTests_1mzit5b">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_0icfjde">
<inputEntry id="UnaryTests_09ly507">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1hx5fzm">
<inputEntry id="UnaryTests_1qyptgi">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_1v780he">
<inputEntry id="UnaryTests_1ulza79">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_16ja360">
<inputEntry id="UnaryTests_1ukmh5u">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_14xt5y8">
<inputEntry id="UnaryTests_06m8qah">
<text></text>
</inputEntry>
<inputEntry id="UnaryTests_18ugxny">
<inputEntry id="UnaryTests_0j8azny">
<text></text>
</inputEntry>
<outputEntry id="LiteralExpression_0l9r0df">
<outputEntry id="LiteralExpression_1sbwxq9">
<text>"reviewInactiveRaRequestsFL401"</text>
</outputEntry>
<outputEntry id="LiteralExpression_0luxyk4">
<outputEntry id="LiteralExpression_05tn0si">
<text>"Review inactive RA request"</text>
</outputEntry>
<outputEntry id="LiteralExpression_15sfmcq">
<outputEntry id="LiteralExpression_0pzzr6v">
<text></text>
</outputEntry>
<outputEntry id="LiteralExpression_1x9oo9k">
<outputEntry id="LiteralExpression_0jmi1iz">
<text>"reviewInactiveRAFL401"</text>
</outputEntry>
</rule>
Expand Down
2 changes: 1 addition & 1 deletion ...test/java/uk/gov/hmcts/reform/prl/taskconfiguration/dmn/CamundaTaskConfigurationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,6 @@ void if_this_test_fails_needs_updating_with_your_changes() {
DmnDecisionTableImpl logic = (DmnDecisionTableImpl) decision.getDecisionLogic();
assertThat(logic.getInputs().size(), is(2));
assertThat(logic.getOutputs().size(), is(3));
assertThat(logic.getRules().size(), is(68));
assertThat(logic.getRules().size(), is(73));
}
}

0 comments on commit 699c2ae

Please sign in to comment.