#4226 - NOA Eligible to Receive - Double Counting BC Grants #4238

bidyashish · 2025-01-14T22:59:21Z

Acceptance Criteria

Update the Eligible to Receive amount to not include BC Total Grant from the disbursement_values so it's not being double counted.
Check post ecert calculation. This is when the BC Total grant is added to the table.

Technical

If E2E tests are in place please adjust it to cover this scenario, including the "BC Total Grant" in the data setup and asserting the expected value.

E2E test data is taken from sample data.

sh16011993 · 2025-01-14T23:06:38Z

...ntrollers/assessment/_tests_/e2e/assessment.students.controller.getAssessmentNOA.e2e-spec.ts

@@ -156,6 +156,111 @@ describe("AssessmentStudentsController(e2e)-getAssessmentNOA", () => {
      .expect(expectation);
  });

+  it.only("Should exclude BC Total Grant from eligible amount calculation when getting NOA details", async () => {


Please remove only

Only removed.

sh16011993

Great work @bidyashish 👍

sh16011993 · 2025-01-14T23:21:19Z

...ntrollers/assessment/_tests_/e2e/assessment.students.controller.getAssessmentNOA.e2e-spec.ts

+      .expect(HttpStatus.OK);
+
+    // Verify that eligibleAmount excludes BC Total Grant
+    expect(response.body.eligibleAmount).toBe(3060); // Sum of CSPT(2520) + BCAG(140) + SBSD(400), excluding BCSG(540)


👍 Nice work with the comment.

dheepak-aot · 2025-01-14T23:28:47Z

...ntrollers/assessment/_tests_/e2e/assessment.students.controller.getAssessmentNOA.e2e-spec.ts

@@ -156,6 +156,111 @@ describe("AssessmentStudentsController(e2e)-getAssessmentNOA", () => {
      .expect(expectation);
  });

+  it.only("Should exclude BC Total Grant from eligible amount calculation when getting NOA details", async () => {


On top of that, E2E tests are failing. Please address.

Pushed the latest changes to working of E2E.

dheepak-aot · 2025-01-14T23:30:15Z

.../packages/backend/apps/api/src/route-controllers/assessment/assessment.controller.service.ts

@@ -200,14 +200,14 @@ export class AssessmentControllerService {
    disbursementSchedules: DisbursementSchedule[],
  ): number {
    return disbursementSchedules
-      .flatMap(
-        (disbursementSchedule) => disbursementSchedule.disbursementValues,
+      .flatMap((disbursementSchedule) =>


I would advise to use the filter after the flatmap instead. like this.

return disbursementSchedules .flatMap( (disbursementSchedule) => disbursementSchedule.disbursementValues, ) .filter( (disbursementValue) => disbursementValue.valueType !== DisbursementValueType.BCTotalGrant, ) .reduce( (accumulator, disbursementValue) => accumulator + disbursementValue.valueAmount, 0, );

filter separated from flatMap operation.

dheepak-aot · 2025-01-15T00:17:31Z

...ntrollers/assessment/_tests_/e2e/assessment.students.controller.getAssessmentNOA.e2e-spec.ts

+    await db.msfaaNumber.save(msfaaNumber);
+
+    // Create application with disbursements
+    const application = await saveFakeApplicationDisbursements(


The saveFakeApplicationDisbursements can do the whole date preparation and we can discard all the code from line 185-237.

const application = await saveFakeApplicationDisbursements( db.dataSource, { msfaaNumber, student, disbursementValues: [ // BC Total Grant (excluded from eligible amount) createFakeDisbursementValue( DisbursementValueType.BCTotalGrant, "BCSG", 540, ), // Canada Student Loans and Grants createFakeDisbursementValue( DisbursementValueType.CanadaLoan, "CSLF", 0, ), createFakeDisbursementValue( DisbursementValueType.CanadaGrant, "CSGP", 0, ), createFakeDisbursementValue( DisbursementValueType.CanadaGrant, "CSPT", 2520, ), // BC Grants createFakeDisbursementValue( DisbursementValueType.BCGrant, "BCAG", 140, ), createFakeDisbursementValue( DisbursementValueType.BCGrant, "SBSD", 400, ), ], }, { offeringIntensity: OfferingIntensity.fullTime, }, );

In the code snippet above, I used (CSLF instead of CSLP) to be in sync with the offering intensity.

Thanks @dheepak-aot
Grant assert values updated.

dheepak-aot · 2025-01-15T00:20:44Z

...ntrollers/assessment/_tests_/e2e/assessment.students.controller.getAssessmentNOA.e2e-spec.ts

+      .expect(HttpStatus.OK);
+
+    // Verify that eligibleAmount excludes BC Total Grant
+    expect(response.body.eligibleAmount).toBe(3060); // Sum of CSPT(2520) + BCAG(140) + SBSD(400), excluding BCSG(540)


Please assert the whole response as a common practice that we have been following. For e.g. the test case in same file. You can achieve it this way.

const assessment = application.currentAssessment; const [disbursement] = assessment.disbursementSchedules; const endpoint = `/students/assessment/${assessment.id}/noa`; const studentUserToken = await getStudentToken( FakeStudentUsersTypes.FakeStudentUserType1, ); const expectedNOADetails = { applicationId: application.id, applicationNumber: application.applicationNumber, applicationStatus: application.applicationStatus, assessment: assessment.assessmentData, noaApprovalStatus: assessment.noaApprovalStatus, applicationCurrentAssessmentId: application.currentAssessment.id, fullName: getUserFullName(application.student.user), programName: assessment.offering.educationProgram.name, locationName: assessment.offering.institutionLocation.name, offeringIntensity: OfferingIntensity.fullTime, offeringStudyEndDate: getDateOnlyFullMonthFormat( assessment.offering.studyEndDate, ), offeringStudyStartDate: getDateOnlyFullMonthFormat( assessment.offering.studyStartDate, ), // Sum of CSPT(2520) + BCAG(140) + SBSD(400), excluding BCSG(540) eligibleAmount: 3060, disbursement: { disbursement1COEStatus: disbursement.coeStatus, disbursement1Date: getDateOnlyFullMonthFormat( disbursement.disbursementDate, ), disbursement1Id: disbursement.id, disbursement1MSFAACancelledDate: disbursement.msfaaNumber?.cancelledDate, disbursement1MSFAADateSigned: disbursement.msfaaNumber?.dateSigned, disbursement1MSFAAId: disbursement.msfaaNumber?.id, disbursement1MSFAANumber: msfaaNumber.msfaaNumber, disbursement1Status: disbursement.disbursementScheduleStatus, disbursement1TuitionRemittance: disbursement.tuitionRemittanceRequestedAmount, disbursement1cslf: 0, disbursement1csgp: 0, disbursement1cspt: 2520, disbursement1bcag: 140, disbursement1sbsd: 400, }, offeringName: assessment.offering.name, }; // Act/Assert await request(app.getHttpServer()) .get(endpoint) .auth(studentUserToken, BEARER_AUTH_TYPE) .expect(HttpStatus.OK) .expect(expectedNOADetails);

I also tested the solution. it is working.

new Assert pushed with CSGF for full time offering.

sonarqubecloud · 2025-01-15T00:36:56Z

Quality Gate passed

Issues
0 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 SonarQube Cloud

github-actions · 2025-01-15T00:38:08Z

Backend Unit Tests Coverage Report

Totals
Statements:	22.48% ( 3850 / 17124 )
Methods:	10.36% ( 224 / 2162 )
Lines:	25.88% ( 3322 / 12838 )
Branches:	14.31% ( 304 / 2124 )

github-actions · 2025-01-15T00:38:20Z

E2E Workflow Workers Coverage Report

Totals
Statements:	65.59% ( 589 / 898 )
Methods:	59.63% ( 65 / 109 )
Lines:	68.72% ( 468 / 681 )
Branches:	51.85% ( 56 / 108 )

github-actions · 2025-01-15T00:40:47Z

E2E Queue Consumers Coverage Report

Totals
Statements:	86.14% ( 1249 / 1450 )
Methods:	82.42% ( 136 / 165 )
Lines:	88.51% ( 1032 / 1166 )
Branches:	68.07% ( 81 / 119 )

github-actions · 2025-01-15T00:43:24Z

E2E SIMS API Coverage Report

Totals
Statements:	67.77% ( 5994 / 8844 )
Methods:	65.57% ( 739 / 1127 )
Lines:	71.63% ( 4696 / 6556 )
Branches:	48.15% ( 559 / 1161 )

dheepak-aot

Looks good @bidyashish 👍Great job!

**Acceptance Criteria** - [x] Update the Eligible to Receive amount to not include **BC Total Grant** from the `disbursement_values` so it's not being double counted. - [x] Check post ecert calculation. This is when the BC Total grant is added to the table. **Technical** - [x] If E2E tests are in place please adjust it to cover this scenario, including the "BC Total Grant" in the data setup and asserting the expected value. E2E test data is taken from sample data.

…4242) **Acceptance Criteria** - [x] Update the Eligible to Receive amount to not include **BC Total Grant** from the `disbursement_values` so it's not being double counted. - [x] Check post ecert calculation. This is when the BC Total grant is added to the table. **Technical** - [x] If E2E tests are in place please adjust it to cover this scenario, including the "BC Total Grant" in the data setup and asserting the expected value. E2E test data is taken from sample data.

filter bcsg

842b730

bidyashish self-assigned this Jan 14, 2025

bidyashish added Student Student Features E2E/Unit tests labels Jan 14, 2025

sh16011993 reviewed Jan 14, 2025

View reviewed changes

sh16011993 approved these changes Jan 14, 2025

View reviewed changes

sh16011993 reviewed Jan 14, 2025

View reviewed changes

dheepak-aot reviewed Jan 14, 2025

View reviewed changes

bidyashish added 2 commits January 14, 2025 15:42

update

81db00a

update filter

4f4d878

dheepak-aot reviewed Jan 15, 2025

View reviewed changes

bidyashish added 2 commits January 14, 2025 16:30

update NOA Assert

c6e6ca8

update to CSGF

834a08b

dheepak-aot added the SIMS-Api SIMS-Api label Jan 15, 2025

dheepak-aot approved these changes Jan 15, 2025

View reviewed changes

bidyashish added this pull request to the merge queue Jan 15, 2025

Merged via the queue into main with commit 7fdd7c6 Jan 15, 2025
21 checks passed

bidyashish deleted the feature/#4226-double-counting-bc-grants branch January 15, 2025 00:49

bidyashish temporarily deployed to DEV January 15, 2025 00:57 — with GitHub Actions Inactive

bidyashish temporarily deployed to DEV January 15, 2025 00:58 — with GitHub Actions Inactive

bidyashish temporarily deployed to DEV January 15, 2025 01:00 — with GitHub Actions Inactive

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

#4226 - NOA Eligible to Receive - Double Counting BC Grants #4238

#4226 - NOA Eligible to Receive - Double Counting BC Grants #4238

bidyashish commented Jan 14, 2025

sh16011993 Jan 14, 2025

bidyashish Jan 14, 2025

sh16011993 left a comment

sh16011993 Jan 14, 2025

dheepak-aot Jan 14, 2025

bidyashish Jan 14, 2025 •

edited

Loading

dheepak-aot Jan 14, 2025 •

edited

Loading

bidyashish Jan 14, 2025

dheepak-aot Jan 15, 2025

dheepak-aot Jan 15, 2025

bidyashish Jan 15, 2025

dheepak-aot Jan 15, 2025

dheepak-aot Jan 15, 2025

bidyashish Jan 15, 2025

sonarqubecloud bot commented Jan 15, 2025

github-actions bot commented Jan 15, 2025

github-actions bot commented Jan 15, 2025

github-actions bot commented Jan 15, 2025

github-actions bot commented Jan 15, 2025

dheepak-aot left a comment

#4226 - NOA Eligible to Receive - Double Counting BC Grants #4238

#4226 - NOA Eligible to Receive - Double Counting BC Grants #4238

Conversation

bidyashish commented Jan 14, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sh16011993 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bidyashish Jan 14, 2025 • edited Loading

Choose a reason for hiding this comment

dheepak-aot Jan 14, 2025 • 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

Choose a reason for hiding this comment

sonarqubecloud bot commented Jan 15, 2025

Quality Gate passed

github-actions bot commented Jan 15, 2025

Backend Unit Tests Coverage Report

github-actions bot commented Jan 15, 2025

E2E Workflow Workers Coverage Report

github-actions bot commented Jan 15, 2025

E2E Queue Consumers Coverage Report

github-actions bot commented Jan 15, 2025

E2E SIMS API Coverage Report

dheepak-aot left a comment

Choose a reason for hiding this comment

bidyashish Jan 14, 2025 •

edited

Loading

dheepak-aot Jan 14, 2025 •

edited

Loading