[Shared] Move formatQueryParamsToArrays to shared/util

services/backend/src/routes/population.ts

@@ -12,7 +12,7 @@ import { bottlenecksOf } from '../services/populations/bottlenecksOf'
 import { optimizedStatisticsOf } from '../services/populations/optimizedStatisticsOf'
 import { populationStudentsMerger, populationCourseStatsMerger } from '../services/statMerger'
 import { findByTag, findByCourseAndSemesters } from '../services/students'
-import { mapToProviders } from '../shared/util/mapToProviders'
+import { mapToProviders } from '../shared/util'
 import { GenderCode, ParsedCourse, Unarray, Unification, UnifyStatus } from '../types'
 import { getFullStudyProgrammeRights, hasFullAccessToStudentData } from '../util'
 import { ApplicationError } from '../util/customErrors'

services/backend/src/routes/teachers.ts

@@ -3,7 +3,7 @@ import { Request, Response, Router } from 'express'
 import { getProvidersOfFaculty, isFaculty } from '../services/organizations'
 import { getTeachersBySearchTerm, getTeacherStatistics, getYearlyStatistics } from '../services/teachers'
 import { CategoryID, getTeacherStats, findAndSaveTeachers, getCategoriesAndYears } from '../services/teachers/top'
-import { mapToProviders } from '../shared/util/mapToProviders'
+import { mapToProviders } from '../shared/util'
 import { getFullStudyProgrammeRights, splitByEmptySpace } from '../util'
 
 const router = Router()

services/backend/src/services/populations/closeToGraduation.ts

@@ -1,7 +1,7 @@
 import { col, Op } from 'sequelize'
 
 import { Course, Credit, Organization, Student, Studyplan, SISStudyRight, SISStudyRightElement } from '../../models'
-import { mapToProviders } from '../../shared/util/mapToProviders'
+import { mapToProviders } from '../../shared/util'
 import { CreditTypeCode, DegreeProgrammeType, ExtentCode, Name, SemesterEnrollment } from '../../types'
 import { redisClient } from '../redis'
 import { getCurriculumVersion } from './shared'

services/backend/src/services/populations/optimizedStatisticsOf.ts

@@ -1,10 +1,10 @@
+import { formatQueryParamsToArrays } from '../../shared/util'
 import { Criteria, DegreeProgrammeType, Name } from '../../types'
 import { getDegreeProgrammeType } from '../../util'
 import { getCriteria } from '../studyProgramme/studyProgrammeCriteria'
 import { getStudentsIncludeCoursesBetween } from './getStudentsIncludeCoursesBetween'
 import {
   dateMonthsFromNow,
-  formatQueryParamsToArrays,
   formatStudentsForApi,
   getOptionsForStudents,
   parseQueryParams,

services/backend/src/services/populations/shared.ts

@@ -455,17 +455,6 @@ export const formatStudentsForApi = async (
   }
 }
 
-export const formatQueryParamsToArrays = (query: Record<string, any>, params: string[]) => {
-  const result = { ...query }
-  params.forEach(param => {
-    if (!result[param]) {
-      return
-    }
-    result[param] = Array.isArray(result[param]) ? result[param] : [result[param]]
-  })
-  return result
-}
-
 const getSubstitutions = async (codes: string[]) => {
   const courses = await Course.findAll({
     attributes: ['code', 'substitutions'],

services/backend/src/services/providerCredits.ts

@@ -1,7 +1,7 @@
 import { InferAttributes } from 'sequelize'
 
 import { SISStudyRight } from '../models'
-import { mapToProviders } from '../shared/util/mapToProviders'
+import { mapToProviders } from '../shared/util'
 import { EnrollmentType, ExtentCode } from '../types'
 import { getCreditStats, setCreditStats } from './analyticsService'
 import { getCourseCodesOfProvider } from './providers'

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

@@ -2,7 +2,7 @@ import { orderBy, range } from 'lodash'
 import { Op } from 'sequelize'
 
 import { Credit, Enrollment } from '../../models'
-import { mapToProviders } from '../../shared/util/mapToProviders'
+import { mapToProviders } from '../../shared/util'
 import { CreditTypeCode, EnrollmentState, Name } from '../../types'
 import { isOpenUniCourseCode } from '../../util'
 import { createArrayOfCourses } from '../languageCenterData'

services/backend/src/services/studyProgramme/studyProgrammeGraduations.ts

@@ -1,7 +1,7 @@
 import { indexOf, orderBy } from 'lodash'
 import moment from 'moment'
 
-import { mapToProviders } from '../../shared/util/mapToProviders'
+import { mapToProviders } from '../../shared/util'
 import { DegreeProgrammeType, ExtentCode, Name, SemesterEnrollment, StudyTrack } from '../../types'
 import { getDegreeProgrammeType, sortByProgrammeCode } from '../../util'
 import { countTimeCategories } from '../graduationHelpers'

services/frontend/src/components/PopulationSearch/PopulationSearchForm.jsx

@@ -17,6 +17,7 @@ import { useGetAuthorizedUserQuery } from '@/redux/auth'
 import { getPopulationStatistics, clearPopulations, useGetProgrammesQuery } from '@/redux/populations'
 import { clearSelected } from '@/redux/populationSelectedStudentCourses'
 import { useGetStudyProgrammePinsQuery } from '@/redux/studyProgrammePins'
+import { formatQueryParamsToArrays } from '@/shared/util'
 import { momentFromFormat, reformatDate } from '@/util/timeAndDate'
 import './populationSearch.css'
 
@@ -94,19 +95,6 @@ const PopulationSearchForm = ({ queries, onProgress, clearSelected, getPopulatio
     return sameStudyrights && sameMonths && sameYear && sameSemesters && sameStudentStatuses && sameYears && sameTag
   }
 
-  // Identical logic can be found in the backend (src/services/populations/shared.js)
-  // If the logic changes, remember to update the backend as well
-  const formatQueryParamsToArrays = (query, params) => {
-    const res = { ...query }
-    params.forEach(param => {
-      if (!res[param]) {
-        return
-      }
-      res[param] = Array.isArray(res[param]) ? res[param] : [res[param]]
-    })
-    return res
-  }
-
   const fetchPopulation = async query => {
     const formattedQueryParams = formatQueryParamsToArrays(query, ['semesters', 'studentStatuses', 'years'])
     const uuid = crypto.randomUUID()

services/frontend/src/components/Teachers/TeacherStatistics/index.jsx

@@ -8,7 +8,7 @@ import { useGetAuthorizedUserQuery } from '@/redux/auth'
 import { useGetProvidersQuery } from '@/redux/providers'
 import { useGetSemestersQuery } from '@/redux/semesters'
 import { useLazyGetTeacherStatisticsQuery } from '@/redux/teachers'
-import { mapToProviders } from '@/shared/util/mapToProviders'
+import { mapToProviders } from '@/shared/util'
 
 export const TeacherStatistics = () => {
   const { getTextIn } = useLanguage()

services/shared/util/mapToProviders.ts → services/shared/util/index.ts

@@ -30,3 +30,14 @@ const programmeCodeToProviderCode = (programmeCode: string) => {
 export const mapToProviders = (programmeCodes: string[]) => {
   return programmeCodes.map(programmeCodeToProviderCode)
 }
+
+export const formatQueryParamsToArrays = (query: Record<string, any>, params: string[]) => {
+  const result = { ...query }
+  params.forEach(param => {
+    if (!result[param]) {
+      return
+    }
+    result[param] = Array.isArray(result[param]) ? result[param] : [result[param]]
+  })
+  return result
+}