Skip to content

#5718 - Appeal Conversion - Partner CY Income #5787

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

Open
CarlyCotton wants to merge 12 commits into
base: main
Choose a base branch
from
+814 −390
Open

#5718 - Appeal Conversion - Partner CY Income #5787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
915a0d6
Initial assessment changes.
CarlyCotton Feb 19, 2026
6e4e525
Temporary assests
CarlyCotton Feb 19, 2026
1f4ef6a
Test updates
CarlyCotton Feb 20, 2026
2ff91ec
Test and workflow changes
CarlyCotton Feb 20, 2026
b8ddd42
More tests
CarlyCotton Feb 20, 2026
24bcf7d
More tests
CarlyCotton Feb 20, 2026
f6f870d
Correction for Assets variable
CarlyCotton Feb 20, 2026
d581bf0
More test updates for current year income
CarlyCotton Feb 21, 2026
6369b5f
Added relationship status to failing tests.
CarlyCotton Feb 21, 2026
24f9786
Test updates.
CarlyCotton Feb 25, 2026
af6e7ba
Merge branch 'main' into feature/#5718-Appeal-conversion-remove-excep…
CarlyCotton Feb 25, 2026
5fd70bb
Added gateway eligibility changes
CarlyCotton Feb 25, 2026
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
2 changes: 1 addition & 1 deletion sources/packages/backend/workflow/src/workflow-definitions/assessment-gateway-v2.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -904,7 +904,7 @@ Note: the workflow process should continue its execution as a regular reassessme
<bpmn:sequenceFlow id="Flow_0toffjh" sourceRef="Activity_122mg53" targetRef="Event_0w0bgro" />
<bpmn:scriptTask id="Activity_122mg53" name="Configure application appeals eligibility">
<bpmn:extensionElements>
<zeebe:script expression="=if (offeringIntensity = &#34;Full Time&#34;)&#10;then &#10;[&#10; {&#10; formName: &#34;stepparentwaiverappeal&#34;,&#10; isEligible: isEligibleForStepParentWaiverAppeal&#10; },&#10; {&#10; formName: &#34;roomandboardcostsappeal&#34;,&#10; isEligible: isEligibleForRoomAndBoardAppeal&#10; },&#10; {&#10; formName: &#34;studentcurrentyearincomeappeal&#34;,&#10; isEligible: if is defined(isEligibleForStudentCurrentYearIncomeAppeal) then isEligibleForStudentCurrentYearIncomeAppeal&#10; else false&#10; }&#10;]&#10;else [&#10; {&#10; formName: &#34;studentcurrentyearincomeappeal&#34;,&#10; isEligible: if is defined(isEligibleForStudentCurrentYearIncomeAppeal) then isEligibleForStudentCurrentYearIncomeAppeal&#10; else false&#10; }&#10;]" resultVariable="applicationAppealsEligibilityDetails" />
<zeebe:script expression="=if (offeringIntensity = &#34;Full Time&#34;)&#10;then &#10;[&#10; {&#10; formName: &#34;stepparentwaiverappeal&#34;,&#10; isEligible: isEligibleForStepParentWaiverAppeal&#10; },&#10; {&#10; formName: &#34;roomandboardcostsappeal&#34;,&#10; isEligible: isEligibleForRoomAndBoardAppeal&#10; },&#10; {&#10; formName: &#34;studentcurrentyearincomeappeal&#34;,&#10; isEligible: if is defined(isEligibleForStudentCurrentYearIncomeAppeal) then isEligibleForStudentCurrentYearIncomeAppeal&#10; else false&#10; },&#10; {&#10; formName: &#34;partnercurrentyearincomeappeal&#34;,&#10; isEligible: if is defined(isEligibleForPartnerCurrentYearIncomeAppeal) then isEligibleForPartnerCurrentYearIncomeAppeal&#10; else false&#10; }&#10;]&#10;else [&#10; {&#10; formName: &#34;studentcurrentyearincomeappeal&#34;,&#10; isEligible: if is defined(isEligibleForStudentCurrentYearIncomeAppeal) then isEligibleForStudentCurrentYearIncomeAppeal&#10; else false&#10; },&#10; {&#10; formName: &#34;partnercurrentyearincomeappeal&#34;,&#10; isEligible: if is defined(isEligibleForPartnerCurrentYearIncomeAppeal) then isEligibleForPartnerCurrentYearIncomeAppeal&#10; else false&#10; }&#10;]" resultVariable="applicationAppealsEligibilityDetails" />
Copy link
Collaborator

@andrewsignori-aot andrewsignori-aot Feb 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have this logic split as it is for other areas?

Image

