iritmaximus/oodikone
1
0
Fork 0
mirror of https://github.com/UniversityOfHelsinkiCS/oodikone.git synced 2026-10-12 19:03:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

[Updater][Studyplans] use ids instead of course codes

Browse Source
This commit is contained in:
joonas-a
2026-09-21 15:24:21 +03:00
committed by Aaro Koivukangas
parent bd69a8318e
commit 756338d15f
2 changed files with 27 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
updater/sis-updater-worker/src/updater/mapper.js
+15 -15
View File
@@ -328,7 +328,7 @@ export const studyplanMapper =
programmeModuleIdToValidityPeriod,
personIdToStudentNumber,
programmeModuleIdToCode,
programmeModuleIdToStudyModuleCode,
programmeModuleIdToType,
moduleIdToParentModuleCode,
courseUnitIdToCode,
moduleAttainments,
@@ -336,8 +336,8 @@ export const studyplanMapper =
courseUnitIdToAttainment,
studyPlanIdToDegrees,
educationStudyrights,
getCourseCodesFromAttainment,
getModuleCodesFromAttainment,
getCourseIdsFromAttainment,
getModuleIdsFromAttainment,
getAttainmentsFromAttainment,
attainments
) =>
@@ -351,18 +351,19 @@ export const studyplanMapper =
const graduated = moduleAttainments[programmeId] && moduleAttainments[programmeId][studyplan.user_id]
const id = `${studentnumber}-${code}-${studyrightId}`
// NB: values are course_unit_ids, matching Credit/Enrollment's course_id
const courseUnitSelections = studyplan.course_unit_selections
.filter(courseUnit => moduleIdToParentModuleCode[courseUnit.parentModuleId]?.has(code))
.filter(({ substituteFor }) => !substituteFor.length) // Filter out CUs used to substitute another CU
.map(({ substitutedBy, courseUnitId }) => {
if (substitutedBy.length) return courseUnitIdToCode[substitutedBy[0]]
return courseUnitIdToCode[courseUnitId]
})
.map(({ substitutedBy, courseUnitId }) => (substitutedBy.length ? substitutedBy[0] : courseUnitId))
// Custom attainments aren't backed by an existing CU, so they fall back to their own code
const customCourseUnitSelections = studyplan.custom_course_unit_attainment_selections
.filter(({ parentModuleId }) => moduleIdToParentModuleCode[parentModuleId]?.has(code))
.map(({ customCourseUnitAttainmentId }) => attainmentIdToAttainment[customCourseUnitAttainmentId]?.code)
.map(sanitizeCourseCode)
.map(({ customCourseUnitAttainmentId }) => {
const attainment = attainmentIdToAttainment[customCourseUnitAttainmentId]
return attainment?.course_unit_id ?? sanitizeCourseCode(attainment?.code)
})
.filter(course => !!course)
const coursesFromAttainedModules = flatten(
@@ -373,7 +374,7 @@ export const studyplanMapper =
moduleAttainments[moduleId] &&
moduleAttainments[moduleId][studyplan.user_id]
)
.map(({ moduleId }) => getCourseCodesFromAttainment(moduleAttainments[moduleId][studyplan.user_id]))
.map(({ moduleId }) => getCourseIdsFromAttainment(moduleAttainments[moduleId][studyplan.user_id]))
)
const attainmentsToCalculate = uniqBy(
@@ -439,18 +440,17 @@ export const studyplanMapper =
const completed_credits = calculateTotalCreditsFromAttainments(attainmentsToCalculate)
const includedCourses = graduated
? getCourseCodesFromAttainment(moduleAttainments[programmeId][studyplan.user_id])
? getCourseIdsFromAttainment(moduleAttainments[programmeId][studyplan.user_id])
: courseUnitSelections.concat(customCourseUnitSelections).concat(coursesFromAttainedModules)
if (includedCourses.length === 0) return null
const includedModules = graduated
? // If graduated, find modules from within the graduated programme attainment
getModuleCodesFromAttainment(moduleAttainments[programmeId][studyplan.user_id])
getModuleIdsFromAttainment(moduleAttainments[programmeId][studyplan.user_id])
: Array.from(
studyplan.module_selections.reduce((modules, { moduleId }) => {
const studyModuleCode = programmeModuleIdToStudyModuleCode[moduleId]
if (studyModuleCode) {
modules.add(studyModuleCode)
if (programmeModuleIdToType[moduleId] === 'StudyModule') {
modules.add(moduleId)
}
return modules
}, new Set())
updater/sis-updater-worker/src/updater/updateStudents/studyPlans.js
+12 -18
View File
@@ -116,13 +116,6 @@ export const updateStudyplans = async (
}
)
const programmeModuleIdToStudyModuleCode = programmeModules.reduce((res, mod) => {
if (mod.type === 'StudyModule') {
res[mod.id] = mod.code
}
return res
}, {})
const courseUnitIdToCode = courseUnits.reduce((res, cur) => {
res[cur.id] = cur.code
return res
@@ -148,7 +141,8 @@ export const updateStudyplans = async (
return programmes
}
const getCourseCodesFromAttainment = attainment => {
// Custom attainments aren't backed by an existing CU, so they fall back to their own code
const getCourseIdsFromAttainment = attainment => {
if (!attainment) return []
if (attainment.code && attainment.type === 'CustomCourseUnitAttainment')
@@ -158,18 +152,18 @@ export const updateStudyplans = async (
return flatten(
attainment.nodes
.filter(node => node.attainmentId)
.map(node => getCourseCodesFromAttainment(attainmentIdToAttainment[node.attainmentId]))
.map(node => getCourseIdsFromAttainment(attainmentIdToAttainment[node.attainmentId]))
)
if (attainment.code) return [attainment.code]
const { course_unit_id, module_id } = attainment
const code = courseUnitIdToCode[course_unit_id] || programmeModuleIdToCode[module_id]
const id = course_unit_id || module_id
return code ? [code] : []
return id ? [id] : []
}
const getModuleCodesFromAttainment = attainment => {
const getModuleIdsFromAttainment = attainment => {
if (!attainment) return []
if (attainment.code && attainment.type === 'CustomModuleAttainment') return [sanitizeCourseCode(attainment.code)]
@@ -178,11 +172,11 @@ export const updateStudyplans = async (
return flatten(
attainment.nodes
.filter(node => node.attainmentId)
.map(node => getModuleCodesFromAttainment(attainmentIdToAttainment[node.attainmentId]))
.map(node => getModuleIdsFromAttainment(attainmentIdToAttainment[node.attainmentId]))
)
const code = programmeModuleIdToStudyModuleCode[attainment.module_id]
return code ? [code] : []
const { module_id } = attainment
return module_id && programmeModuleIdToType[module_id] === 'StudyModule' ? [module_id] : []
}
const getAttainmentsFromAttainment = attainment => {
@@ -241,7 +235,7 @@ export const updateStudyplans = async (
programmeModuleIdToValidityPeriod,
personIdToStudentNumber,
programmeModuleIdToCode,
programmeModuleIdToStudyModuleCode,
programmeModuleIdToType,
moduleIdToParentModuleCode,
courseUnitIdToCode,
moduleAttainments,
@@ -249,8 +243,8 @@ export const updateStudyplans = async (
courseUnitIdToAttainment,
studyPlanIdToDegrees,
educationStudyrights,
getCourseCodesFromAttainment,
getModuleCodesFromAttainment,
getCourseIdsFromAttainment,
getModuleIdsFromAttainment,
getAttainmentsFromAttainment,
attainments
)