chore: Refactor data import (#3434)

* Complete refactor of import

* feat: Notion data import (#3442)

server/models/Document.ts

@@ -9,6 +9,7 @@ import {
   FindOptions,
   ScopeOptions,
   WhereOptions,
+  SaveOptions,
 } from "sequelize";
 import {
   ForeignKey,
@@ -238,7 +239,10 @@ class Document extends ParanoidModel {
   // hooks
 
   @BeforeSave
-  static async updateTitleInCollectionStructure(model: Document) {
+  static async updateTitleInCollectionStructure(
+    model: Document,
+    { transaction }: SaveOptions<Document>
+  ) {
     // templates, drafts, and archived documents don't appear in the structure
     // and so never need to be updated when the title changes
     if (
@@ -250,18 +254,16 @@ class Document extends ParanoidModel {
       return;
     }
 
-    return this.sequelize!.transaction(async (transaction: Transaction) => {
-      const collection = await Collection.findByPk(model.collectionId, {
-        transaction,
-        lock: transaction.LOCK.UPDATE,
-      });
-      if (!collection) {
-        return;
-      }
-
-      await collection.updateDocument(model, { transaction });
-      model.collection = collection;
+    const collection = await Collection.findByPk(model.collectionId, {
+      transaction,
+      lock: Transaction.LOCK.UPDATE,
     });
+    if (!collection) {
+      return;
+    }
+
+    await collection.updateDocument(model, { transaction });
+    model.collection = collection;
   }
 
   @AfterCreate
@@ -801,30 +803,28 @@ class Document extends ParanoidModel {
     return this.save(options);
   };
 
-  publish = async (userId: string) => {
+  publish = async (userId: string, { transaction }: SaveOptions<Document>) => {
     // If the document is already published then calling publish should act like
     // a regular save
     if (this.publishedAt) {
-      return this.save();
+      return this.save({ transaction });
     }
 
-    await this.sequelize.transaction(async (transaction: Transaction) => {
-      if (!this.template) {
-        const collection = await Collection.findByPk(this.collectionId, {
-          transaction,
-          lock: transaction.LOCK.UPDATE,
-        });
+    if (!this.template) {
+      const collection = await Collection.findByPk(this.collectionId, {
+        transaction,
+        lock: Transaction.LOCK.UPDATE,
+      });
 
-        if (collection) {
-          await collection.addDocumentToStructure(this, 0, { transaction });
-          this.collection = collection;
-        }
+      if (collection) {
+        await collection.addDocumentToStructure(this, 0, { transaction });
+        this.collection = collection;
       }
-    });
+    }
 
     this.lastModifiedById = userId;
     this.publishedAt = new Date();
-    return this.save();
+    return this.save({ transaction });
   };
 
   unpublish = async (userId: string) => {