@social-mail/social-mail-web-server 1.4.682 → 1.4.684

package/package.json

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

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

@@ -1,49 +1,46 @@
-import { RegisterSingleton } from "@entity-access/entity-access/dist/di/di.js";
+import { RegisterScoped, ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import AppFile from "../../model/entities/AppFile.js";
 import { globalServices } from "../../../globalServices.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
 
-@RegisterSingleton
+@RegisterScoped
 export default class FileVersionService {
 
     public async saveVersion(user: SessionUser, file: AppFile) {
         const { userID, sessionID } = user ?? {};
-        using scope = globalServices.createScope();
-        const db = scope.resolve(SocialMailContext);
+        const db = ServiceProvider.resolve(this, SocialMailContext);
         const dateCreated = DateTime.now;
         db.verifyFilters = false;
         db.raiseEvents = false;
-        await db.connection.runInTransaction(async () => {
-            await db.fileVersions.saveDirect({
-                mode: "insert",
-                changes: {
-                    fileID: file.appFileID,
-                    userID,
-                    sessionID,
-                    fileContentID: file.fileContentID,
-                    name: file.name,
-                    dateCreated
-                }
-            });
-            await db.appFiles.where(file, (p) => (x) => x.appFileID === p.appFileID)
-                .update(void 0, (p) => (x) => ({ versions: x.versions === null ? 0 : x.versions + 1 }));
+        await db.fileVersions.saveDirect({
+            mode: "insert",
+            changes: {
+                fileID: file.appFileID,
+                userID,
+                sessionID,
+                fileContentID: file.fileContentID,
+                name: file.name,
+                dateCreated
+            }
+        });
+        await db.appFiles.where(file, (p) => (x) => x.appFileID === p.appFileID)
+            .update(void 0, (p) => (x) => ({ versions: x.versions === null ? 0 : x.versions + 1 }));
 
-            if (!file.path && file.parentID) {
-                // get from parent...
-                file = await db.appFiles
-                    .where(file, (p) => (x) => x.appFileID === p.parentID)
-                    .first();
-                if (!file?.path) {
-                    return;
-                }
+        if (!file.path && file.parentID) {
+            // get from parent...
+            file = await db.appFiles
+                .where(file, (p) => (x) => x.appFileID === p.parentID)
+                .first();
+            if (!file?.path) {
+                return;
             }
+        }
 
-            const rootFolder = /\d+/.exec(file.path)[0] as any;
-            await db.websiteFolders.where({ rootFolder }, (p) => (x) => x.folderID === p.rootFolder)
-                .update(void 0, (p) => (x) => ({ isModified: true }));
-        });
+        const rootFolder = /\d+/.exec(file.path)[0] as any;
+        await db.websiteFolders.where({ rootFolder }, (p) => (x) => x.folderID === p.rootFolder)
+            .update(void 0, (p) => (x) => ({ isModified: true }));
     }
 
 }

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-console */
 import Inject, { RegisterScoped, RegisterTransient } from "@entity-access/entity-access/dist/di/di.js";
 import { JSDOM } from 'jsdom';
 import SocialMailContext from "../../model/SocialMailContext.js";
@@ -189,7 +190,7 @@ export default class SnapshotService {
             if (iterator.isFolder) {
                 await this.copyChildren(db, iterator, child, path, copyMedia, siteRoot + "/" + child.name);
             } else {
-                this.snapshotSize += iterator.fileSize;
+                this.snapshotSize += Number(iterator.fileSize);
             }
         }
     }