Fix DB model in importer-db-api according to changes made to importer…

…-mankeli's model when upgrading sequelize
UniversityOfHelsinkiCS · Jun 17, 2024 · 5bbba16 · 5bbba16
1 parent eae72ea
commit 5bbba16
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 16 deletions.
diff --git a/importer-db-api/src/models/AssessmentItem.js b/importer-db-api/src/models/AssessmentItem.js
@@ -28,12 +28,10 @@ AssessmentItem.init(
       autoIncrement: true
     },
     id: {
-      type: STRING,
-      unique: true
+      type: STRING
     },
     modificationOrdinal: {
-      type: BIGINT,
-      unique: true
+      type: BIGINT
     },
     documentState: {
       type: STRING
@@ -80,7 +78,7 @@ AssessmentItem.init(
     indexes: [
       {
         unique: true,
-        fields: ['id', 'modificationOrdinal']
+        fields: ['id', 'modification_ordinal']
       },
       {
         fields: ['id']

diff --git a/importer-db-api/src/models/Disclosure.js b/importer-db-api/src/models/Disclosure.js
@@ -33,7 +33,7 @@ Disclosure.init(
         fields: ['id']
       },
       {
-        fields: ['disclosureCategoryId']
+        fields: ['disclosure_category_id']
       }
     ]
   }

diff --git a/importer-db-api/src/models/Organisation.js b/importer-db-api/src/models/Organisation.js
@@ -62,12 +62,10 @@ Organisation.init(
       autoIncrement: true
     },
     id: {
-      type: STRING,
-      unique: true
+      type: STRING
     },
     modificationOrdinal: {
-      type: BIGINT,
-      unique: true
+      type: BIGINT
     },
     documentState: {
       type: STRING
@@ -114,7 +112,7 @@ Organisation.init(
     indexes: [
       {
         unique: true,
-        fields: ['id', 'modificationOrdinal']
+        fields: ['id', 'modification_ordinal']
       },
       {
         fields: ['id']

diff --git a/importer-db-api/src/models/StudyRight.js b/importer-db-api/src/models/StudyRight.js
@@ -11,8 +11,7 @@ StudyRight.init(
       autoIncrement: true
     },
     id: {
-      type: STRING,
-      unique: true
+      type: STRING
     },
     personId: {
       type: STRING
@@ -27,8 +26,7 @@ StudyRight.init(
       type: STRING
     },
     modificationOrdinal: {
-      type: BIGINT,
-      unique: true
+      type: BIGINT
     },
     documentState: {
       type: STRING
@@ -96,7 +94,7 @@ StudyRight.init(
     indexes: [
       {
         unique: true,
-        fields: ['id', 'modificationOrdinal']
+        fields: ['id', 'modification_ordinal']
       },
       {
         fields: ['id']
-Original file line number
+Diff line change
@@ Expand Up / @@ -33,7 +33,7 @@ Disclosure.init( @@
             fields: ['id']
           },
           {
-            fields: ['disclosureCategoryId']
+            fields: ['disclosure_category_id']
           }
         ]
       }
@@ Expand Down @@