#3622 - Rough Reshape of FT Assessment and DMN #3772

lewischen-aot · 2024-10-07T20:33:15Z

Replaced the fulltime-assessment-decisions.dmn with the provided one.
Replaced the fulltime-assessment-*.bpmn files with the provided one adjusting the necessary year-related IDs.
Ensured full-time applications are still submitted and generate the NOA.
- Changed the variable to dmnFullTimeProgramYearMaximums to dmnFullTimeCalculatedDataProgramYearMaximums since its declaration in Business Rule Task dmnFullTimeProgramYearMaximums.
- Changed the calculation to min(studentDataTransportationCost, dmnFullTimeCalculatedDataApplicationtransportationMaximum) for calculatedDataReturnTransportationCost thanks to investigation in the PR comment.
- Changed the variable calculatedDataAdditionalTransportationAllowance to calculatedDataTotalAdditionalTransportationAllowance (with "Total") during the calculation calculatedDataReturnTransportationCost + calculatedDataAdditionalTransportationAllowance for calculatedDataTotalTransportationCost, where calculatedDataAdditionalTransportationAllowance is not declared.
- Made sure application assessments are generated for applications with both parent and partner supporting users
Made the E2E tests pass adjusting any expected value.
- Dropped some federal or provincial assertions as they are no longer available depending on the situation.
- Skipped test case for "Should check for both parents incomes when the student is dependant and parents have SIN." in file assessment-gateway.originalAssessment.e2e-spec.ts due to unknown cause of failure. Smoke tests pass with applications with two parents as supporting users, so the failure of this E2E test may require further investigation down the road.
- Set transportationCost: null for test case "Should generate expected fulltime assessment values when the student is single and independent." in file fulltime-assessment.e2e-spec.ts as variables dmnFullTimeApplicationTransportationMaximum are not imported properly during full-time assessment calculations.
- Removed fulltime-assessment-eligibility-CSGT.e2e-spec.ts test files as it is CSGT is no longer an active program.

Screenshot of full-time application assessment and NOA

sources/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2024-2025.bpmn

dheepak-aot · 2024-10-10T23:03:17Z

sources/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2024-2025.bpmn

        <zeebe:ioMapping>
-          <zeebe:output source="=studentDataPartnerEmploymentInsurance" target="calculatedDataPartnerEmploymentInsturanceBenefits" />
+          <zeebe:output source="=min(studentDataTransportationCost, dmnFullTimeCalculatedDataApplicationtransportationMaximum.limitApplicationTransportation)&#10;" target="calculatedDataReturnTransportationCost" />


As discussed, When a dmn has only one output property, then it returns primitive value instead of an object as output.

E.g

Primitive output

dmnFullTimeApplicationTransportationMaximum(dmnFullTimeCalculatedDataApplicationtransportationMaximum)

Object output

dmnFullTimeCalculatedDataIncomeThreshold

...workflow/test/2022-2023/assessment-gateway/assessment-gateway.originalAssessment.e2e-spec.ts

dheepak-aot

Nice work @lewischen-aot. Please take a look at the comments.

sources/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2022-2023.bpmn

...t/2022-2023/fulltime-assessment/eligibility/fulltime-assessment-eligibility-BGPD.e2e-spec.ts

...packages/backend/workflow/test/2022-2023/fulltime-assessment/fulltime-assessment.e2e-spec.ts

...t/2024-2025/fulltime-assessment/eligibility/fulltime-assessment-eligibility-CSGF.e2e-spec.ts

andrewsignori-aot

Approving on behalf of @dheepak-aot.
I checked the open comments and I was able to see the implemented changes as requested, hence approving it.
Please keep in mind that I am not acting as a secondary reviewer.

andrepestana-aot · 2024-10-15T22:04:11Z

sources/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2022-2023.bpmn

@@ -1,16 +1,15 @@
 <?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.20.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.1.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:bioc="http://bpmn.io/schema/bpmn/biocolor/1.0" xmlns:color="http://www.omg.org/spec/BPMN/non-normative/color/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.27.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.4.0" camunda:diagramRelationId="7a75e87a-6774-4e60-9a94-5dbbe3be143a">


