feat: -refs: #1408

UniversityOfHelsinkiCS · Dec 9, 2024 · cda1510 · cda1510
1 parent a00db80
commit cda1510
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 4 deletions.
diff --git a/src/client/pages/FeedbackTarget/Edit/EditOrganisationSurvey.jsx b/src/client/pages/FeedbackTarget/Edit/EditOrganisationSurvey.jsx
@@ -29,6 +29,7 @@ const EditOrganisationSurvey = () => {
     endDate: organisationSurvey.closesAt,
     studentNumbers: organisationSurvey.students.map(s => s.user.studentNumber),
     teachers: organisationSurvey.userFeedbackTargets.map(t => t.user),
+    courses: organisationSurvey.organisationSurveyCourses,
   }
 
   const organisationSurveySchema = getOrganisationSurveySchema(t)

diff --git a/src/client/pages/Organisation/CourseSearchInput.tsx b/src/client/pages/Organisation/CourseSearchInput.tsx
@@ -65,7 +65,7 @@ const CourseSearchInput = ({ organisationCode }: { organisationCode: Organisatio
 
   const getOptionLabel = (course: FeedbackTarget) => {
     const { courseRealisation } = course
-    const [startDate, endDate] = getStartAndEndString(courseRealisation.startDate, courseRealisation.endDate)
+    const [startDate, endDate] = getStartAndEndString(courseRealisation?.startDate, courseRealisation?.endDate)
     const courseName = getLanguageValue(courseRealisation?.name, language)
     return `${courseName || ''} (${startDate} - ${endDate})`
   }
@@ -74,14 +74,23 @@ const CourseSearchInput = ({ organisationCode }: { organisationCode: Organisatio
     setDateRange(nextDateRange)
   }
 
+  console.log(formikProps.initialValues.courses)
+
+  const getInitialValues = (courses: CourseRealisation[]) =>
+    options
+      ?.map(({ courseRealisationId }: FeedbackTarget) => {
+        return courses.find(({ id }: CourseRealisation) => id === courseRealisationId)
+      })
+      .filter(Boolean) || []
+
   return (
     <>
       <Grid size={10}>
         <Autocomplete
           id="courses"
           disableCloseOnSelect
           multiple
-          defaultValue={formikProps.initialValues.courses}
+          defaultValue={getInitialValues(formikProps.initialValues.courses)}
           onChange={(_, courses) => {
             formikProps.setFieldValue('courses', courses)
           }}

diff --git a/src/server/migrations/20241202_00_create_organisation_survey_course_realisation_table.js b/src/server/migrations/20241202_00_create_organisation_survey_course_realisation_table.js
@@ -9,7 +9,7 @@ module.exports = {
         autoIncrement: true,
       },
       feedback_target_id: {
-        type: DataTypes.STRING,
+        type: DataTypes.INTEGER,
         allowNull: false,
       },
       course_realisation_id: {

diff --git a/src/server/models/index.ts b/src/server/models/index.ts
@@ -254,6 +254,9 @@ FeedbackTarget.hasOne(Summary, { foreignKey: 'feedbackTargetId', as: 'summary' }
 Summary.belongsTo(CourseRealisation, { foreignKey: 'entityId', as: 'courseRealisation' })
 CourseRealisation.hasOne(Summary, { foreignKey: 'entityId', as: 'summary' })
 
+FeedbackTarget.hasMany(OrganisationSurveyCourse, { foreignKey: 'feedbackTargetId', as: 'organisationSurveyCourses' })
+OrganisationSurveyCourse.belongsTo(FeedbackTarget, { foreignKey: 'feedbackTargetId', as: 'feedbackTarget' })
+
 export {
   Feedback,
   User,

diff --git a/src/server/models/organisationSurveyCourse.ts b/src/server/models/organisationSurveyCourse.ts
@@ -19,7 +19,7 @@ OrganisationSurveyCourse.init(
       autoIncrement: true,
     },
     feedbackTargetId: {
-      type: STRING,
+      type: INTEGER,
       allowNull: true,
     },
     courseRealisationId: {

diff --git a/src/server/routes/organisations/organisationSurveyController.js b/src/server/routes/organisations/organisationSurveyController.js
@@ -97,9 +97,12 @@ const createOrganisationSurvey = async (req, res) => {
 
   const survey = await getSurveyById(feedbackTarget.id)
 
+  await createOrganisationSurveyCourses(feedbackTarget.id, studentDataFromCourseIds)
+
   return res.status(201).send({
     ...survey.dataValues,
     userFeedbackTargets: [...studentFeedbackTargets, ...teacherFeedbackTargets],
+    courseIds: initialCourseIds,
   })
 }
 

diff --git a/src/server/services/organisations/organisationSurveys.js b/src/server/services/organisations/organisationSurveys.js
@@ -220,11 +220,22 @@ const getSurveyById = async feedbackTargetId => {
           as: 'user',
         },
       },
+      {
+        model: OrganisationSurveyCourse,
+        as: 'organisationSurveyCourses',
+        attributes: ['courseRealisationId'], // Include all without DISTINCT
+        required: false,
+        where: { feedbackTargetId },
+      },
     ],
   })
 
   if (!organisationSurvey) throw new Error('Organisation survey not found')
 
+  const courseIds = [...new Set(organisationSurvey.organisationSurveyCourses.map(c => c.courseRealisationId))]
+
+  organisationSurvey.organisationSurveyCourses = courseIds
+
   return organisationSurvey
 }