<zeebe:ioMapping>
<zeebe:output source="=applicationAppealsEligibilityDetails" target="applicationAppealsEligibilityDetails" />
<zeebe:output source="=(applicationAppealsEligibilityDetails [isEligible = true]).formName" target="eligibleApplicationAppeals" />
Expand Down
8 changes: 4 additions & 4 deletions ...ces/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2025-2026.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:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_0ihicdz" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.42.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.6.0" camunda:diagramRelationId="7a75e87a-6774-4e60-9a94-5dbbe3be143a">
<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:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_0ihicdz" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.43.1" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.6.0" camunda:diagramRelationId="7a75e87a-6774-4e60-9a94-5dbbe3be143a">
<bpmn:message id="Message_3q4oc02" name="Message_3q4oc02" />
<bpmn:collaboration id="Collaboration_1cf99un">
<bpmn:participant id="Participant_1mct69m" name="fulltime-assessment-2025-2026" processRef="fulltime-assessment-2025-2026" />
Expand Down Expand Up @@ -2144,7 +2144,7 @@ If distance education/blended learning program or if married and claiming separa
<bpmn:intermediateThrowEvent id="Event_1ck4wni" name="Parental Assets">
<bpmn:extensionElements>
<zeebe:ioMapping>
<zeebe:output source="=parent1NetAssests + parent2NetAssests" target="calculatedDataParentalAssets" />
<zeebe:output source="=parent1NetAssets + parent2NetAssets" target="calculatedDataParentalAssets" />
</zeebe:ioMapping>
</bpmn:extensionElements>
<bpmn:incoming>Flow_119pdg5</bpmn:incoming>
Expand All @@ -2153,7 +2153,7 @@ If distance education/blended learning program or if married and claiming separa
<bpmn:intermediateThrowEvent id="Event_1x1bzlu" name="Parental Assets">
<bpmn:extensionElements>
<zeebe:ioMapping>
<zeebe:output source="=parent1NetAssests" target="calculatedDataParentalAssets" />
<zeebe:output source="=parent1NetAssets" target="calculatedDataParentalAssets" />
</zeebe:ioMapping>
</bpmn:extensionElements>
<bpmn:incoming>Flow_1qvqrur</bpmn:incoming>
Expand Down Expand Up @@ -2252,7 +2252,7 @@ Map the correct 1 or 2 values for each of the values used to calculate income, d
<zeebe:output source="=if calculatedDataWaivedParent = 1&#10; then &#10; // Parent 1 is waived = use parent 2&#10; parent2Ei&#10; else &#10; // Parent 2 is waived = use parent 1&#10; parent1Ei" target="appealDataParentEi" />
<zeebe:output source="=if calculatedDataWaivedParent = 1&#10; then &#10; // Parent 1 is waived = use parent 2&#10; parent2Tax&#10; else &#10; // Parent 2 is waived = use parent 1&#10; parent1Tax" target="appealDataParentTax" />
<zeebe:output source="=if calculatedDataWaivedParent = 1&#10; then &#10; // Parent 1 is waived = use parent 2&#10; parent2DependentTable&#10; else &#10; // Parent 2 is waived = use parent 1&#10; parent1DependentTable" target="appealDataParentDependentTable" />
<zeebe:output source="=if calculatedDataWaivedParent = 1&#10; then &#10; // Parent 1 is waived = use parent 2&#10; parent2NetAssests&#10; else &#10; // Parent 2 is waived = use parent 1&#10; parent1NetAssests" target="appealDataParentNetAssets" />
<zeebe:output source="=if calculatedDataWaivedParent = 1&#10; then &#10; // Parent 1 is waived = use parent 2&#10; parent2NetAssets&#10; else &#10; // Parent 2 is waived = use parent 1&#10; parent1NetAssets" target="appealDataParentNetAssets" />
<zeebe:output source="=if calculatedDataWaivedParent = 1&#10; then &#10; // Parent 1 is waived = use parent 2&#10; parent2Contributions&#10; else &#10; // Parent 2 is waived = use parent 1&#10; parent1Contributions" target="appealDataParentContributions" />
<zeebe:output source="=if calculatedDataWaivedParent = 1&#10; then &#10; // Parent 1 is waived = use parent 2&#10; calculatedDataParent2TotalIncome&#10; else &#10; // Parent 2 is waived = use parent 1&#10; calculatedDataParent1TotalIncome" target="appealDataParentIncome" />
<zeebe:output source="=if calculatedDataWaivedParent = 1&#10; then &#10; // Parent 1 is waived = use parent 2&#10; calculatedDataParent2EstimatedIncomeDeductions&#10; else &#10; // Parent 2 is waived = use parent 1&#10; calculatedDataParent1EstimatedIncomeDeductions" target="appealDataParentEstimatedDeductions" />
Expand Down
Loading