[Faculties] Fix type error

UniversityOfHelsinkiCS · Aug 16, 2024 · d412b25 · d412b25
1 parent 9a00ae5
commit d412b25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 28 deletions.
diff --git a/services/backend/src/services/faculty/facultyService.ts b/services/backend/src/services/faculty/facultyService.ts
@@ -3,6 +3,7 @@ import moment from 'moment'
 import { Graduated, Name, ProgrammeFilter, SpecialGroups, YearType } from '../../types'
 import { redisClient } from '../redis'
 import { getDegreeProgrammesOfFaculty } from './faculty'
+import { FacultyProgressData } from './facultyStudentProgress'
 
 const createRedisKeyForFacultyProgrammes = (id: string, programmeFilter: ProgrammeFilter) => {
   return `FACULTY_PROGRAMMES_${id}_${programmeFilter}`
@@ -247,34 +248,6 @@ export const getGraduationStats = async (
   return data
 }
 
-type Titles = Array<string[]>
-
-type ProgrammeStats = Record<string, Record<string, Array<number[]>>>
-
-type CreditCount = Record<string, number[]>
-
-type FacultyProgressData = {
-  id: string
-  years: string[]
-  yearlyBachelorTitles: Titles
-  yearlyBcMsTitles: Titles
-  yearlyMasterTitles: Titles
-  yearlyLicentiateTitles: Titles
-  programmeNames: ProgrammeNames
-  bachelorsProgStats: ProgrammeStats
-  bcMsProgStats: ProgrammeStats
-  licentiateProgStats: ProgrammeStats
-  mastersProgStats: ProgrammeStats
-  doctoralProgStats: ProgrammeStats
-  creditCounts: {
-    bachelor: CreditCount
-    bachelorMaster: CreditCount
-    master: CreditCount
-    licentiate: CreditCount
-    doctor: CreditCount
-  }
-}
-
 export const setFacultyProgressStats = async (
   data: FacultyProgressData,
   specialGroups: SpecialGroups,

diff --git a/services/backend/src/services/faculty/facultyStudentProgress.ts b/services/backend/src/services/faculty/facultyStudentProgress.ts
@@ -196,3 +196,5 @@ export const combineFacultyStudentProgress = async (
 
   return result
 }
+
+export type FacultyProgressData = Awaited<ReturnType<typeof combineFacultyStudentProgress>>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -196,3 +196,5 @@ export const combineFacultyStudentProgress = async (

		return result
		}

		export type FacultyProgressData = Awaited<ReturnType<typeof combineFacultyStudentProgress>>