updated

sources/packages/backend/apps/workers/src/controllers/assessment/assessment.controller.ts

@@ -53,6 +53,7 @@ import { MaxJobsToActivate } from "../../types";
 import {
   AssessmentSequentialProcessingService,
   AwardTotal,
+  FTProgramYearContributionTotal,
   ProgramYearTotal,
   SystemUsersService,
   WorkflowClientService,
@@ -446,7 +447,11 @@ export class AssessmentController {
         jobLogger.log(
           `The assessment calculation order has been verified and the assessment id ${assessmentId} is ready to be processed.`,
         );
-        this.createOutputForProgramYearTotals(programYearTotalAwards, result);
+        this.createOutputForProgramYearTotals(
+          programYearTotalAwards,
+          ftProgramYearContributionTotal,
+          result,
+        );
         result.isReadyForCalculation = true;
         return job.complete(result);
       }
@@ -473,6 +478,7 @@ export class AssessmentController {
    */
   private createOutputForProgramYearTotals(
     programYearTotalAwards: AwardTotal[],
+    ftProgramYearContributionTotal: FTProgramYearContributionTotal[],
     output: VerifyAssessmentCalculationOrderJobOutDTO,
   ): void {
     // Create the dynamic variables to be outputted.
@@ -486,6 +492,12 @@ export class AssessmentController {
         ? output[outputName] + award.total
         : award.total;
     });
+    ftProgramYearContributionTotal.forEach((contributionTotal) => {
+      const outputName = `programYearTotal${contributionTotal.contribution}`;
+      output[outputName] = output[outputName]
+        ? output[outputName] + contributionTotal.total
+        : contributionTotal.total;
+    });
   }
 
   private async getProgramYearTotals(

sources/packages/backend/libs/services/src/students-assessments/assessment-sequential-processing.service.ts

@@ -25,7 +25,10 @@ import {
 } from "..";
 import { InjectRepository } from "@nestjs/typeorm";
 import { getISODateOnlyString } from "@sims/utilities";
-import { StudentAssessmentDetail } from "./student-assessment.model";
+import {
+  FullTimeStudentContributionType,
+  StudentAssessmentDetail,
+} from "./student-assessment.model";
 
 @Injectable()
 export class AssessmentSequentialProcessingService {
@@ -303,17 +306,20 @@ export class AssessmentSequentialProcessingService {
 
     // Map the results to the required interface
     const result: FTProgramYearContributionTotal[] = [
-      { contribution: "totalFederalFSC", total: totals.totalFederalFSC ?? 0 },
       {
-        contribution: "totalProvincialFSC",
+        contribution: FullTimeStudentContributionType.FederalFSC,
+        total: totals.totalFederalFSC ?? 0,
+      },
+      {
+        contribution: FullTimeStudentContributionType.ProvincialFSC,
         total: totals.totalProvincialFSC ?? 0,
       },
       {
-        contribution: "studentScholarshipsBursaries",
+        contribution: FullTimeStudentContributionType.ScholarshipBursaries,
         total: totals.studentScholarshipsBursaries ?? 0,
       },
       {
-        contribution: "studentSpouseContribution",
+        contribution: FullTimeStudentContributionType.SpouseContributionWeeks,
         total: totals.studentSpouseContribution ?? 0,
       },
     ];

sources/packages/backend/libs/services/src/students-assessments/student-assessment.model.ts

@@ -10,3 +10,13 @@ export interface StudentAssessmentDetail {
   id: number;
   originalAssessmentStudyStartDate: Date;
 }
+
+/**
+ * Full time program year student contribution for calculating program year totals.
+ */
+export enum FullTimeStudentContributionType {
+  ScholarshipBursaries = "ScholarshipBursaries",
+  SpouseContributionWeeks = "SpouseContributionWeeks",
+  FederalFSC = "FederalFSC",
+  ProvincialFSC = "ProvincialFSC",
+}