[StudyProgrammes] Replace one instance of substitutions with substitution_groups

services/backend/src/services/studyProgramme/index.ts

@@ -7,8 +7,8 @@ import { CourseModel, CreditModel, EnrollmentModel, OrganizationModel, Programme
 import logger from '../../util/logger'
 
 export const getAllProgrammeCourses = async (providerCode: string) => {
-  const courses = await CourseModel.findAll({
-    attributes: ['id', 'code', 'name', 'substitutions'],
+  const courses: Pick<CourseModel, 'id' | 'code' | 'name' | 'substitution_groups'>[] = await CourseModel.findAll({
+    attributes: ['id', 'code', 'name', 'substitution_groups'],
     include: [
       {
         model: OrganizationModel,

services/backend/src/services/studyProgramme/studyProgrammeCourses.ts

@@ -26,8 +26,9 @@ const getAllStudyProgrammeCourses = async (studyProgramme: string) => {
 
   for (const course of normalCourses) {
     courseCodes.add(course.code)
-    if (course.substitutions?.includes(`AY${course.code}`)) {
-      courseCodes.add(`AY${course.code}`)
+    // We want all AY course codes variants, even from partially completed susbtitution groups
+    for (const code of course?.substitution_groups?.flat() ?? []) {
+      if (code === 'AY' + course.code) courseCodes.add(code)
     }
   }
 
@@ -173,6 +174,8 @@ export const getStudyProgrammeCoursesForStudyTrack = async (
     }),
   ])
 
+  // console.log("Programme credits:", programmeCredits)
+
   const openUniStudentHetuMap = await getStudentHetuStateMap(
     programmeCredits.filter(c => c.variant === 'openUni').map(c => c.studentNumber)
   )

services/backend/tsconfig.json

@@ -1,10 +1,10 @@
 {
   "compilerOptions": {
-    "target": "ES2021",
-    "lib": ["ES2023"],
+    "target": "ES2024",
+    "lib": ["ES2024"],
     "allowJs": true,
-    "moduleResolution": "nodenext",
     "module": "nodenext",
+    "moduleResolution": "nodenext",
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
     "outDir": "dist",