appwrite-utils-cli 0.0.19 → 0.0.20

package/dist/migrations/importController.js

@@ -59,6 +59,7 @@ export class ImportController {
             await this.importCollections(db);
             await resolveAndUpdateRelationships(db.$id, this.database, this.config);
             await this.executePostImportActions(db.$id);
+            await this.executePostImportActions(db.$id);
             console.log(`---------------------------------`);
             console.log(`Finished import data for database: ${db.name}`);
             console.log(`---------------------------------`);
@@ -207,23 +208,19 @@ export class ImportController {
                 const attributeMappingsWithActions = this.getAttributeMappingsWithActions(importDef.attributeMappings, afterImportActionContext, finalItem);
                 if (attributeMappingsWithActions.some((m) => m.postImportActions)) {
                     logger.info(`Pushing to post-import actions queue for ${context.docId}`);
-                    // const afterImportOperationContext = ContextObject.parse({
-                    //   dbId: db.$id,
-                    //   collectionId: collection.$id,
-                    //   finalItem: finalItem,
-                    //   attributeMappings: attributeMappingsWithActions,
-                    //   context: afterImportActionContext,
-                    // });
-                    // await createOrFindAfterImportOperation(
-                    //   this.database,
-                    //   context.collId,
-                    //   afterImportOperationContext
-                    // );
-                    this.postImportActionsQueue.push({
-                        context: afterImportActionContext,
+                    const afterImportOperationContext = ContextObject.parse({
+                        dbId: db.$id,
+                        collectionId: collection.$id,
                         finalItem: finalItem,
                         attributeMappings: attributeMappingsWithActions,
+                        context: afterImportActionContext,
                     });
+                    await createOrFindAfterImportOperation(this.database, context.collId, afterImportOperationContext);
+                    // this.postImportActionsQueue.push({
+                    //   context: afterImportActionContext,
+                    //   finalItem: finalItem,
+                    //   attributeMappings: attributeMappingsWithActions,
+                    // });
                 }
             }));
             results.forEach((result) => {
@@ -318,33 +315,41 @@ export class ImportController {
         });
     }
     async executePostImportActions(dbId) {
-        let actionQueue = [];
-        for (const action of this.postImportActionsQueue) {
-            actionQueue.push(this.importDataActions.executeAfterImportActions(action.finalItem, action.attributeMappings, action.context));
-        }
-        const BATCH_LIMIT = 20;
-        const splitQueue = _.chunk(actionQueue, BATCH_LIMIT);
-        for (const queue of splitQueue) {
-            const results = await Promise.allSettled(queue);
-            results.forEach((result) => {
-                if (result.status === "rejected") {
-                    console.error("An action promise was rejected:", result.reason);
-                    logger.error(`An action promise was rejected: ${result.reason} -- ${JSON.stringify(result)}`);
-                }
-            });
-        }
-        // const collectionActionsPromises = [];
-        // for (const collection of this.config.collections) {
-        //   collectionActionsPromises.push(
-        //     this.executeActionsInParallel(dbId, collection)
+        // let actionQueue: Promise<any>[] = [];
+        // for (const action of this.postImportActionsQueue) {
+        //   actionQueue.push(
+        //     this.importDataActions.executeAfterImportActions(
+        //       action.finalItem,
+        //       action.attributeMappings,
+        //       action.context
+        //     )
         //   );
         // }
-        // const results = await Promise.allSettled(collectionActionsPromises);
-        // results.forEach((result) => {
-        //   if (result.status === "rejected") {
-        //     console.error("A process batch promise was rejected:", result.reason);
-        //   }
-        // });
+        // const BATCH_LIMIT = 5;
+        // const splitQueue = _.chunk(actionQueue, BATCH_LIMIT);
+        // for (const queue of splitQueue) {
+        //   const results = await Promise.allSettled(queue);
+        //   results.forEach((result) => {
+        //     if (result.status === "rejected") {
+        //       console.error("An action promise was rejected:", result.reason);
+        //       logger.error(
+        //         `An action promise was rejected: ${
+        //           result.reason
+        //         } -- ${JSON.stringify(result)}`
+        //       );
+        //     }
+        //   });
+        // }
+        const collectionActionsPromises = [];
+        for (const collection of this.config.collections) {
+            collectionActionsPromises.push(this.executeActionsInParallel(dbId, collection));
+        }
+        const results = await Promise.allSettled(collectionActionsPromises);
+        results.forEach((result) => {
+            if (result.status === "rejected") {
+                console.error("A process batch promise was rejected:", result.reason);
+            }
+        });
     }
     async executeActionsInParallel(dbId, collection) {
         const collectionExists = await checkForCollection(this.database, dbId, collection);

package/dist/migrations/migrationHelper.js

@@ -69,11 +69,7 @@ export const getAfterImportOperations = async (database, collectionId) => {
 export const setAllPendingAfterImportActionsToReady = async (database, dbId, collectionId) => {
     let lastDocumentId;
     do {
-        const query = [
-            Query.equal("collectionId", collectionId),
-            Query.equal("status", "pending"),
-            Query.limit(100),
-        ];
+        const query = [Query.equal("collectionId", collectionId), Query.limit(100)];
         if (lastDocumentId) {
             query.push(Query.cursorAfter(lastDocumentId));
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/migrations/importController.ts

@@ -104,6 +104,7 @@ export class ImportController {
       await this.importCollections(db);
       await resolveAndUpdateRelationships(db.$id, this.database!, this.config!);
       await this.executePostImportActions(db.$id);
+      await this.executePostImportActions(db.$id);
       console.log(`---------------------------------`);
       console.log(`Finished import data for database: ${db.name}`);
       console.log(`---------------------------------`);
@@ -357,23 +358,23 @@ export class ImportController {
             logger.info(
               `Pushing to post-import actions queue for ${context.docId}`
             );
-            // const afterImportOperationContext = ContextObject.parse({
-            //   dbId: db.$id,
-            //   collectionId: collection.$id,
-            //   finalItem: finalItem,
-            //   attributeMappings: attributeMappingsWithActions,
-            //   context: afterImportActionContext,
-            // });
-            // await createOrFindAfterImportOperation(
-            //   this.database,
-            //   context.collId,
-            //   afterImportOperationContext
-            // );
-            this.postImportActionsQueue.push({
-              context: afterImportActionContext,
+            const afterImportOperationContext = ContextObject.parse({
+              dbId: db.$id,
+              collectionId: collection.$id,
               finalItem: finalItem,
               attributeMappings: attributeMappingsWithActions,
+              context: afterImportActionContext,
             });
+            await createOrFindAfterImportOperation(
+              this.database,
+              context.collId,
+              afterImportOperationContext
+            );
+            // this.postImportActionsQueue.push({
+            //   context: afterImportActionContext,
+            //   finalItem: finalItem,
+            //   attributeMappings: attributeMappingsWithActions,
+            // });
           }
         })
       );
@@ -512,43 +513,43 @@ export class ImportController {
   }
 
   async executePostImportActions(dbId: string) {
-    let actionQueue: Promise<any>[] = [];
-    for (const action of this.postImportActionsQueue) {
-      actionQueue.push(
-        this.importDataActions.executeAfterImportActions(
-          action.finalItem,
-          action.attributeMappings,
-          action.context
-        )
-      );
-    }
-    const BATCH_LIMIT = 20;
-    const splitQueue = _.chunk(actionQueue, BATCH_LIMIT);
-    for (const queue of splitQueue) {
-      const results = await Promise.allSettled(queue);
-      results.forEach((result) => {
-        if (result.status === "rejected") {
-          console.error("An action promise was rejected:", result.reason);
-          logger.error(
-            `An action promise was rejected: ${
-              result.reason
-            } -- ${JSON.stringify(result)}`
-          );
-        }
-      });
-    }
-    // const collectionActionsPromises = [];
-    // for (const collection of this.config.collections) {
-    //   collectionActionsPromises.push(
-    //     this.executeActionsInParallel(dbId, collection)
+    // let actionQueue: Promise<any>[] = [];
+    // for (const action of this.postImportActionsQueue) {
+    //   actionQueue.push(
+    //     this.importDataActions.executeAfterImportActions(
+    //       action.finalItem,
+    //       action.attributeMappings,
+    //       action.context
+    //     )
     //   );
     // }
-    // const results = await Promise.allSettled(collectionActionsPromises);
-    // results.forEach((result) => {
-    //   if (result.status === "rejected") {
-    //     console.error("A process batch promise was rejected:", result.reason);
-    //   }
-    // });
+    // const BATCH_LIMIT = 5;
+    // const splitQueue = _.chunk(actionQueue, BATCH_LIMIT);
+    // for (const queue of splitQueue) {
+    //   const results = await Promise.allSettled(queue);
+    //   results.forEach((result) => {
+    //     if (result.status === "rejected") {
+    //       console.error("An action promise was rejected:", result.reason);
+    //       logger.error(
+    //         `An action promise was rejected: ${
+    //           result.reason
+    //         } -- ${JSON.stringify(result)}`
+    //       );
+    //     }
+    //   });
+    // }
+    const collectionActionsPromises = [];
+    for (const collection of this.config.collections) {
+      collectionActionsPromises.push(
+        this.executeActionsInParallel(dbId, collection)
+      );
+    }
+    const results = await Promise.allSettled(collectionActionsPromises);
+    results.forEach((result) => {
+      if (result.status === "rejected") {
+        console.error("A process batch promise was rejected:", result.reason);
+      }
+    });
   }
 
   async executeActionsInParallel(dbId: string, collection: ConfigCollection) {

package/src/migrations/migrationHelper.ts

@@ -111,11 +111,7 @@ export const setAllPendingAfterImportActionsToReady = async (
 ) => {
   let lastDocumentId: string | undefined;
   do {
-    const query = [
-      Query.equal("collectionId", collectionId),
-      Query.equal("status", "pending"),
-      Query.limit(100),
-    ];
+    const query = [Query.equal("collectionId", collectionId), Query.limit(100)];
 
     if (lastDocumentId) {
       query.push(Query.cursorAfter(lastDocumentId));