@social-mail/social-mail-web-server 1.7.80 → 1.7.82

package/package.json

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

package/src/server/model/events/EmailLogEvents.ts

@@ -1,9 +1,11 @@
 import { IEntityQuery } from "@entity-access/entity-access/dist/model/IFilterWithParameter.js";
 import BaseEvents from "./BaseEvents.js";
-import Inject from "@entity-access/entity-access/dist/di/di.js";
+import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
 import BaseStorage from "../../storage/BaseStorage.js";
 import TempFileService from "../../storage/TempFileService.js";
 import { EmailLog } from "../entities/Email.js";
+import ChangeEntry from "@entity-access/entity-access/dist/model/changes/ChangeEntry.js";
+import EmailLogService from "../../services/email-logs/EmailLogService.js";
 
 
 export default class EmailLogEvents extends BaseEvents<EmailLog> {
@@ -39,4 +41,11 @@ export default class EmailLogEvents extends BaseEvents<EmailLog> {
         Object.defineProperty(entity, "url", { value: entity.url, enumerable: true });
         return entity;
     }
+
+    async afterDelete(entity: EmailLog, entry: ChangeEntry<EmailLog>) {
+        await this.storage.deleteFile(entity.cloudPath);
+
+        const els = ServiceProvider.resolve(this, EmailLogService);
+        await els.updateStorage({ emailID: entity.emailID, size: - entity.fileSize});
+    }
 }

package/src/server/services/email-logs/EmailLogService.ts

@@ -33,6 +33,7 @@ export default class EmailLogService {
         for (const element of logs) {
             await this.storage.deleteFile(element.cloudPath);
             await this.db.emailLogs.statements.delete(element);
+            await this.updateStorage({ emailID: element.emailID, size: -element.fileSize});
         }
     }
 
@@ -42,6 +43,8 @@ export default class EmailLogService {
         await this.storage.deleteFile(log.cloudPath);
         await this.db.emailLogs.statements.delete({ logID });
         await tx.commit();
+
+        await this.updateStorage({ emailID: log, size: -log.fileSize});
     }
 
     async save(emailID: number, file: LocalFile, compression: string = "gz") {
@@ -54,36 +57,18 @@ export default class EmailLogService {
         const compressed = await tfs.createFrom(file.fileName + ".gz", GZip.zip(file.openRead()), "text/plain");
         await this.storage.createFile(cloudPath, compressed);
 
+        const size = file.contentSize;
+
         const log = await db.emailLogs.statements.insert({
             emailID,
             fileName: file.fileName,
-            fileSize: file.contentSize,
+            fileSize: size,
             dateCreated,
             cloudPath,
             compression
         });
 
-        let lastError;
-
-        // we will make sure that we succeed once...
-        for (let index = 0; index < 3; index++) {
-            try {
-                await db.mailboxes.where({ emailID}, (p) => (x) => x.emails.some((e) => e.emailID === p.emailID))
-                    .update({ size: file.contentSize }, (p) => (x) => ({
-                        storage: x.storage + Sql.cast.asInteger(p.size),
-                        dateUpdated: Sql.date.now()
-                    }));
-            } catch (error) {
-                lastError = error;
-                await sleep(1000);
-                continue;
-            }
-            return log;
-        }
-
-        if(lastError) {
-            console.error(lastError);
-        }
+        await this.updateStorage({ emailID, size});
 
         return log;
     }
@@ -104,4 +89,27 @@ export default class EmailLogService {
         return tf;
     }
 
+    async updateStorage({ emailID, size }) {
+        const { db } = this;
+        let lastError = null;
+        // we will make sure that we succeed once...
+        for (let index = 0; index < 3; index++) {
+            try {
+                await db.mailboxes.where({ emailID}, (p) => (x) => x.emails.some((e) => e.emailID === p.emailID))
+                    .update({ size }, (p) => (x) => ({
+                        storage: x.storage + Sql.cast.asInteger(p.size),
+                        dateUpdated: Sql.date.now()
+                    }));
+            } catch (error) {
+                lastError = error;
+                await sleep(1000);
+                continue;
+            }
+            return;
+        }
+        if (lastError) {
+            console.error(lastError);
+        }
+    }
+
 }

package/src/server/workflows/smtp/DispatchEmailToMX.ts

@@ -300,16 +300,17 @@ export default class DispatchEmailToMX extends Workflow<IMessageEnvelope> {
 
         if (this.response?.statusCode === SmtpStatusCodes.Ok) {
 
-            await db.emailRecipients.statements.update({
-                emailID,
-                emailAddressID,
-                status: "sent",
-                dateSent: DateTime.now
-            });
             await els.saveText(emailID,this.input.to.join(","), this.response.logs);
 
             if (activityID) {
                 await db.subscriberActivities.statements.update({ activity: "sent" }, { activityID});
+            } else {
+                await db.emailRecipients.statements.update({
+                    emailID,
+                    emailAddressID,
+                    status: "sent",
+                    dateSent: DateTime.now
+                });
             }
             return;
         }