refactor: Move another helper function to utils and fix types

Author: SiniCode

src/server/models/courseUnit.ts

@@ -8,13 +8,15 @@ import {
   InferCreationAttributes,
   CreationOptional,
   DATE,
+  NonAttribute,
 } from 'sequelize'
 import type { LocalizedString } from '@common/types/common'
 import { sequelize } from '../db/dbConnection'
 import { logger } from '../util/logger'
 import type Summary from './summary'
 import { Organisation } from './organisation'
-import { CourseRealisation } from './courseRealisation'
+import type { CourseRealisation } from './courseRealisation'
+import type { FeedbackTarget } from './feedbackTarget'
 
 export type CourseUnitValidityPeriod = {
   startDate: Date
@@ -38,6 +40,7 @@ class CourseUnit extends Model<InferAttributes<CourseUnit>, InferCreationAttribu
   // -----------------------------
   declare summary?: Summary
   declare courseRealisations?: CourseRealisation[]
+  declare feedbackTargets?: NonAttribute<FeedbackTarget[]>
 
   // --- Helper methods ---
   // ----------------------

src/server/models/organisation.ts

@@ -16,6 +16,7 @@ import type { LocalizedString } from '@common/types/common'
 import { sequelize } from '../db/dbConnection'
 import type Summary from './summary'
 import type { CourseUnit } from './courseUnit'
+import type { CourseRealisationsOrganisation } from './courseRealisationsOrganisation'
 
 class Organisation extends Model<InferAttributes<Organisation>, InferCreationAttributes<Organisation>> {
   // --- Acual DB columns ---
@@ -35,6 +36,7 @@ class Organisation extends Model<InferAttributes<Organisation>, InferCreationAtt
   // -----------------------------
   declare summary?: Summary
   declare courseUnits?: NonAttribute<CourseUnit[]>
+  declare courseRealisationsOrganisations?: NonAttribute<CourseRealisationsOrganisation[]>
 
   // --- Helper methods ---
   // ----------------------

src/server/services/summary/exportXLSX.js

@@ -12,7 +12,13 @@ const {
   CourseRealisation,
   CourseUnitsOrganisation,
 } = require('../../models')
-const { getScopedSummary, sumSummaries, getOrganisationCodeById, mapCourseIdsToCourseCodes } = require('./utils')
+const {
+  getScopedSummary,
+  sumSummaries,
+  getOrganisationCodeById,
+  mapCourseIdsToCourseCodes,
+  getOrganisationCourseRealisationIds,
+} = require('./utils')
 const { SUMMARY_EXCLUDED_ORG_IDS } = require('../../util/config')
 const { i18n } = require('../../util/i18n')
 const { getTeacherSummary } = require('./getTeacherSummary')
@@ -175,11 +181,6 @@ const getJSON = (targets, targetType) => {
   return targetJSON
 }
 
-const getOrganisationCourseRealisationIds = (organisations, courseUnits) =>
-  organisations
-    .flatMap(org => org.courseRealisationsOrganisations.map(curo => curo.courseRealisationId))
-    .concat(courseUnits.flatMap(cu => cu.feedbackTargets.map(fbt => fbt.courseRealisationId)))
-
 const exportXLSX = async ({
   user,
   startDate,

src/server/services/summary/utils.ts

@@ -2,7 +2,7 @@ import _ from 'lodash'
 import * as datefns from 'date-fns'
 import { FeedbackData } from 'models/feedback'
 import { WORKLOAD_QUESTION_ID_ORDER, WORKLOAD_QUESTION_ID } from '../../util/config'
-import { Summary, Organisation, CourseRealisation } from '../../models'
+import { Summary, Organisation, CourseUnit, CourseRealisation } from '../../models'
 import { SummaryData, SummaryResult } from '../../models/summary'
 
 const mapOptionIdToValue = (optionId: string, questionId: string | number) => {
@@ -269,11 +269,17 @@ const mapCourseIdsToCourseCodes = (teacherOrganisations: Organisation[], courseR
   return curIdToCourseCodeMapping
 }
 
+const getOrganisationCourseRealisationIds = (organisations: Organisation[], courseUnits: CourseUnit[]) =>
+  organisations
+    .flatMap(org => org.courseRealisationsOrganisations.map(curo => curo.courseRealisationId))
+    .concat(courseUnits.flatMap(cu => cu.feedbackTargets.map(fbt => fbt.courseRealisationId)))
+
 export {
   sumSummaryDatas,
   mapOptionIdToValue,
   sumSummaries,
   getScopedSummary,
   getOrganisationCodeById,
   mapCourseIdsToCourseCodes,
+  getOrganisationCourseRealisationIds,
 }