chore: Refactor data import (#3434)

* Complete refactor of import

* feat: Notion data import (#3442)

server/commands/documentCreator.ts

@@ -1,9 +1,11 @@
 import invariant from "invariant";
+import { Transaction } from "sequelize";
 import { Document, Event, User } from "@server/models";
 
 export default async function documentCreator({
   title = "",
   text = "",
+  id,
   publish,
   collectionId,
   parentDocumentId,
@@ -14,15 +16,19 @@ export default async function documentCreator({
   template,
   user,
   editorVersion,
+  publishedAt,
   source,
   ip,
+  transaction,
 }: {
+  id?: string;
   title: string;
   text: string;
   publish?: boolean;
   collectionId: string;
   parentDocumentId?: string;
   templateDocument?: Document | null;
+  publishedAt?: Date;
   template?: boolean;
   createdAt?: Date;
   updatedAt?: Date;
@@ -30,42 +36,35 @@ export default async function documentCreator({
   user: User;
   editorVersion?: string;
   source?: "import";
-  ip: string;
+  ip?: string;
+  transaction: Transaction;
 }): Promise<Document> {
   const templateId = templateDocument ? templateDocument.id : undefined;
-  const document = await Document.create({
-    parentDocumentId,
-    editorVersion,
-    collectionId,
-    teamId: user.teamId,
-    userId: user.id,
-    createdAt,
-    updatedAt,
-    lastModifiedById: user.id,
-    createdById: user.id,
-    template,
-    templateId,
-    title: templateDocument ? templateDocument.title : title,
-    text: templateDocument ? templateDocument.text : text,
-  });
-  await Event.create({
-    name: "documents.create",
-    documentId: document.id,
-    collectionId: document.collectionId,
-    teamId: document.teamId,
-    actorId: user.id,
-    data: {
-      source,
-      title: document.title,
+  const document = await Document.create(
+    {
+      id,
+      parentDocumentId,
+      editorVersion,
+      collectionId,
+      teamId: user.teamId,
+      userId: user.id,
+      createdAt,
+      updatedAt,
+      lastModifiedById: user.id,
+      createdById: user.id,
+      template,
       templateId,
+      publishedAt,
+      title: templateDocument ? templateDocument.title : title,
+      text: templateDocument ? templateDocument.text : text,
     },
-    ip,
-  });
-
-  if (publish) {
-    await document.publish(user.id);
-    await Event.create({
-      name: "documents.publish",
+    {
+      transaction,
+    }
+  );
+  await Event.create(
+    {
+      name: "documents.create",
       documentId: document.id,
       collectionId: document.collectionId,
       teamId: document.teamId,
@@ -73,9 +72,34 @@ export default async function documentCreator({
       data: {
         source,
         title: document.title,
+        templateId,
       },
       ip,
-    });
+    },
+    {
+      transaction,
+    }
+  );
+
+  if (publish) {
+    await document.publish(user.id, { transaction });
+    await Event.create(
+      {
+        name: "documents.publish",
+        documentId: document.id,
+        collectionId: document.collectionId,
+        teamId: document.teamId,
+        actorId: user.id,
+        data: {
+          source,
+          title: document.title,
+        },
+        ip,
+      },
+      {
+        transaction,
+      }
+    );
   }
 
   // reload to get all of the data needed to present (user, collection etc)
@@ -86,6 +110,7 @@ export default async function documentCreator({
       id: document.id,
       publishedAt: document.publishedAt,
     },
+    transaction,
   });
   invariant(doc, "Document must exist");