andrepestana-aot · 2024-10-15T22:11:05Z

sources/packages/backend/workflow/test/models/assessment.model.ts

-  // TODO: Fix typo used in FT applications.
-  caclulatedDataTotalAssessedNeed: number;


andrepestana-aot · 2024-10-15T22:31:09Z

...t/2024-2025/fulltime-assessment/eligibility/fulltime-assessment-eligibility-CSGP.e2e-spec.ts

@@ -18,12 +18,9 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}-eligibility-CSGP
    );
    // Assert
    // 4000 is the const value set on dmnFullTimeAwardFederalAllowableLimits.limitAwardCSGPAmount.
-    // When the CSGP is eligible its amount will always be 4000. The same value is expected for


That's why I think it's not a good idea to hardcode numbers in comments.

andrepestana-aot · 2024-10-15T22:31:43Z

...t/2024-2025/fulltime-assessment/eligibility/fulltime-assessment-eligibility-CSGP.e2e-spec.ts

@@ -18,12 +18,9 @@ describe(`E2E Test Workflow fulltime-assessment-${PROGRAM_YEAR}-eligibility-CSGP
    );
    // Assert
    // 4000 is the const value set on dmnFullTimeAwardFederalAllowableLimits.limitAwardCSGPAmount.
-    // When the CSGP is eligible its amount will always be 4000. The same value is expected for
+    // When the CSGP is eligible its amount will always be 2800. The same value is expected for
    // provincial and federal grants.


Shouldn't the comment be updated as we don't have the provincial anymore?

sonarqubecloud · 2024-10-15T23:55:42Z

Quality Gate passed

Issues
3 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

github-actions · 2024-10-15T23:56:24Z

Backend Unit Tests Coverage Report

Totals
Statements:	22.6% ( 3617 / 16001 )
Methods:	10.08% ( 201 / 1995 )
Lines:	26.03% ( 3143 / 12073 )
Branches:	14.12% ( 273 / 1933 )

github-actions · 2024-10-15T23:56:41Z

E2E Workflow Workers Coverage Report

Totals
Statements:	58.64% ( 509 / 868 )
Methods:	52.88% ( 55 / 104 )
Lines:	62.27% ( 411 / 660 )
Branches:	41.35% ( 43 / 104 )

github-actions · 2024-10-15T23:58:38Z

E2E Queue Consumers Coverage Report

Totals
Statements:	83.88% ( 1046 / 1247 )
Methods:	83.59% ( 107 / 128 )
Lines:	84.91% ( 895 / 1054 )
Branches:	67.69% ( 44 / 65 )

github-actions · 2024-10-16T00:01:30Z

E2E SIMS API Coverage Report

Totals
Statements:	65.5% ( 5526 / 8437 )
Methods:	63.02% ( 680 / 1079 )
Lines:	69.64% ( 4369 / 6274 )
Branches:	44% ( 477 / 1084 )

andrepestana-aot

Looks good. Thanks!

initial commit

243bc51

lewischen-aot added Student Student Features Ministry Ministry Features Camunda Worflow Involves camunda workflow changes Supporting User labels Oct 7, 2024

lewischen-aot self-assigned this Oct 7, 2024

lewischen-aot added 6 commits October 7, 2024 16:27

e2e tests

55c178d

adjusted e2e tests

9f794fa

adjusted CSGF variables

0ec00df

e2e fixes

f06b93d

e2e fixes x2

420d014

skip test cases

8c6ab9c

lewischen-aot marked this pull request as ready for review October 9, 2024 21:08

removed CSGT test files

ba21b64

dheepak-aot self-requested a review October 10, 2024 15:51

dheepak-aot added the E2E/Unit tests label Oct 10, 2024

dheepak-aot reviewed Oct 10, 2024

View reviewed changes

sources/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2024-2025.bpmn Show resolved Hide resolved

dheepak-aot reviewed Oct 10, 2024

View reviewed changes

sources/packages/backend/workflow/src/workflow-definitions/fulltime-assessment-2024-2025.bpmn Show resolved Hide resolved

remove dmnFullTimeApplicationTransportationMaximum input

b7b3a79

dheepak-aot reviewed Oct 10, 2024

View reviewed changes

resolve comments - calculatedDataReturnTransportationCost

fe3607c

dheepak-aot reviewed Oct 10, 2024

View reviewed changes

...workflow/test/2022-2023/assessment-gateway/assessment-gateway.originalAssessment.e2e-spec.ts Outdated Show resolved Hide resolved

removed skip test cases

dad0228

dheepak-aot reviewed Oct 11, 2024

View reviewed changes

dheepak-aot mentioned this pull request Oct 11, 2024

Rough Reshape of FT Assessment and DMN #3622

Closed

10 tasks

lewischen-aot added 4 commits October 15, 2024 10:45

resolve comments - calculatedDataTotalAssessedNeed

b079a2f

Merge branch 'main' into feature/#3622-rough-reshape-ft-assessment-dmn

909799f

resolve comments - added TODO for provincialAwardNetBGPDAmount

801864c

resolve e2e test for awardEligibilityCSGF

ca0eb02

andrewsignori-aot approved these changes Oct 15, 2024

View reviewed changes

andrepestana-aot self-requested a review October 15, 2024 22:03

andrepestana-aot reviewed Oct 15, 2024

View reviewed changes

resolve comments - remove misleading comment

1c00014

andrepestana-aot approved these changes Oct 16, 2024

View reviewed changes

lewischen-aot added this pull request to the merge queue Oct 16, 2024

Merged via the queue into main with commit 7f6026b Oct 16, 2024
20 checks passed

lewischen-aot temporarily deployed to DEV October 16, 2024 15:56 — with GitHub Actions Inactive

lewischen-aot temporarily deployed to DEV October 16, 2024 15:58 — with GitHub Actions Inactive

lewischen-aot temporarily deployed to DEV October 16, 2024 16:00 — with GitHub Actions Inactive

lewischen-aot deleted the feature/#3622-rough-reshape-ft-assessment-dmn branch October 16, 2024 16:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#3622 - Rough Reshape of FT Assessment and DMN #3772

#3622 - Rough Reshape of FT Assessment and DMN #3772

lewischen-aot commented Oct 7, 2024 •

edited

Loading

dheepak-aot Oct 10, 2024 •

edited

Loading

dheepak-aot left a comment

andrewsignori-aot left a comment

andrepestana-aot Oct 15, 2024

andrepestana-aot Oct 15, 2024

andrepestana-aot Oct 15, 2024

andrepestana-aot Oct 15, 2024

sonarqubecloud bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 15, 2024

github-actions bot commented Oct 16, 2024

andrepestana-aot left a comment

		// TODO: Fix typo used in FT applications.
		caclulatedDataTotalAssessedNeed: number;

#3622 - Rough Reshape of FT Assessment and DMN #3772

#3622 - Rough Reshape of FT Assessment and DMN #3772

Conversation

lewischen-aot commented Oct 7, 2024 • edited Loading

dheepak-aot Oct 10, 2024 • edited Loading

Choose a reason for hiding this comment

Primitive output

Object output

dheepak-aot left a comment

Choose a reason for hiding this comment

andrewsignori-aot left a comment

Choose a reason for hiding this comment

andrepestana-aot Oct 15, 2024

Choose a reason for hiding this comment

andrepestana-aot Oct 15, 2024

Choose a reason for hiding this comment

andrepestana-aot Oct 15, 2024

Choose a reason for hiding this comment

andrepestana-aot Oct 15, 2024

Choose a reason for hiding this comment

sonarqubecloud bot commented Oct 15, 2024

Quality Gate passed

github-actions bot commented Oct 15, 2024

Backend Unit Tests Coverage Report

github-actions bot commented Oct 15, 2024

E2E Workflow Workers Coverage Report

github-actions bot commented Oct 15, 2024

E2E Queue Consumers Coverage Report

github-actions bot commented Oct 16, 2024

E2E SIMS API Coverage Report

andrepestana-aot left a comment

Choose a reason for hiding this comment

lewischen-aot commented Oct 7, 2024 •

edited

Loading

dheepak-aot Oct 10, 2024 •

edited

Loading