Skip to content

Commit c3691ea

Browse files
prestoncabeprestoncabe
committed
Refactor PhlHomesteadExemption to use NoTenYearTaxAbatement check
1 parent 15bcb4b commit c3691ea

File tree

1 file changed

+66
-31
lines changed

1 file changed

+66
-31
lines changed

‎library-api/src/main/resources/benefits/pa/phl/homestead-exemption.dmn‎

Lines changed: 66 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<dmn:definitions xmlns:dmn="http://www.omg.org/spec/DMN/20180521/MODEL/" xmlns="https://kie.apache.org/dmn/_128BAC16-3FFC-4BF4-ADEC-BE9FFE4EDE17" xmlns:feel="http://www.omg.org/spec/DMN/20180521/FEEL/" xmlns:kie="http://www.drools.org/kie/dmn/1.2" xmlns:dmndi="http://www.omg.org/spec/DMN/20180521/DMNDI/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:included1="https://kie.apache.org/dmn/_9514D95A-63FB-4345-911B-D83E1867F709" xmlns:included2="https://kie.apache.org/dmn/_3B9E68B5-63FA-437C-AF93-CC12DDD00BC5" xmlns:included3="https://kie.apache.org/dmn/_1B91A885-130A-4E0B-A762-E12AA6DD5C79" xmlns:included4="https://kie.apache.org/dmn/_6E9D53A6-E99A-4060-9E3E-1AE12EAB5465" xmlns:included5="https://kie.apache.org/dmn/_47ECD886-CEBE-47BC-BD4F-06113DCDE5D8" xmlns:included6="https://kie.apache.org/dmn/_5FD5AE82-65B3-44EF-98CC-651E88F93786" id="_EBE7464A-5EB0-4D71-B00F-0B29543EB38B" name="PhlHomesteadExemption" typeLanguage="http://www.omg.org/spec/DMN/20180521/FEEL/" namespace="https://kie.apache.org/dmn/_128BAC16-3FFC-4BF4-ADEC-BE9FFE4EDE17">
2+
<dmn:definitions xmlns:dmn="http://www.omg.org/spec/DMN/20180521/MODEL/" xmlns="https://kie.apache.org/dmn/_128BAC16-3FFC-4BF4-ADEC-BE9FFE4EDE17" xmlns:feel="http://www.omg.org/spec/DMN/20180521/FEEL/" xmlns:kie="http://www.drools.org/kie/dmn/1.2" xmlns:dmndi="http://www.omg.org/spec/DMN/20180521/DMNDI/" xmlns:di="http://www.omg.org/spec/DMN/20180521/DI/" xmlns:dc="http://www.omg.org/spec/DMN/20180521/DC/" xmlns:included1="https://kie.apache.org/dmn/_9514D95A-63FB-4345-911B-D83E1867F709" xmlns:included2="https://kie.apache.org/dmn/_3B9E68B5-63FA-437C-AF93-CC12DDD00BC5" xmlns:included3="https://kie.apache.org/dmn/_1B91A885-130A-4E0B-A762-E12AA6DD5C79" xmlns:included4="https://kie.apache.org/dmn/_6E9D53A6-E99A-4060-9E3E-1AE12EAB5465" xmlns:included5="https://kie.apache.org/dmn/_47ECD886-CEBE-47BC-BD4F-06113DCDE5D8" xmlns:included6="https://kie.apache.org/dmn/_5FD5AE82-65B3-44EF-98CC-651E88F93786" xmlns:included7="https://kie.apache.org/dmn/_F2A8E6C4-3D1B-4F9A-B7E5-1C4D8F2A6B3E" id="_EBE7464A-5EB0-4D71-B00F-0B29543EB38B" name="PhlHomesteadExemption" typeLanguage="http://www.omg.org/spec/DMN/20180521/FEEL/" namespace="https://kie.apache.org/dmn/_128BAC16-3FFC-4BF4-ADEC-BE9FFE4EDE17">
33
<dmn:extensionElements/>
44
<dmn:import id="_1DB4F630-D116-45DB-8738-AA029CD7BEED" name="Benefits" namespace="https://kie.apache.org/dmn/_9514D95A-63FB-4345-911B-D83E1867F709" locationURI="../../Benefits.dmn" importType="http://www.omg.org/spec/DMN/20180521/MODEL/"/>
55
<dmn:import id="_FC7539DB-FB6D-419C-9CE8-46456B53FC97" name="PersonNotEnrolledInBenefit" namespace="https://kie.apache.org/dmn/_3B9E68B5-63FA-437C-AF93-CC12DDD00BC5" locationURI="../../../checks/enrollment/person-not-enrolled-in-benefit.dmn" importType="http://www.omg.org/spec/DMN/20180521/MODEL/"/>
66
<dmn:import id="_B4BB17BE-CD12-4C1A-BCDE-70E6D71373C7" name="BDT" namespace="https://kie.apache.org/dmn/_1B91A885-130A-4E0B-A762-E12AA6DD5C79" locationURI="../../../BDT.dmn" importType="http://www.omg.org/spec/DMN/20180521/MODEL/"/>
77
<dmn:import id="_F435F772-9C40-4377-80B9-42F0354AC578" name="Enrollment" namespace="https://kie.apache.org/dmn/_6E9D53A6-E99A-4060-9E3E-1AE12EAB5465" locationURI="../../../checks/enrollment/Enrollment.dmn" importType="http://www.omg.org/spec/DMN/20180521/MODEL/"/>
88
<dmn:import id="_F43FEAC2-B90B-485E-80F9-65E9204B42FA" name="OwnerOccupant" namespace="https://kie.apache.org/dmn/_47ECD886-CEBE-47BC-BD4F-06113DCDE5D8" locationURI="../../../checks/residence/owner-occupant.dmn" importType="http://www.omg.org/spec/DMN/20180521/MODEL/"/>
99
<dmn:import id="_A1B2C3D4-E5F6-7890-ABCD-EF1234567890" name="LivesInPhiladelphiaPa" namespace="https://kie.apache.org/dmn/_5FD5AE82-65B3-44EF-98CC-651E88F93786" locationURI="../../../checks/residence/lives-in-philadelphia-pa.dmn" importType="http://www.omg.org/spec/DMN/20180521/MODEL/"/>
10+
<dmn:import id="_A2B3C4D5-E6F7-8901-BCDE-F12345678902" name="NoTenYearTaxAbatement" namespace="https://kie.apache.org/dmn/_F2A8E6C4-3D1B-4F9A-B7E5-1C4D8F2A6B3E" locationURI="../../../checks/residence/no-ten-year-tax-abatement.dmn" importType="http://www.omg.org/spec/DMN/20180521/MODEL/"/>
1011
<dmn:itemDefinition id="_623510AD-4016-407B-8FC1-2F1F9265A987" name="tSituation" isCollection="false">
1112
<dmn:itemComponent id="_602E51C4-B903-4397-8A27-BA7ACD242B3F" name="primaryPersonId" isCollection="false">
1213
<dmn:typeRef>string</dmn:typeRef>
@@ -51,6 +52,9 @@
5152
<dmn:knowledgeRequirement id="_B2C3D4E5-F6A7-8901-BCDE-F12345678901">
5253
<dmn:requiredKnowledge href="https://kie.apache.org/dmn/_5FD5AE82-65B3-44EF-98CC-651E88F93786#_C4355049-6C5C-452D-A767-0F103ED2893E"/>
5354
</dmn:knowledgeRequirement>
55+
<dmn:knowledgeRequirement id="_D6E7F8A9-B0C1-2345-EFA1-234567890145">
56+
<dmn:requiredKnowledge href="https://kie.apache.org/dmn/_F2A8E6C4-3D1B-4F9A-B7E5-1C4D8F2A6B3E#_E4A7C1D9-3F5B-4D1F-FEEF-4B8E2D6A9C3F"/>
57+
</dmn:knowledgeRequirement>
5458
<dmn:context id="_C480749B-8802-49B1-BD0F-9A7690C75C6A">
5559
<dmn:contextEntry>
5660
<dmn:variable id="_BDF053E4-A268-46EF-A240-E0B88FE48922" name="NotAlreadyOnHomestead" typeRef="boolean"/>
@@ -85,9 +89,17 @@
8589
</dmn:contextEntry>
8690
<dmn:contextEntry>
8791
<dmn:variable id="_B1E25D3A-CA05-4F98-8799-7FC0FB449690" name="NoTenYearTaxAbatement" typeRef="boolean"/>
88-
<dmn:literalExpression id="_43FF78A6-4F26-47F2-B9BB-4509F28F0240">
89-
<dmn:text>not(situation.simpleChecks.tenYearTaxAbatement)</dmn:text>
90-
</dmn:literalExpression>
92+
<dmn:invocation id="_E7F8A9B0-C1D2-3456-FA12-345678901256">
93+
<dmn:literalExpression id="_F8A9B0C1-D2E3-4567-A123-456789012367">
94+
<dmn:text>NoTenYearTaxAbatement.NoTenYearTaxAbatementService</dmn:text>
95+
</dmn:literalExpression>
96+
<dmn:binding>
97+
<dmn:parameter id="_A9B0C1D2-E3F4-5678-B234-567890123478" name="situation" typeRef="NoTenYearTaxAbatement.tSituation"/>
98+
<dmn:literalExpression id="_B0C1D2E3-F4A5-6789-C345-678901234589">
99+
<dmn:text>situation</dmn:text>
100+
</dmn:literalExpression>
101+
</dmn:binding>
102+
</dmn:invocation>
91103
</dmn:contextEntry>
92104
<dmn:contextEntry>
93105
<dmn:variable id="_4B90B7D6-9E92-4712-B592-6A919939322D" name="OwnerOccupant" typeRef="boolean"/>
@@ -184,8 +196,14 @@ all(checksAsList)</dmn:text>
184196
<kie:ComponentWidths dmnElementRef="_8BFE79E2-52B9-45D0-B328-D6914079DBD5">
185197
<kie:width>100</kie:width>
186198
</kie:ComponentWidths>
187-
<kie:ComponentWidths dmnElementRef="_43FF78A6-4F26-47F2-B9BB-4509F28F0240">
188-
<kie:width>599</kie:width>
199+
<kie:ComponentWidths dmnElementRef="_E7F8A9B0-C1D2-3456-FA12-345678901256">
200+
<kie:width>50</kie:width>
201+
<kie:width>239</kie:width>
202+
<kie:width>290</kie:width>
203+
</kie:ComponentWidths>
204+
<kie:ComponentWidths dmnElementRef="_F8A9B0C1-D2E3-4567-A123-456789012367"/>
205+
<kie:ComponentWidths dmnElementRef="_B0C1D2E3-F4A5-6789-C345-678901234589">
206+
<kie:width>290</kie:width>
189207
</kie:ComponentWidths>
190208
<kie:ComponentWidths dmnElementRef="_085D4683-3951-40F5-B01C-0770FCE4348D">
191209
<kie:width>50</kie:width>
@@ -227,11 +245,11 @@ all(checksAsList)</dmn:text>
227245
<dmndi:StrokeColor red="0" green="0" blue="0"/>
228246
<dmndi:FontColor red="0" green="0" blue="0"/>
229247
</dmndi:DMNStyle>
230-
<dc:Bounds x="421" y="175.5" width="359" height="205"/>
248+
<dc:Bounds x="572" y="133.5" width="359" height="205"/>
231249
<dmndi:DMNLabel/>
232250
<dmndi:DMNDecisionServiceDividerLine>
233-
<di:waypoint x="421" y="275.5"/>
234-
<di:waypoint x="780" y="275.5"/>
251+
<di:waypoint x="572" y="233.5"/>
252+
<di:waypoint x="931" y="233.5"/>
235253
</dmndi:DMNDecisionServiceDividerLine>
236254
</dmndi:DMNShape>
237255
<dmndi:DMNShape id="dmnshape-drg-_513F29D9-6F29-4B8A-AD8D-F5C339B354DE" dmnElementRef="included2:_513F29D9-6F29-4B8A-AD8D-F5C339B354DE" isCollapsed="false">
@@ -240,11 +258,11 @@ all(checksAsList)</dmn:text>
240258
<dmndi:StrokeColor red="0" green="0" blue="0"/>
241259
<dmndi:FontColor red="0" green="0" blue="0"/>
242260
</dmndi:DMNStyle>
243-
<dc:Bounds x="66" y="14" width="447" height="100"/>
261+
<dc:Bounds x="58" y="5" width="447" height="100"/>
244262
<dmndi:DMNLabel/>
245263
<dmndi:DMNDecisionServiceDividerLine>
246-
<di:waypoint x="66" y="64"/>
247-
<di:waypoint x="513" y="64"/>
264+
<di:waypoint x="58" y="55"/>
265+
<di:waypoint x="505" y="55"/>
248266
</dmndi:DMNDecisionServiceDividerLine>
249267
</dmndi:DMNShape>
250268
<dmndi:DMNShape id="dmnshape-drg-_B514A3B6-6E48-4558-B6AA-CCB4084EA48F" dmnElementRef="included5:_B514A3B6-6E48-4558-B6AA-CCB4084EA48F" isCollapsed="false">
@@ -253,11 +271,11 @@ all(checksAsList)</dmn:text>
253271
<dmndi:StrokeColor red="0" green="0" blue="0"/>
254272
<dmndi:FontColor red="0" green="0" blue="0"/>
255273
</dmndi:DMNStyle>
256-
<dc:Bounds x="89" y="196" width="280" height="100"/>
274+
<dc:Bounds x="142" y="134" width="280" height="100"/>
257275
<dmndi:DMNLabel/>
258276
<dmndi:DMNDecisionServiceDividerLine>
259-
<di:waypoint x="89" y="246"/>
260-
<di:waypoint x="369" y="246"/>
277+
<di:waypoint x="142" y="184"/>
278+
<di:waypoint x="422" y="184"/>
261279
</dmndi:DMNDecisionServiceDividerLine>
262280
</dmndi:DMNShape>
263281
<dmndi:DMNShape id="dmnshape-drg-_C4355049-6C5C-452D-A767-0F103ED2893E" dmnElementRef="included6:_C4355049-6C5C-452D-A767-0F103ED2893E" isCollapsed="false">
@@ -266,11 +284,24 @@ all(checksAsList)</dmn:text>
266284
<dmndi:StrokeColor red="0" green="0" blue="0"/>
267285
<dmndi:FontColor red="0" green="0" blue="0"/>
268286
</dmndi:DMNStyle>
269-
<dc:Bounds x="50" y="309" width="357" height="100"/>
287+
<dc:Bounds x="103" y="263" width="357" height="100"/>
288+
<dmndi:DMNLabel/>
289+
<dmndi:DMNDecisionServiceDividerLine>
290+
<di:waypoint x="103" y="313"/>
291+
<di:waypoint x="460" y="313"/>
292+
</dmndi:DMNDecisionServiceDividerLine>
293+
</dmndi:DMNShape>
294+
<dmndi:DMNShape id="dmnshape-drg-_E4A7C1D9-3F5B-4D1F-FEEF-4B8E2D6A9C3F" dmnElementRef="included7:_E4A7C1D9-3F5B-4D1F-FEEF-4B8E2D6A9C3F" isCollapsed="false">
295+
<dmndi:DMNStyle>
296+
<dmndi:FillColor red="255" green="255" blue="255"/>
297+
<dmndi:StrokeColor red="0" green="0" blue="0"/>
298+
<dmndi:FontColor red="0" green="0" blue="0"/>
299+
</dmndi:DMNStyle>
300+
<dc:Bounds x="92" y="400" width="380" height="100"/>
270301
<dmndi:DMNLabel/>
271302
<dmndi:DMNDecisionServiceDividerLine>
272-
<di:waypoint x="50" y="359"/>
273-
<di:waypoint x="407" y="359"/>
303+
<di:waypoint x="92" y="450"/>
304+
<di:waypoint x="472" y="450"/>
274305
</dmndi:DMNDecisionServiceDividerLine>
275306
</dmndi:DMNShape>
276307
<dmndi:DMNShape id="dmnshape-drg-_38277B56-7BEA-4297-A8B5-BBF084A043E8" dmnElementRef="_38277B56-7BEA-4297-A8B5-BBF084A043E8" isCollapsed="false">
@@ -279,7 +310,7 @@ all(checksAsList)</dmn:text>
279310
<dmndi:StrokeColor red="0" green="0" blue="0"/>
280311
<dmndi:FontColor red="0" green="0" blue="0"/>
281312
</dmndi:DMNStyle>
282-
<dc:Bounds x="463" y="217.5" width="100" height="50"/>
313+
<dc:Bounds x="614" y="175.5" width="100" height="50"/>
283314
<dmndi:DMNLabel/>
284315
</dmndi:DMNShape>
285316
<dmndi:DMNShape id="dmnshape-drg-_2011065F-8B21-49FE-8685-D7566CCA1D60" dmnElementRef="_2011065F-8B21-49FE-8685-D7566CCA1D60" isCollapsed="false">
@@ -288,7 +319,7 @@ all(checksAsList)</dmn:text>
288319
<dmndi:StrokeColor red="0" green="0" blue="0"/>
289320
<dmndi:FontColor red="0" green="0" blue="0"/>
290321
</dmndi:DMNStyle>
291-
<dc:Bounds x="463.29906542056074" y="407" width="100" height="50"/>
322+
<dc:Bounds x="614.2990654205607" y="377" width="100" height="50"/>
292323
<dmndi:DMNLabel/>
293324
</dmndi:DMNShape>
294325
<dmndi:DMNShape id="dmnshape-drg-_51D3A9BB-4110-42E1-86CF-77FCA5DACE9A" dmnElementRef="_51D3A9BB-4110-42E1-86CF-77FCA5DACE9A" isCollapsed="false">
@@ -297,28 +328,32 @@ all(checksAsList)</dmn:text>
297328
<dmndi:StrokeColor red="0" green="0" blue="0"/>
298329
<dmndi:FontColor red="0" green="0" blue="0"/>
299330
</dmndi:DMNStyle>
300-
<dc:Bounds x="612" y="217.5" width="100" height="50"/>
331+
<dc:Bounds x="763" y="175.5" width="100" height="50"/>
301332
<dmndi:DMNLabel/>
302333
</dmndi:DMNShape>
303334
<dmndi:DMNEdge id="dmnedge-drg-_5580529E-A7FF-4D74-9235-BBC68818ABBD-AUTO-TARGET" dmnElementRef="_5580529E-A7FF-4D74-9235-BBC68818ABBD">
304-
<di:waypoint x="513.2990654205607" y="432"/>
305-
<di:waypoint x="513" y="267.5"/>
335+
<di:waypoint x="664.2990654205607" y="402"/>
336+
<di:waypoint x="664" y="225.5"/>
306337
</dmndi:DMNEdge>
307338
<dmndi:DMNEdge id="dmnedge-drg-_B1C4EAD9-E6BA-4799-8385-6319E5B1591C" dmnElementRef="_B1C4EAD9-E6BA-4799-8385-6319E5B1591C">
308-
<di:waypoint x="289.5" y="64"/>
309-
<di:waypoint x="463" y="242.5"/>
339+
<di:waypoint x="281.5" y="55"/>
340+
<di:waypoint x="614" y="200.5"/>
310341
</dmndi:DMNEdge>
311342
<dmndi:DMNEdge id="dmnedge-drg-_605AF34B-0BE8-412B-AE98-3275DC1FB191" dmnElementRef="_605AF34B-0BE8-412B-AE98-3275DC1FB191">
312-
<di:waypoint x="229" y="246"/>
313-
<di:waypoint x="463" y="242.5"/>
343+
<di:waypoint x="282" y="184"/>
344+
<di:waypoint x="614" y="200.5"/>
314345
</dmndi:DMNEdge>
315346
<dmndi:DMNEdge id="dmnedge-drg-_B2C3D4E5-F6A7-8901-BCDE-F12345678901" dmnElementRef="_B2C3D4E5-F6A7-8901-BCDE-F12345678901">
316-
<di:waypoint x="228.5" y="359"/>
317-
<di:waypoint x="463" y="242.5"/>
347+
<di:waypoint x="281.5" y="313"/>
348+
<di:waypoint x="614" y="200.5"/>
349+
</dmndi:DMNEdge>
350+
<dmndi:DMNEdge id="dmnedge-drg-_D6E7F8A9-B0C1-2345-EFA1-234567890145" dmnElementRef="_D6E7F8A9-B0C1-2345-EFA1-234567890145">
351+
<di:waypoint x="472" y="450"/>
352+
<di:waypoint x="614" y="200.5"/>
318353
</dmndi:DMNEdge>
319354
<dmndi:DMNEdge id="dmnedge-drg-_65645AE3-6865-486A-9E5C-293862F38B81-AUTO-TARGET" dmnElementRef="_65645AE3-6865-486A-9E5C-293862F38B81">
320-
<di:waypoint x="513" y="242.5"/>
321-
<di:waypoint x="612" y="242.5"/>
355+
<di:waypoint x="664" y="200.5"/>
356+
<di:waypoint x="763" y="200.5"/>
322357
</dmndi:DMNEdge>
323358
</dmndi:DMNDiagram>
324359
</dmndi:DMNDI>

0 commit comments

Comments
 (0)