@social-mail/social-mail-web-server 1.7.511 → 1.7.515

package/package.json

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

package/src/server/services/store/StorePaymentGatewayService.ts

@@ -3,10 +3,8 @@ import SocialMailContext from "../../model/SocialMailContext.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import LedgerPaymentGateway from "./LedgerPaymentGateway.js";
 import XNode from "@entity-access/server-pages/dist/html/XNode.js";
-import StorePaymentAttempt from "../../model/entities/StorePaymentAttempt.js";
 import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
 import QueueInvokeWebHookWorkflow from "../../workflows/web-hooks/QueueInvokeWebHookWorkflow.js";
-import FetchCheckoutResultWorkflow from "../../workflows/store/FetchCheckoutResultWorkflow.js";
 
 @RegisterScoped
 export default class StorePaymentGatewayService {

package/src/server/workflows/channel/library/SendLibraryContentWorkflow.ts

@@ -1,6 +1,5 @@
 import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
 import SocialMailContext from "../../../model/SocialMailContext.js";
-import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { randomUUID } from "node:crypto";
 import DispatchEmailToMX from "../../smtp/DispatchEmailToMX.js";
 import BroadcastEmail from "../BroadcastEmail.js";
@@ -18,7 +17,7 @@ export default class SendLibraryContentWorkflow extends Workflow<ISendLibraryCon
 
     static broadcast(context: WorkflowContext, input: ISendLibraryContentWorkflowParams ) {
         return context.queue(SendLibraryContentWorkflow, input, {
-            id: `library-broadcast-${input.channelID}-${input.recipientID}`,
+            id: `library-broadcast-${input.channelID}-${input.recipientID}-${Date.now()}`,
         });
     }
 
@@ -35,6 +34,7 @@ export default class SendLibraryContentWorkflow extends Workflow<ISendLibraryCon
     @UniqueActivity
     async send(
         start,
+        @Inject eas?: EmailAddressService,
         @Inject db?: SocialMailContext
     ) {
 
@@ -50,7 +50,7 @@ export default class SendLibraryContentWorkflow extends Workflow<ISendLibraryCon
             return 0;
         }
 
-        const recipient = await db.emailAddresses.statements.select({ }, { emailAddressID: recipientID });
+        const recipient = await eas.getEmailAddress(recipientID);
 
         const to = recipient.emailAddress;
 

package/src/server/workflows/daily/DailyWorkflow.ts

@@ -64,8 +64,11 @@ export default class DailyWorkflow extends Workflow<any,any> {
             await SyncMailboxWorkflow.startSyncing(this.context, iterator.syncTargetID);
         }
 
+        const now = DateTime.now;
+        const id = `fetch-checkout-result-${now.year}-${now.month}-${now.day}-${now.hour}-${Math.floor(now.minute / 15)}`;
+
         await this.context.queue(FetchCheckoutResultWorkflow, null , {
-            id: `fetch-checkout-result-${Date.now()}`
+            id
         });
 
         // const mbs = await db.mailboxes.where({}, (p) => (x) => x.indexAttachments === true)