[Updater] Remove startdate, enddate and latest_instance_date from `Co…

…urse` model
UniversityOfHelsinkiCS · Oct 24, 2024 · 59cb463 · 59cb463
1 parent 8a7426a
commit 59cb463
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 56 deletions.
diff --git a/services/backend/src/models/course.ts b/services/backend/src/models/course.ts
@@ -57,15 +57,6 @@ export class Course extends Model<InferAttributes<Course>> {
   @Column(DataType.JSONB)
   name!: Name
 
-  @Column(DataType.DATE)
-  latest_instance_date!: Date
-
-  @Column(DataType.DATE)
-  startdate!: Date
-
-  @Column(DataType.DATE)
-  enddate!: Date
-
   @Column(DataType.DATE)
   max_attainment_date!: Date
 

diff --git a/...rc/db/migrations/20241024_00_remove_startdate_enddate_latest_instance_date_from_course.js b/...rc/db/migrations/20241024_00_remove_startdate_enddate_latest_instance_date_from_course.js
@@ -0,0 +1,20 @@
+const { DATE } = require('sequelize')
+
+module.exports = {
+  up: async queryInterface => {
+    await queryInterface.removeColumn('course', 'startdate')
+    await queryInterface.removeColumn('course', 'enddate')
+    await queryInterface.removeColumn('course', 'latest_instance_date')
+  },
+  down: async queryInterface => {
+    await queryInterface.addColumn('course', 'startdate', {
+      type: DATE,
+    })
+    await queryInterface.addColumn('course', 'enddate', {
+      type: DATE,
+    })
+    await queryInterface.addColumn('course', 'latest_instance_date', {
+      type: DATE,
+    })
+  },
+}
diff --git a/updater/sis-updater-worker/src/db/models/course.js b/updater/sis-updater-worker/src/db/models/course.js
@@ -16,21 +16,12 @@ Course.init(
     name: {
       type: JSONB,
     },
-    latest_instance_date: {
-      type: DATE,
-    },
     is_study_module: {
       type: BOOLEAN,
     },
     coursetypecode: {
       type: STRING,
     },
-    startdate: {
-      type: DATE,
-    },
-    enddate: {
-      type: DATE,
-    },
     max_attainment_date: {
       type: DATE,
     },

diff --git a/updater/sis-updater-worker/src/updater/mapper.js b/updater/sis-updater-worker/src/updater/mapper.js
@@ -1,7 +1,6 @@
 const { sortBy, flatten, uniqBy } = require('lodash')
 
 const { serviceProvider } = require('../config')
-const { getMinMaxDate } = require('../utils')
 const { logger } = require('../utils/logger')
 const {
   educationTypeToExtentcode,
@@ -251,12 +250,6 @@ const courseMapper = courseIdToAttainments => (groupedCourse, substitutions) =>
   const [groupId, courses] = groupedCourse
   const { code, name, study_level: coursetypecode, course_unit_type } = courses[0]
 
-  const { min: startdate, max: enddate } = getMinMaxDate(
-    courses,
-    course => course.validity_period.startDate,
-    course => course.validity_period.endDate
-  )
-
   const { min_attainment_date, max_attainment_date } = courses.reduce(
     (res, curr) => {
       const courseAttainments = courseIdToAttainments[curr.id]
@@ -282,9 +275,6 @@ const courseMapper = courseIdToAttainments => (groupedCourse, substitutions) =>
     coursetypecode,
     min_attainment_date,
     max_attainment_date,
-    latest_instance_date: max_attainment_date,
-    startdate,
-    enddate,
     is_study_module: false, // VALIDATE THIS PLS
     substitutions,
     course_unit_type,

diff --git a/updater/sis-updater-worker/src/updater/updateStudents/attainments.js b/updater/sis-updater-worker/src/updater/updateStudents/attainments.js
@@ -172,7 +172,6 @@ const updateAttainments = async (
             id: att.id,
             name: att.name,
             code: att.code,
-            latest_instance_date: att.attainment_date,
             is_study_module: isModule(att.type),
             coursetypecode: att.study_level_urn,
             max_attainment_date: att.attainment_date,
@@ -198,7 +197,6 @@ const updateAttainments = async (
               id: parsedCourseCode,
               name: att.name,
               code: parsedCourseCode,
-              latest_instance_date: att.attainment_date,
               is_study_module: isModule(att.type),
               coursetypecode: att.study_level_urn,
               max_attainment_date: att.attainment_date,

diff --git a/updater/sis-updater-worker/src/utils/index.js b/updater/sis-updater-worker/src/utils/index.js
@@ -24,35 +24,9 @@ const isActive = entity => {
 const isBaMa = education =>
   education.education_type === 'urn:code:education-type:degree-education:bachelors-and-masters-degree'
 
-const getMinMaxDate = (arr, fMax, fMin) => {
-  let maxVal = null
-  let max = -Infinity
-  let minVal = null
-  let min = Infinity
-
-  arr.forEach(i => {
-    const ma = fMax(i)
-    const mi = fMin(i)
-
-    const maVal = new Date(ma).getTime()
-    const miVal = new Date(mi).getTime()
-    if (maVal > max) {
-      max = maVal
-      maxVal = ma
-    }
-    if (miVal < min) {
-      min = miVal
-      minVal = mi
-    }
-  })
-
-  return { max: maxVal, min: minVal }
-}
-
 module.exports = {
   getLatestSnapshot,
   isActive,
-  getMinMaxDate,
   isBaMa,
   getActiveSnapshot,
 }