#2618 - Award Configurations - PT CSG-DEP (Award) #2728

lewischen-aot · 2024-01-24T21:32:08Z

Updated federalAwardCSGDAmount calculation for the 3 or More Dependant stream based on above calculation
Updated federalAwardCSGDAmount calculation for the 2 or less Dependant stream based on above calculation, substituting limitAwardCSGD2OrLessChildAmount anywhere there is limitAwardCSGD3OrMoreChildAmount, as well as limitAwardCSGD2OrLessChildSlope for limitAwardCSGD3OrMoreChildSlope.
Ignored rounding in this ticket; it will be analyzed and addressed in a future ticket.
Added E2E tests for this story

Camunda screenshot for 3 or more dependants

Camunda screenshot for less than 3 depandents

guru-aot · 2024-01-25T00:18:05Z

sources/packages/backend/workflow/BPMN/camunda-8/parttime-assessment-2021-2022.bpmn

@@ -504,7 +504,7 @@
    <bpmn:intermediateThrowEvent id="Event_10par1m" name="calculate CSGD">
      <bpmn:extensionElements>
        <zeebe:ioMapping>
-          <zeebe:output source="=  if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardCSGDIncomeCap)&#10;then dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount&#10;else&#10;  max(dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardCSGDIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardCSGD3OrMoreChildSlope),&#10;     80&#10;  )" target="federalAwardCSGDAmount" />
+          <zeebe:output source="=min(&#10;	max(&#10;	    if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardCSGDIncomeCap)&#10;		then &#10;			dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount&#10;		else&#10;			max(dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardCSGDIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardCSGD3OrMoreChildSlope),&#10;			0&#10;		) * offeringWeeks, &#10;        dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount&#10;    ),&#10;	dmnPartTimeAwardAllowableLimits.limitAwardCSGDAmount&#10;)" target="federalAwardCSGDAmount" />


As per your description, the rounding is handled by the future ticket. Can we have the reference her as a comment?

Reference to future ticket is commented in the story #2618.

guru-aot · 2024-01-25T00:29:44Z

...ttime-assessment/awards-amounts/parttime-assessment-2021-2022-awards-amount-CSGD.e2e-spec.ts

