added question for searching for courses that span over multiple periods

Author: MatiasSinisalo

scripts/get_prod_db.sh

@@ -31,12 +31,12 @@ fi
 echo "Creating backups folder"
 mkdir -p ${BACKUPS}
 
-# --- Norppa Selection ---
+# --- Selection ---
 echo "Listing available Apparaatti backups in S3 bucket..."
 backup_files=$(s3cmd -c "$S3_CONF" ls "s3://psyduck/${FOLDER_NAME}/" | awk '{print $4}' | grep '\.sql\.gz$')
 
 if [ -z "$backup_files" ]; then
-  echo "No Norppa backup files found in S3 bucket!"
+  echo "No backup files found in S3 bucket!"
   exit 1
 fi
 

src/client/V2/filterContext.tsx

@@ -64,6 +64,8 @@ interface FilterContextType {
   setMooc: (s: string) => void
   collaboration: string
   setCollaboration: (s: string) => void
+  multiPeriod: string
+  setMultiPeriod: (s: string) => void
   strictFilters: string[]
   setStrictFilters: (s: string[]) => void
 }
@@ -165,6 +167,11 @@ export const filterConfigMap = (filters: any) => new Map([
     setState: filters.setCollaboration,
     superToggle: false
   }],
+  ['multi-period', {
+    state: filters.multiPeriod,
+    setState: filters.setMultiPeriod,
+    superToggle: false
+  }],
 ])
 
 // Map coordinate keys to filter IDs for recommendation reasons
@@ -183,6 +190,7 @@ export const coordinateKeyToFilterId: { [key: string]: string } = {
   mooc: 'mooc',
   finmu: 'finmu',
   collaboration: 'collaboration',
+  multiPeriod: 'multi-period',
 }
 
 // Get translated short name for a coordinate key
@@ -260,6 +268,7 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
   const [independent, setIndependent] = useState('')
   const [mooc, setMooc] = useState('')
   const [collaboration, setCollaboration] = useState('')
+  const [multiPeriod, setMultiPeriod] = useState('')
   const [strictFilters, setStrictFilters] = useState<string[]>(['collaboration'])
 
 
@@ -345,6 +354,7 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
       'independent': getTrueFilterValue(independent, 'independent'),
       'mooc': getTrueFilterValue(mooc, 'mooc'),
       'collaboration': getTrueFilterValue(collaboration, 'collaboration'),
+      'multi-period': getTrueFilterValue(multiPeriod, 'multi-period'),
     }
 
     const answerData = Object.fromEntries(
@@ -387,6 +397,7 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
     independent,
     mooc,
     collaboration,
+    multiPeriod,
     strictFilters,
   ])
 
@@ -446,6 +457,8 @@ export const FilterContextProvider = ({ children }: { children: ReactNode }) =>
         setMooc,
         collaboration,
         setCollaboration,
+        multiPeriod,
+        setMultiPeriod,
         strictFilters,
         setStrictFilters,
       }}

src/client/hooks/useQuestions.tsx

@@ -268,6 +268,21 @@ const useQuestions = () => {
         },
       ],
     },
