Fix and refactor updater to prevent bugs with enrolment and responsibility upserts

Author: AleksTeresh

src/server/updater/enrolments.ts

@@ -41,10 +41,9 @@ const enrolmentsHandler = async (enrolments: SisuEnrolment[]) => {
       ignoreDuplicates: true,
     },
     fallbackCreateOptions: {
-      conflictFields: ['user_id', 'chat_instanceId'],
+      conflictFields: ['user_id', 'chat_instance_id'],
       fields: ['user_id', 'chat_instance_id'],
-      returning: false,
-    }
+    },
   })
 }
 

src/server/updater/index.ts

@@ -6,7 +6,7 @@ import { fetchUsers } from './users'
 import { clearOffsets } from './util'
 
 const runUpdater = async () => {
-  // await fetchUsers()
+  await fetchUsers()
   await fetchCoursesAndResponsibilities()
   await fetchEnrolments()
 }

src/server/updater/responsibilities.ts

@@ -85,8 +85,7 @@ export const upsertResponsibilities = async (
       fallbackCreateOptions: {
         conflictFields: ['user_id', 'chat_instance_id'],
         fields: ['user_id', 'chat_instance_id'],
-        returning: false,
-      }
+      },
     })
 
     await t.commit()

src/server/updater/util.ts

@@ -15,9 +15,7 @@ type AllowedBulkCreateOptionField =
   | 'conflictAttributes'
   | 'updateOnDuplicate'
   | 'ignoreDuplicates'
-type AllowedFallbackCreateOptionField =
-  | 'fields'
-  | 'conflictFields'
+type AllowedFallbackCreateOptionField = 'fields' | 'conflictFields'
 
 interface BulkCreateOptions {
   entityName: string
@@ -36,9 +34,7 @@ export const safeBulkCreate = async ({
   entities,
 }: BulkCreateOptions) => {
   try {
-    const result = await bulkCreate(entities, {
-      ...bulkCreateOptions,
-    })
+    const result = await bulkCreate(entities, bulkCreateOptions)
     return result
   } catch (bulkCreateError: any) {
     const result = []
@@ -50,9 +46,7 @@ export const safeBulkCreate = async ({
     for (const entity of entities) {
       try {
         // eslint-disable-next-line no-await-in-loop
-        const res = await fallbackCreate(entity, {
-          ...fallbackCreateOptions,
-        })
+        const res = await fallbackCreate(entity, fallbackCreateOptions)
         result.push(res)
       } catch (fallbackCreateError: any) {
         logError(