+} from "../../../test-utils/factories";
+import { YesNoOptions } from "@sims/test-utils";
+
+describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-awards-amount-CSGD for 3 or more dependants.`, () => {


guru-aot · 2024-01-25T00:48:47Z

...ttime-assessment/awards-amounts/parttime-assessment-2021-2022-awards-amount-CSGD.e2e-spec.ts

+  });
+});
+
+describe(`E2E Test Workflow parttime-assessment-${PROGRAM_YEAR}-awards-amount-CSGD for less than 3 dependants.`, () => {


Usually we have one describe for a file, I am not against it but we is this okay for the other devs? @dheepak-aot @andrewsignori-aot @andrepestana-aot @sh16011993

I would say we can follow the same here mainly because, the difference between 2 describe is the data for which we have been creating just more tests and we can follow the same.

The describe should be only one and similar to the file name. The part about the dependants should be include in the it().

The test files are using only one describe now. Please have a look.

guru-aot

Very minor doubt, Nice work @lewischen-aot

dheepak-aot · 2024-01-25T16:52:16Z

sources/packages/backend/workflow/BPMN/camunda-8/parttime-assessment-2021-2022.bpmn

@@ -504,7 +504,7 @@
    <bpmn:intermediateThrowEvent id="Event_10par1m" name="calculate CSGD">
      <bpmn:extensionElements>
        <zeebe:ioMapping>
-          <zeebe:output source="=  if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardCSGDIncomeCap)&#10;then dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount&#10;else&#10;  max(dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardCSGDIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardCSGD3OrMoreChildSlope),&#10;     80&#10;  )" target="federalAwardCSGDAmount" />
+          <zeebe:output source="=min(&#10;	max(&#10;	    if (calculatedDataTotalFamilyIncome &#60;= dmnPartTimeAwardFamilySizeVariables.limitAwardCSGDIncomeCap)&#10;		then &#10;			dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount&#10;		else&#10;			max(dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount - ((calculatedDataTotalFamilyIncome - dmnPartTimeAwardFamilySizeVariables.limitAwardCSGDIncomeCap) * dmnPartTimeAwardFamilySizeVariables.limitAwardCSGD3OrMoreChildSlope),&#10;			0&#10;		) * offeringWeeks, &#10;        dmnPartTimeAwardAllowableLimits.limitAwardCSGD3OrMoreChildAmount&#10;    ),&#10;	dmnPartTimeAwardAllowableLimits.limitAwardCSGDAmount&#10;)" target="federalAwardCSGDAmount" />


IMO When I saw the weekly amount is written as large expression, I felt we can create a variable to get the weekly amount calculated first and use here.

@andrewsignori-aot @guru-aot @andrepestana-aot thoughts?

I believe creating a variable for the Weekly Amount is better. It can be reused if required.

I like the idea to make it more readable with the new variable.

I've verified with @CarlyCotton that multiplying offeringWeeks only takes place for the else statement. The logic is the same, and I've updated the code for better readability. I've updated the screenshots in the description.

Please let me know if we want to move on to creating a new variable for calculating the nested if else statement. @dheepak-aot @guru-aot @andrepestana-aot @andrewsignori-aot @sh16011993

I would agree that the code is a bit hard to read while in Camunda and when I copied and pasted it into VS Code was still a good amount of horizontal code. Either way, I would not invest time in creating more variables at this time since it came from business and I believe that was clear for them for now.

Sorry @lewischen-aot I missed that multiplying offering weeks is only part of else.

dheepak-aot · 2024-01-25T17:14:52Z

...ttime-assessment/awards-amounts/parttime-assessment-2021-2022-awards-amount-CSGD.e2e-spec.ts

+      calculatedAssessment.variables.dmnPartTimeAwardFamilySizeVariables
+        .limitAwardCSGDIncomeCap,
+    );
+    const offeringWeeksAmount =


Why are we not trying to assert federalAwardCSGDAmount here.? and same everywhere.

Thanks for the review. It is now asserting federalAwardCSGDAmount in the latest commit. Please have a look.

dheepak-aot · 2024-01-25T17:19:39Z

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

...ttime-assessment/awards-amounts/parttime-assessment-2023-2024-awards-amount-CSGD.e2e-spec.ts

andrepestana-aot

Good job. Please take a look at the other devs' comments.

…ed offeringweeks calculation in e2e tests and modified camunda indentation for better readability

andrewsignori-aot · 2024-01-26T19:05:00Z

...ttime-assessment/awards-amounts/parttime-assessment-2021-2022-awards-amount-CSGD.e2e-spec.ts

+    );
+  });
+
+  it("Should determine federalAwardCSGDAmount for less than 3 dependants and calculatedDataTotalFamilyIncome <= limitAwardCSGDIncomeCap", async () => {


For the tests testing less than three dependents, should we not consider adding at least one dependent to the studentDataDependants in at least one of the scenarios?

I didn't add it in the first place because it didn't change the result very much, but I added one dependent for less than 3 dependents scenario in my latest commit to complete the dependents scenarios.

andrewsignori-aot · 2024-01-26T19:07:02Z

...ttime-assessment/awards-amounts/parttime-assessment-2021-2022-awards-amount-CSGD.e2e-spec.ts

+      calculatedAssessment.variables.dmnPartTimeAwardFamilySizeVariables
+        .limitAwardCSGDIncomeCap,
+    );
+    const nestedCalculation = Math.max(


A comment outside the PR and for the future, I have been seeing this logic in the asserts trying to replicate in some way the logic in the workflow. I would recommend that when we have more control over all the data we should try to assert the values in the E2E in a more hard-coded way.
@dheepak-aot @andrepestana-aot @guru-aot @sh16011993 thoughts?

I agree. we should not re-write the logic for assertion.

I agree too. We should assert hard-coded values instead of the logic.

andrewsignori-aot

Great work and thanks for adding the E2E tests. Left just some minor comments, hence approving it.

guru-aot

LGTM, nice work @lewischen-aot

dheepak-aot

Thanks for doing the changes 👍

…e parents income in e2e tests

sonarcloud · 2024-01-26T19:50:04Z

Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

github-actions · 2024-01-26T19:51:15Z

Backend Unit Tests Coverage Report

Totals
Statements:	19.57% ( 2667 / 13625 )
Methods:	10.38% ( 180 / 1734 )
Lines:	22.22% ( 2293 / 10321 )
Branches:	12.36% ( 194 / 1570 )

github-actions · 2024-01-26T19:52:00Z

E2E Workflow Workers Coverage Report

Totals
Statements:	51.87% ( 360 / 694 )
Methods:	46.15% ( 42 / 91 )
Lines:	56.52% ( 299 / 529 )
Branches:	25.68% ( 19 / 74 )

github-actions · 2024-01-26T19:52:43Z

E2E Queue Consumers Coverage Report

Totals
Statements:	78.26% ( 673 / 860 )
Methods:	71.84% ( 74 / 103 )
Lines:	79.97% ( 587 / 734 )
Branches:	52.17% ( 12 / 23 )

github-actions · 2024-01-26T19:55:22Z

E2E SIMS API Coverage Report

Totals
Statements:	55.33% ( 4139 / 7480 )
Methods:	52.14% ( 511 / 980 )
Lines:	60% ( 3348 / 5580 )
Branches:	30.43% ( 280 / 920 )

lewischen-aot added Student Student Features Camunda Worflow Involves camunda workflow changes labels Jan 24, 2024

lewischen-aot self-assigned this Jan 24, 2024

lewischen-aot marked this pull request as ready for review January 24, 2024 23:05

lewischen-aot requested review from guru-aot, sh16011993, dheepak-aot, andrewsignori-aot, andrepestana-aot and JasonCTang January 24, 2024 23:05

guru-aot reviewed Jan 25, 2024

View reviewed changes

dheepak-aot reviewed Jan 25, 2024

View reviewed changes

sh16011993 reviewed Jan 25, 2024

View reviewed changes

...ttime-assessment/awards-amounts/parttime-assessment-2023-2024-awards-amount-CSGD.e2e-spec.ts Show resolved Hide resolved

andrepestana-aot reviewed Jan 25, 2024

View reviewed changes

lewischen-aot added 2 commits January 25, 2024 16:50

modified e2e tests for less than 3 dependants

0e7c010

added dependents, removed unnecessary calculation assertions, correct…

8b96a8b

…ed offeringweeks calculation in e2e tests and modified camunda indentation for better readability

lewischen-aot force-pushed the feature/#2618-ac-pt-csg-dep-award branch from 34ce108 to 8b96a8b Compare January 26, 2024 00:50

andrewsignori-aot reviewed Jan 26, 2024

View reviewed changes

andrewsignori-aot approved these changes Jan 26, 2024

View reviewed changes

guru-aot approved these changes Jan 26, 2024

View reviewed changes

dheepak-aot approved these changes Jan 26, 2024

View reviewed changes

added 1 dependent to less than 3 dependents scenarios and adjusted th…

029b02e

…e parents income in e2e tests

lewischen-aot merged commit 5f1e713 into main Jan 26, 2024
18 checks passed

lewischen-aot temporarily deployed to DEV January 26, 2024 20:12 — with GitHub Actions Inactive

lewischen-aot temporarily deployed to DEV January 26, 2024 20:13 — with GitHub Actions Inactive

lewischen-aot temporarily deployed to DEV January 26, 2024 20:16 — with GitHub Actions Inactive

lewischen-aot deleted the feature/#2618-ac-pt-csg-dep-award branch January 26, 2024 20:24

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#2618 - Award Configurations - PT CSG-DEP (Award) #2728

#2618 - Award Configurations - PT CSG-DEP (Award) #2728

lewischen-aot commented Jan 24, 2024 •

edited

Loading

guru-aot Jan 25, 2024

lewischen-aot Jan 25, 2024

guru-aot Jan 25, 2024

guru-aot Jan 25, 2024

dheepak-aot Jan 25, 2024

andrepestana-aot Jan 25, 2024

lewischen-aot Jan 26, 2024

guru-aot left a comment

dheepak-aot Jan 25, 2024 •

edited

Loading

sh16011993 Jan 25, 2024

andrepestana-aot Jan 25, 2024

lewischen-aot Jan 26, 2024 •

edited

Loading

andrewsignori-aot Jan 26, 2024

dheepak-aot Jan 26, 2024 •

edited

Loading

dheepak-aot Jan 25, 2024

lewischen-aot Jan 26, 2024

dheepak-aot commented Jan 25, 2024

andrepestana-aot left a comment

andrewsignori-aot Jan 26, 2024

lewischen-aot Jan 26, 2024

andrewsignori-aot Jan 26, 2024

dheepak-aot Jan 26, 2024

lewischen-aot Jan 26, 2024

andrewsignori-aot left a comment

guru-aot left a comment

dheepak-aot left a comment

sonarcloud bot commented Jan 26, 2024

github-actions bot commented Jan 26, 2024

github-actions bot commented Jan 26, 2024

github-actions bot commented Jan 26, 2024

github-actions bot commented Jan 26, 2024

#2618 - Award Configurations - PT CSG-DEP (Award) #2728

#2618 - Award Configurations - PT CSG-DEP (Award) #2728

Conversation

lewischen-aot commented Jan 24, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

guru-aot left a comment

Choose a reason for hiding this comment

dheepak-aot Jan 25, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lewischen-aot Jan 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dheepak-aot Jan 26, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dheepak-aot commented Jan 25, 2024

andrepestana-aot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrewsignori-aot left a comment

Choose a reason for hiding this comment

guru-aot left a comment

Choose a reason for hiding this comment

dheepak-aot left a comment

Choose a reason for hiding this comment

sonarcloud bot commented Jan 26, 2024

Quality Gate passed

github-actions bot commented Jan 26, 2024

Backend Unit Tests Coverage Report

github-actions bot commented Jan 26, 2024

E2E Workflow Workers Coverage Report

github-actions bot commented Jan 26, 2024

E2E Queue Consumers Coverage Report

github-actions bot commented Jan 26, 2024

E2E SIMS API Coverage Report

lewischen-aot commented Jan 24, 2024 •

edited

Loading

dheepak-aot Jan 25, 2024 •

edited

Loading

lewischen-aot Jan 26, 2024 •

edited

Loading

dheepak-aot Jan 26, 2024 •

edited

Loading