+    {
+      number: '',
+      mandatory: false,
+      effects: 'multiPeriod',
+      id: 'multi-period',
+      shortName: t('filterShortName:Kurssinpituus'),
+      type: 'multi',
+      variants: [
+        {
+          name: 'default',
+          question: t('form:multiPeriodQuestion'),
+          options: generateGeneralYesNoOptions(),
+        },
+      ],
+    },
     {
       number: '',
       mandatory: false,

src/client/locales/en.ts

@@ -26,6 +26,7 @@ export default {
     'flexibleQuestion': 'I want to take a course with a flexible schedule',
     'moocQuestion': 'Do you want to search for MOOCs (Massive Open Online Courses)?',
     'collaborationQuestion': 'Show collaboration partner courses',
+    'multiPeriodQuestion': 'Search for courses that span multiple periods',
     'finnish': 'finnish',
     'swedish': 'swedish',
     'english': 'english',
@@ -125,6 +126,7 @@ export default {
     'flexible': 'Want flexible schedule',
     'mooc': 'Search for MOOCs',
     'finmu': 'FinMU related',
+    'multiPeriod': 'Course duration',
   },
   'filterShortName': {
     'Opinto-oikeus': 'Study Right',
@@ -144,5 +146,6 @@ export default {
     'Periodi': 'Period',
     'MOOC': 'MOOC',
     'Yhteistyo': 'Collaboration',
+    'Kurssinpituus': 'Course Duration',
   }
 }

src/client/locales/fi.ts

@@ -26,6 +26,7 @@ export default {
     'flexibleQuestion': 'Haluan osallistua kurssille, jonka aikataulu on joustava.',
     'moocQuestion': 'Haluatko etsiä MOOC-kursseja (Massive Open Online Courses)?',
     'collaborationQuestion': 'Näytä yhteistyökumppanien kursseja',
+    'multiPeriodQuestion': 'Hae kursseja jotka kestävät usean periodin ajan',
     'finnish': 'suomi',
     'swedish': 'ruotsi',
     'english': 'englanti',
@@ -125,6 +126,7 @@ export default {
     'flexible': 'Haluan joustavan aikataulun',
     'mooc': 'Etsi MOOC-kursseja',
     'finmu': 'FinMU liittyvä',
+    'multiPeriod': 'Kurssin pituus',
   },
   'filterShortName': {
     'Opinto-oikeus': 'Opinto-oikeus',
@@ -144,5 +146,6 @@ export default {
     'Periodi': 'Periodi',
     'MOOC': 'MOOC',
     'Yhteistyo': 'Yhteistyö',
+    'Kurssinpituus': 'Kurssin pituus',
   }
 }

src/client/locales/sv.ts

@@ -25,8 +25,7 @@ export default {
     'independentQuestion': 'Jag vill arbeta självständigt eller autonomt.',
     'flexibleQuestion': 'Jag vill ta en kurs med ett flexibelt schema.',
     'moocQuestion': 'Vill du söka efter MOOCs (Massive Open Online Courses)?',
-    'collaborationQuestion': 'Visa samarbetspartnerkurser',
-    'finnish': 'finska',
+    'collaborationQuestion': 'Visa samarbetspartnerkurser',    'multiPeriodQuestion': 'Sök kurser som sträcker sig över flera perioder',    'finnish': 'finska',
     'swedish': 'svenska',
     'english': 'engelska',
     'yes': 'Ja',
@@ -121,6 +120,7 @@ export default {
     'flexible': 'Vill ha flexibelt schema',
     'mooc': 'Sök MOOC-kurser',
     'finmu': 'FinMU relaterad',
+    'multiPeriod': 'Kurslängd',
   },
   'filterShortName': {
     'Opinto-oikeus': 'Studierätt',
@@ -140,5 +140,6 @@ export default {
     'Periodi': 'Period',
     'MOOC': 'MOOC',
     'Yhteistyo': 'Samarbete',
+    'Kurssinpituus': 'Kurslängd',
   }
 }

src/common/types.ts

@@ -69,6 +69,7 @@ export type CourseCoordinates = {
   collaboration?: number | null;
   studyYear?: string | null;
   studyPeriod?: string[] | null;
+  multiPeriod?: number | null;
 }
 
 export type UserCoordinates = CourseCoordinates;
@@ -94,7 +95,7 @@ export type CourseData = {
   name: LocalizedString
   startDate: Date
   endDate: Date
-  period: null | Period
+  period: Period[] | null
   customCodeUrns: Record<string, string[]>
   courseUnitRealisationTypeUrn: string
   courseCodes: string[]
@@ -152,6 +153,7 @@ export type AnswerData = {
   'lang': string;
   'primary-language': string;
   'primary-language-specification': string;
+  'multi-period': string;
 };
 
 

src/server/util/pointRecommendCourses.ts

@@ -125,7 +125,10 @@ function pointRecommendedCourses(courses: CourseRecommendation[], userCoordinate
       filterOnFail: true,
       f: (c: CourseRecommendation, userCoordinates: UserCoordinates) => {
         if (!userCoordinates.studyYear || userCoordinates.studyYear === 'neutral') return true
-        return userCoordinates.studyYear == c.course.period?.startYear
+
+        if (!c.course.period || c.course.period.length === 0) return false
+        
+        return c.course.period.some(p => userCoordinates.studyYear === p.startYear)
       }
     },
     {
@@ -142,6 +145,10 @@ function pointRecommendedCourses(courses: CourseRecommendation[], userCoordinate
         return match
       }
     },
+    {
+      field: 'multiPeriod',
+      filterOnFail: strictFields.includes('multi-period'),
+    },
   ]
 
   const recommendationWithPoints = noExams.map((c) => {

src/server/util/recommender.ts

@@ -3,6 +3,7 @@ import { uniqueVals } from './misc.ts'
 import type { OrganisationRecommendation } from './organisationCourseRecommmendations.ts'
 import {challegeCourseCodes, codesInOrganisations, courseHasAnyOfCodes, courseHasAnyRealisationCodeUrn, courseHasCustomCodeUrn, courseMatches, finmuMentroingCourseCodes, getUserOrganisationRecommendations, languageSpesificCodes, languageToStudy, mentoringCourseCodes, readOrganisationRecommendationData } from './organisationCourseRecommmendations.ts'
 import { dateObjToPeriod, getStudyPeriod, parseDate, getStudyYear } from './studyPeriods.ts'
+import studyPeriods from './studyPeriods.ts'
 import { curcusWithUnitIdOf, curWithIdOf, cuWithCourseCodeOf, organisationWithGroupIdOf } from './dbActions.ts'
 import pointRecommendedCourses from './pointRecommendCourses.ts'
 import { allowedStudyPlaces, collaborationOrganisationNames, collaborationOrganisationCourseNameIncludes, correctValue, incorrectValue, notAnsweredValue, organisationCodeToUrn } from './constants.ts'
@@ -74,6 +75,7 @@ function calculateUserCoordinates(answerData: AnswerData) {
     collaboration: commonCoordinateFromAnswerData(readAnswer(answerData, 'collaboration'), correctValue, incorrectValue, incorrectValue),
     studyYear: readAnswer(answerData, 'study-year'),
     studyPeriod: readAsStringArr(readAnswer(answerData, 'study-period')),
+    multiPeriod: commonCoordinateFromAnswerData(readAnswer(answerData, 'multi-period'), correctValue, incorrectValue, null),
   }
   return userCoordinates
 }
@@ -207,6 +209,7 @@ async function calculateCourseCoordinates(course: CourseData, userCoordinates: U
 
   const isChallengeCourse = courseMatches(course, challegeCourseCodes, courseLanguageType)
   const isCollaboration = await courseIsCollaboration(course)
+  const isMultiPeriod = courseSpansMultiplePeriods(course)
 
   const courseCoordinates = {
     date: course.startDate.getTime(),  
@@ -223,7 +226,8 @@ async function calculateCourseCoordinates(course: CourseData, userCoordinates: U
     independent: isIndependent ? correctValue : incorrectValue,
     flexible: hasFlexibleCodeUrn ? correctValue : incorrectValue,
     mooc: hasMoocCodeUrn ? correctValue : incorrectValue,
-    collaboration: isCollaboration ? correctValue : incorrectValue
+    collaboration: isCollaboration ? correctValue : incorrectValue,
+    multiPeriod: isMultiPeriod ? correctValue : incorrectValue
   }
 
 
@@ -295,24 +299,33 @@ export async function getRealisationsWithCourseUnitCodes(courseCodeStrings: stri
   return courseRealisationsWithCodes
 }
 
-const getPeriodForCourse = (cur) => {
-    
-  const studyPeriods = dateObjToPeriod(cur.startDate) 
-
-  const studyPeriod = studyPeriods[0]
-  if(!studyPeriod){
-    dateObjToPeriod(cur.startDate, true)
+const getPeriodForCourse = (cur): Period[] | null => {
+  const courseStart = cur.startDate
+  const courseEnd = cur.endDate
+  
+  const overlappingPeriods = studyPeriods.periods.filter(periodData => {
+    const periodStart = parseDate(periodData.start_date)
+    const periodEnd = parseDate(periodData.end_date)
+    return periodStart <= courseEnd && periodEnd >= courseStart
+  })
+  
+  if (overlappingPeriods.length === 0) {
     return null
   }
+  
+  const periods: Period[] = overlappingPeriods.map(periodData => ({
+    name: periodData.name,
+    startDate: parseDate(periodData.start_date),
+    endDate: parseDate(periodData.end_date),
+    startYear: periodData.start_year,
+    endYear: periodData.end_year
+  }))
+  
+  return periods
+}
 
-  const period: Period = {
-    name: studyPeriod.name,
-    startDate: parseDate(studyPeriod.start_date),
-    endDate: parseDate(studyPeriod.end_date),
-    startYear: studyPeriod.start_year,
-    endYear: studyPeriod.end_year
-  }
-  return period
+function courseSpansMultiplePeriods(course: CourseData): boolean {
+  return (course.period?.length ?? 0) > 1
 }
 
 const getPeriodsWantedByUser = (periodsArg) => {