WIP: fix Curre Chat Updater to prevent enrolments errors in prod

Author: Tereshchenko Aleksandr

src/server/db/models/enrolment.ts

@@ -42,7 +42,7 @@ Enrolment.init(
     indexes: [
       {
         unique: true,
-        fields: ['userId', 'chatInstanceId'],
+        fields: ['user_id', 'chat_instance_id'],
       },
     ],
   }

src/server/db/models/responsibilities.ts

@@ -42,7 +42,7 @@ Responsibility.init(
     indexes: [
       {
         unique: true,
-        fields: ['userId', 'chatInstanceId'],
+        fields: ['user_id', 'chat_instance_id'],
       },
     ],
   }

src/server/index.ts

@@ -33,7 +33,7 @@ if (inProduction || inStaging) {
 app.listen(PORT, async () => {
   await connectToDatabase()
   await seed()
-  if (inProduction || inStaging) {
+  if (true || inProduction || inStaging) {
     await setupCron()
   }
 

src/server/types.ts

@@ -2,6 +2,8 @@ import { Request } from 'express'
 import OpenAI from 'openai'
 import { ChatRequestMessage, GetChatCompletionsOptions } from '@azure/openai'
 
+export type PartialRecord<K extends keyof any, T> =  Partial<Record<K, T>>
+
 export interface User {
   id: string
   username: string

src/server/updater/courses.ts

@@ -60,10 +60,13 @@ const createChatInstance = async (
     entities: chatInstances,
     bulkCreate: async (e, opts) => ChatInstance.bulkCreate(e, opts),
     fallbackCreate: async (e, opts) => ChatInstance.upsert(e, opts),
-    options: {
+    bulkCreateOptions: {
       updateOnDuplicate: ['name'],
       conflictAttributes: ['courseId'],
     },
+    fallbackCreateOptions: {
+      fields: ['courseId']
+    }
   })
 }
 

src/server/updater/enrolments.ts

@@ -36,10 +36,15 @@ const enrolmentsHandler = async (enrolments: SisuEnrolment[]) => {
     entities: toInsert,
     bulkCreate: async (e, opt) => Enrolment.bulkCreate(e, opt),
     fallbackCreate: async (e, opt) => Enrolment.upsert(e, opt),
-    options: {
-      conflictAttributes: ['user_id', 'chat_instance_id'],
+    bulkCreateOptions: {
+      conflictAttributes: ['userId', 'chatInstanceId'],
       ignoreDuplicates: true,
     },
+    fallbackCreateOptions: {
+      conflictFields: ['user_id', 'chat_instanceId'],
+      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

@@ -78,10 +78,15 @@ export const upsertResponsibilities = async (
       entities: responsibilitiesToInsert,
       bulkCreate: async (e, opts) => Responsibility.bulkCreate(e, opts),
       fallbackCreate: async (e, opts) => Responsibility.upsert(e, opts),
-      options: {
-        conflictAttributes: ['user_id', 'chat_instance_id'],
+      bulkCreateOptions: {
+        conflictAttributes: ['userId', 'chatInstanceId'],
         ignoreDuplicates: true,
       },
+      fallbackCreateOptions: {
+        conflictFields: ['user_id', 'chat_instance_id'],
+        fields: ['user_id', 'chat_instance_id'],
+        returning: false,
+      }
     })
 
     await t.commit()

src/server/updater/users.ts

@@ -33,9 +33,12 @@ const usersHandler = async (users: SisuUser[]) => {
     entities: parsedUsers,
     bulkCreate: async (e, opt) => User.bulkCreate(e, opt),
     fallbackCreate: async (e, opt) => User.upsert(e, opt),
-    options: {
+    bulkCreateOptions: {
       updateOnDuplicate: ['language', 'username'],
     },
+    fallbackCreateOptions: {
+      fields: ['language', 'username'],
+    }
   })
 }
 

src/server/updater/util.ts

@@ -3,29 +3,42 @@ import * as Sentry from '@sentry/node'
 
 import { redis } from '../util/redis'
 import logger from '../util/logger'
+import { PartialRecord } from '../types'
 
 const logError = (message: string, error: Error) => {
   logger.error(`${message} ${error.name}, ${error.message}`)
 
   Sentry.captureException(error)
 }
 
+type AllowedBulkCreateOptionField =
+  | 'conflictAttributes'
+  | 'updateOnDuplicate'
+  | 'ignoreDuplicates'
+type AllowedFallbackCreateOptionField =
+  | 'fields'
+  | 'conflictFields'
+
 interface BulkCreateOptions {
   entityName: string
   bulkCreate: (entities: object[], options: any) => Promise<any>
   fallbackCreate: (entity: object, options: any) => Promise<any>
-  options: Record<string, any>
+  bulkCreateOptions: PartialRecord<AllowedBulkCreateOptionField, any>
+  fallbackCreateOptions: PartialRecord<AllowedFallbackCreateOptionField, any>
   entities: Record<string, any>[]
 }
 export const safeBulkCreate = async ({
   entityName,
   bulkCreate,
   fallbackCreate,
-  options,
+  bulkCreateOptions,
+  fallbackCreateOptions,
   entities,
 }: BulkCreateOptions) => {
   try {
-    const result = await bulkCreate(entities, options)
+    const result = await bulkCreate(entities, {
+      ...bulkCreateOptions,
+    })
     return result
   } catch (bulkCreateError: any) {
     const result = []
@@ -38,8 +51,7 @@ export const safeBulkCreate = async ({
       try {
         // eslint-disable-next-line no-await-in-loop
         const res = await fallbackCreate(entity, {
-          ...options,
-          fields: options.updateOnDuplicate,
+          ...fallbackCreateOptions,
         })
         result.push(res)
       } catch (fallbackCreateError: any) {