use snake_case instead of camelCase with updateOnDuplicate

UniversityOfHelsinkiCS · Jun 13, 2024 · ca4fdff · ca4fdff
1 parent 0915974
commit ca4fdff
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/importer-mankeli/src/messageHandlers/assessmentItem.js b/importer-mankeli/src/messageHandlers/assessmentItem.js
@@ -23,5 +23,5 @@ const parseAssessmentItem = assessmentItem => {
 // ^ yes, assessment items are snapshot data ¯\_(ツ)_/¯
 module.exports = async ({ active, deleted }, transaction) => {
   const parsedAssessmentItems = [...active, ...deleted].map(parseAssessmentItem)
-  await bulkCreate(AssessmentItem, parsedAssessmentItems, transaction, ['id', 'modificationOrdinal', 'autoId'])
+  await bulkCreate(AssessmentItem, parsedAssessmentItems, transaction, ['id', 'modification_ordinal', 'auto_id'])
 }
diff --git a/importer-mankeli/src/messageHandlers/organisation.js b/importer-mankeli/src/messageHandlers/organisation.js
@@ -22,5 +22,5 @@ const parseOrganisation = organisation => {
 // the db in a similar fashion as studyrights.
 module.exports = async ({ active, deleted }, transaction) => {
   const parsedOrganisations = [...active, ...deleted].map(parseOrganisation)
-  await bulkCreate(Organisation, parsedOrganisations, transaction, ['id', 'modificationOrdinal', 'autoId'])
+  await bulkCreate(Organisation, parsedOrganisations, transaction, ['id', 'modification_ordinal', 'auto_id'])
 }
diff --git a/importer-mankeli/src/messageHandlers/studyRight.js b/importer-mankeli/src/messageHandlers/studyRight.js
@@ -43,5 +43,5 @@ const parseStudyRight = studyRight => {
 // eslint-disable-next-line
 module.exports = async ({ active, deleted }, transaction) => {
   const parsedStudyRights = [...active, ...deleted].map(parseStudyRight)
-  await bulkCreate(StudyRight, parsedStudyRights, transaction, ['id', 'modificationOrdinal', 'autoId'])
+  await bulkCreate(StudyRight, parsedStudyRights, transaction, ['id', 'modification_ordinal', 'auto_id'])
 }
diff --git a/importer-mankeli/src/utils/db.js b/importer-mankeli/src/utils/db.js
@@ -9,19 +9,16 @@ const bulkCreate = async (model, entities, transaction, properties = ['id']) =>
   try {
     await model.bulkCreate(entities, {
       updateOnDuplicate: getColumnsToUpdate(model, properties),
-      transaction,
-      logging: logger.info
+      transaction
     })
   } catch (error) {
-    logger.info(getColumnsToUpdate(model, properties))
     logger.error(error)
     // If one fails on bulkCreate, re-do them individually and report the individual failures.
     for (const entity of entities) {
       try {
         await model.upsert(entity, {
           updateOnDuplicate: getColumnsToUpdate(model, properties),
-          transaction,
-          logging: logger.info
+          transaction
         })
       } catch (e) {
         logger.error(e)