@social-mail/social-mail-web-server 1.7.537 → 1.7.539

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.537",
+  "version": "1.7.539",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/seed/ui/seed-ui.ts

@@ -5,7 +5,7 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.8.108"
+        version: "1.8.111"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

package/src/server/services/files/FilePathService.ts

@@ -10,25 +10,30 @@ export default class FilePathService {
     db: SocialMailContext;
 
     async update(entity: AppFile) {
+        const { db } = this;
         const { parentID, isFolder } = entity;
+        let root = null;
         if (parentID) {
-            await this.db.appFiles.where(entity, (p) => (x) => x.appFileID === p.appFileID)
-                .update(void 0, (p) => (x) => ({ path: `${x.parent.path}${Sql.cast.asText(x.appFileID)}/` }));
-
+            const [ { path }] = await db.appFiles.where(entity, (p) => (x) => x.appFileID === p.appFileID)
+                .updateSelect(void 0, (p) => (x) => ({ path: `${x.parent.path}${Sql.cast.asText(x.appFileID)}/` }));
+            root = path + "%";
         } else if (isFolder) {
-            await this.db.appFiles.where(entity, (p) => (x) => x.appFileID === p.appFileID)
-                .update(void 0, (p) => (x) => ({ path: `${Sql.cast.asText(x.appFileID)}/` }));
+            const [{ path }] = await db.appFiles.where(entity, (p) => (x) => x.appFileID === p.appFileID)
+                .updateSelect(void 0, (p) => (x) => ({ path: `${Sql.cast.asText(x.appFileID)}/` }));
+            root = path + "%";
         }
 
-        await this.db.appFiles.where(entity, (p) => (x) => x.parentID === p.appFileID)
-            .update(void 0, (p) => (x) => ({ path: `${x.parent.path}${Sql.cast.asText(x.appFileID)}/` }));
-
-        // do this for every folder
-        const childFolders = await this.db.appFiles.where(entity, (p) => (x) => x.parentID === p.appFileID && x.isFolder === true)
-            .toArray();
-
-        for (const folder of childFolders) {
-            await this.update(folder);
+        // following logic will recursively set all path correctly for every nested level
+        // this should run in a single transaction to avoid conflicts
+
+        for(;;) {
+            const n = await db.appFiles.where({ root }, (p) => (x) => !Sql.text.like(x.path, p.root) && Sql.text.like(x.parent.path, p.root))
+                .update(void 0, (p) => (x) => ({
+                    path: `${x.parent.path}${x.appFileID}/`,
+                }));
+            if (!n) {
+                break;
+            }
         }
 
     }

package/src/server/workflows/files/DeleteFileWorkflow.ts

@@ -7,82 +7,131 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 export default class DeleteFileWorkflow extends Workflow<{ fileID }> {
 
     path: string;
+    root: string;
 
     async run() {
 
+        // mark the file as deleted and remove from parent
+        this.root = await this.markDeleted();
+
         let start = 0;
         for(;;) {
 
-            const r = await this.deleteChildren(start);
-            start = r.start;
-            if (!start) {
+            start = await this.deleteFiles(start, false);
+            if (!BigInt(start)) {
                 break;
             }
-            start = r.start;
-            if (r.children?.length) {
-                const all = r.children.map((x) => this.runChild(DeleteFileWorkflow, { fileID: x }));
-                await this.all(all);
+        }
+
+        start = 0;
+        for(;;) {
+
+            start = await this.deleteFiles(start, true);
+            if (!BigInt(start)) {
+                break;
             }
         }
 
+
         await this.deleteFile();
 
     }
 
     @UniqueActivity
-    async deleteFile(@Inject db?: SocialMailContext) {
-        await db.websiteVersions.asQuery().delete(this.input, (p) => (x) => x.snapshotFolderID === p.fileID);
-        const site = await db.websiteFolders.statements.select({}, { folderID: this.input.fileID });
-        if (site) {
-            if (site.currentTemplateID) {
-                await db.websiteFolders.where(site, (p) => (x) => x.folderID === p.currentTemplateID && x.isTemplate === true)
-                    .update(this.input, (p) => (x) => ({ templateSites: Sql.math.max(0, x.templateSites -1) }));
+    async deleteFiles(
+        start,
+        isFolder,
+        @Inject db?: SocialMailContext) {
+        const { root } = this;
+        for (let index = 0; index < 100; index++) {
+
+            db.changeSet.clear();
+
+            const q = db.appFiles
+            .where({ start, root, isFolder }, (p) => (x) =>
+                Sql.text.like(x.path, p.root)
+                && x.isFolder === p.isFolder
+                && x.appFileID > p.start)
+            .orderBy(void 0, (p) => (x) => x.appFileID)
+            .limit(20);
+
+            if (isFolder) {
+                const n = await q.delete(void 0, (p) => (x) => x.isFolder === true);
+                if (!n) {
+                    return 0;
+                }
+                continue;
+            }
+
+            const files = await db.appFiles
+                .where({ start, root, isFolder }, (p) => (x) =>
+                    Sql.text.like(x.path, p.root)
+                    && x.isFolder === p.isFolder
+                    && x.appFileID > p.start)
+                .orderBy(void 0, (p) => (x) => x.appFileID)
+                .limit(20)
+                .toArray();
+
+            if (!files.length) {
+                return 0;
+            }
+
+            for (const { appFileID } of files) {
+                start = appFileID;
+                await db.fileContents.where({ appFileID }, (p) => (x) =>
+                        x.appFiles.some((f) => f.appFileID === p.appFileID)
+                        || x.versions.some((v) => v.fileID === p.appFileID))
+                        .update(void 0, (p) => (x) => ({ deleted: true }));
+                await db.fileVersions.asQuery()
+                    .delete({ appFileID }, (p) => (x) => x.fileID === p.appFileID);
+                await db.appFiles.statements.delete({ appFileID });
             }
-            await db.websiteFolders.statements.delete({ folderID: site.folderID });
         }
-        await db.appFiles.statements.delete({ appFileID: this.input.fileID});
+        return start;
     }
 
     @UniqueActivity
-    async deleteChildren(
-        start?: number,
-        @Inject db?: SocialMailContext
-    ) {
-        const { fileID } = this.input;
-        const files = await db.appFiles
-            .where({ fileID , start }, (p) => (x) =>
-                x.parentID === p.fileID
-                && x.appFileID > p.start)
-            .orderBy(void 0, (p) => (x) => x.appFileID)
-            .limit(20)
-            .toArray();
+    async markDeleted(@Inject db?: SocialMailContext) {
+        const { fileID: appFileID } = this.input;
 
-            const children = [];
+        await using tx = await db.connection.createTransaction();
 
-        if (files.length === 0) {
-            return { start: 0, children };
-        }
+        const now = Date.now();
 
-        for (const { appFileID, isFolder } of files) {
-            start = appFileID;
+        let root = `x-${now.toString(36)}/${appFileID}/`;
 
-            if (isFolder) {
-                children.push(appFileID);
-                continue;
+        await db.appFiles.statements.update({ parentID: null, path: root, isDeleted: true  }, { appFileID });
+
+        root += "%";
+
+        for(;;) {
+            const n = await db.appFiles.where({ root }, (p) => (x) => !Sql.text.like(x.path, p.root) && Sql.text.like(x.parent.path, p.root))
+                .update(void 0, (p) => (x) => ({
+                    path: `${x.parent.path}${x.appFileID}/`,
+                    isDeleted: true
+                }));
+            if (!n) {
+                break;
             }
+        }
 
-            await db.fileContents.where({ appFileID }, (p) => (x) =>
-                x.appFiles.some((f) => f.appFileID === p.appFileID)
-                || x.versions.some((v) => v.fileID === p.appFileID))
-                .update(void 0, (p) => (x) => ({ deleted: true }));
+        await tx.commit();
 
-            await db.fileVersions.asQuery()
-                .delete({ appFileID }, (p) => (x) => x.fileID === p.appFileID);
+        return root;
+    }
 
-            await db.appFiles.statements.delete({ appFileID });
+    @UniqueActivity
+    async deleteFile(@Inject db?: SocialMailContext) {
+        await db.websiteVersions.asQuery().delete(this.input, (p) => (x) => x.snapshotFolderID === p.fileID);
+        const site = await db.websiteFolders.statements.select({}, { folderID: this.input.fileID });
+        if (site) {
+            if (site.currentTemplateID) {
+                await db.websiteFolders.where(site, (p) => (x) => x.folderID === p.currentTemplateID && x.isTemplate === true)
+                    .update(this.input, (p) => (x) => ({ templateSites: Sql.math.max(0, x.templateSites -1) }));
+            }
+            await db.websiteFolders.statements.delete({ folderID: site.folderID });
         }
-
-        return { start, children };
+        await db.appFiles.statements.delete({ appFileID: this.input.fileID});
     }