@social-mail/social-mail-web-server 1.4.744 → 1.4.746

package/package.json

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

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

@@ -11,6 +11,7 @@ import { join } from "path";
 import { cacheFor } from "../../../common/cacheFor.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
+import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
 
 let cdn = globalEnv.cdn || "";
 if (cdn) {
@@ -66,9 +67,24 @@ export default class SnapshotService {
     async createSnapshot(folderID, sessionUser = null as SessionUser) {
         const { db } = this;
         db.verifyFilters = false;
-        const folder = await db.appFiles
-            .where({ folderID }, (p) => (x) => x.appFileID === p.folderID)
-            .firstOrFail();
+
+        const sourcePath = folderID + "/%";
+
+        this.allFiles = await db.appFiles.where({ sourcePath}, (p) => (x) => Sql.text.like(x.path, p.sourcePath)
+                && x.isDeleted === false
+            )
+            .toArray();
+
+        if (!this.allFiles.length) {
+            throw new EntityAccessError(`File not found under ${folderID}/`);
+        }
+
+        for (const iterator of this.allFiles) {
+            this.fileMap.set(iterator.appFileID, iterator);
+        }
+
+        const folder = this.fileMap.get(folderID);
+
 
         const dateCreated = DateTime.now;
         const dateUpdated = dateCreated;
@@ -89,22 +105,11 @@ export default class SnapshotService {
         const path = `${snapshotRoot.appFileID}/`;
         snapshotRoot.path = path;
         this.snapshotFiles.push(snapshotRoot);
-        await db.appFiles
-            .where(snapshotRoot, (p) => (x) => x.appFileID === p.appFileID)
-            .update({ path }, (p) => (x) => ({
-                path: p.path
-            }));
-
-        const sourcePath = folder.path + "%";
-
-        this.allFiles = await db.appFiles.where({ sourcePath}, (p) => (x) => Sql.text.like(x.path, p.sourcePath)
-            && x.isDeleted === false
-            )
-            .toArray();
-
-        for (const iterator of this.allFiles) {
-            this.fileMap.set(iterator.appFileID, iterator);
-        }
+        await db.appFiles.statements.update({
+            path
+        }, {
+            appFileID: snapshotRoot.appFileID
+        });
 
         this.root = folder;
         this.snapshotRoot = snapshotRoot;
@@ -148,11 +153,10 @@ export default class SnapshotService {
 
     async copyChildren(db: SocialMailContext, source: AppFile, dest: AppFile, copyMedia = true, siteRoot = "") {
         const { dateCreated, dateUpdated } = dest;
-        const all = source.children;
 
         dest.children ??= [];
 
-        for (const iterator of all) {
+        for (const iterator of source.children) {
 
             if(!copyMedia) {
                 if(/^(image|video|audio)/i.test(iterator.contentType)) {
@@ -160,7 +164,7 @@ export default class SnapshotService {
                 }
             }
 
-            console.log(`Adding ${iterator.path} - ${iterator.name} in ${dest.appFileID}`);
+            console.log(`Adding ${iterator.path} - ${iterator.name} in ${dest.path} - ${dest.name}`);
 
             const child = await db.appFiles.statements.insert({
                 ... iterator,
@@ -177,11 +181,11 @@ export default class SnapshotService {
 
             const path = `${dest.path}${child.appFileID}/`;
             child.path = path;
-            await db.appFiles
-                .where(child, (p) => (x) => x.appFileID === p.appFileID)
-                .update({ path }, (p) => (x) => ({
-                    path: p.path
-                }));
+            await db.appFiles.statements.update({
+                path
+            }, {
+                appFileID: child.appFileID
+            });
 
             if (/text\/css/i.test(iterator.contentType) || /\.css$/i.test(iterator.name)) {
                 this.cssFiles.push({ source: iterator, dest: child, siteRoot });
@@ -193,7 +197,7 @@ export default class SnapshotService {
 
 
             if (iterator.isFolder) {
-                await this.copyChildren(db, iterator, child, copyMedia);
+                await this.copyChildren(db, iterator, child, copyMedia, siteRoot + "/" + iterator.name );
             } else {
                 this.snapshotSize += Number(iterator.fileSize);
             }

package/src/server/workflows/repair/counts/RepairEmailCountsWorkflow.ts

@@ -75,6 +75,7 @@ export default class RepairEmailCountsWorkflow extends Workflow<{ mailboxID? }>
             if (lastReplyID !== iterator.lastReplyID) {
                 await db.emails.statements.update({ lastReplyID }, { emailID });
             }
+            db.changeSet.clear();
         }
         return start;
     }