Minor fixes

Author: stasel

server/src/controllers/CohortsController.ts

@@ -48,14 +48,14 @@ export class CohortsController implements CohortsControllerType {
 
     // Sort trainees in each group
     Object.values(cohortDictionary).forEach((trainees) => {
-      trainees?.sort(this.compareTraineeInCohort);
+      trainees?.sort(this.compareTraineeInCohort.bind(this));
     });
     // Convert dictionary to array of cohorts
     const result: Cohort[] = Object.entries(cohortDictionary).map(([cohortNumber, trainees]) => {
       const cohortNumberInt = Number.parseInt(cohortNumber);
       return {
         cohort: isNaN(cohortNumberInt) ? null : cohortNumberInt,
-        trainees: (trainees ?? []).map(this.getTraineeSummary),
+        trainees: (trainees ?? []).map(this.getTraineeSummary.bind(this)),
       };
     });
     res.status(200).json(result);
@@ -76,16 +76,16 @@ export class CohortsController implements CohortsControllerType {
       LearningStatus: trainee.educationInfo.learningStatus,
       JobPath: trainee.employmentInfo.jobPath,
       strikes: trainee.educationInfo.strikes.length,
-      averageTestScore: CohortsController.calculateAverageTestScore(trainee.educationInfo.tests),
+      averageTestScore: this.calculateAverageTestScore(trainee.educationInfo.tests),
     };
   }
 
-  private static calculateAverageTestScore(tests: Test[]): number | null {
-    const testsWithScores = tests.filter((test) => test.score !== undefined && test.score !== null);
+  private calculateAverageTestScore(tests: Test[]): number | null {
+    const testsWithScores = tests.filter((test) => test.score !== undefined);
     if (testsWithScores.length === 0) {
       return null;
     }
-    const sum = testsWithScores.reduce((acc, test) => acc + (test.score as number), 0);
+    const sum = testsWithScores.reduce((acc, test) => acc + (test.score ?? 0), 0);
     return sum / testsWithScores.length;
   }
 

server/src/repositories/TraineesRepository.ts

@@ -70,6 +70,7 @@ export class MongooseTraineesRepository implements TraineesRepository {
         'personalInfo.hasWorkPermit',
         'educationInfo.learningStatus',
         'educationInfo.strikes.id',
+        'educationInfo.tests.score',
         'educationInfo.currentCohort',
         'employmentInfo.jobPath',
       ])