@spfn/notification 0.1.0-beta.24 → 0.1.0-beta.25

package/dist/server.js

@@ -621,7 +621,7 @@ function registerBuiltinTemplates() {
 
 // src/services/notification.service.ts
 import { create, createMany, findOne, findMany, updateOne, count, getDatabase } from "@spfn/core/db";
-import { desc, eq, and, gte, lte, count as drizzleCount } from "drizzle-orm";
+import { desc, eq, and, gte, lte, inArray, sql, count as drizzleCount } from "drizzle-orm";
 
 // src/entities/schema.ts
 import { createSchema } from "@spfn/core/db";
@@ -799,6 +799,34 @@ async function markNotificationFailed(id3, errorMessage) {
     }
   );
 }
+async function markManySent(items) {
+  if (items.length === 0) {
+    return;
+  }
+  const cases = sql.join(
+    items.map((it) => sql`when ${it.id} then ${it.providerMessageId ?? null}`),
+    sql` `
+  );
+  await getDatabase("write").update(notifications).set({
+    status: "sent",
+    sentAt: /* @__PURE__ */ new Date(),
+    // ELSE keeps the existing value and anchors the CASE result type to text.
+    providerMessageId: sql`case ${notifications.id} ${cases} else ${notifications.providerMessageId} end`
+  }).where(inArray(notifications.id, items.map((it) => it.id)));
+}
+async function markManyFailed(items) {
+  if (items.length === 0) {
+    return;
+  }
+  const cases = sql.join(
+    items.map((it) => sql`when ${it.id} then ${it.errorMessage}`),
+    sql` `
+  );
+  await getDatabase("write").update(notifications).set({
+    status: "failed",
+    errorMessage: sql`case ${notifications.id} ${cases} else ${notifications.errorMessage} end`
+  }).where(inArray(notifications.id, items.map((it) => it.id)));
+}
 async function markNotificationPending(id3) {
   return await updateOne(
     notifications,
@@ -3805,7 +3833,8 @@ async function sendEmailBulk(items, options) {
   for (const { index: index3, result } of earlyFailures) {
     results[index3] = result;
   }
-  const historyUpdates = [];
+  const sentItems = [];
+  const failedItems = [];
   for (let i = 0; i < prepared.length; i++) {
     const { index: index3, recipients, subject } = prepared[i];
     const result = sendResults[i];
@@ -3819,13 +3848,17 @@ async function sendEmailBulk(items, options) {
     }
     const historyId = historyRecords[i]?.id;
     if (historyId && isHistoryEnabled()) {
-      const promise = result.success ? markNotificationSent(historyId, result.messageId) : markNotificationFailed(historyId, result.error || "Unknown error");
-      historyUpdates.push(
-        promise.catch((err) => log2.warn("Failed to update notification history", err))
-      );
+      if (result.success) {
+        sentItems.push({ id: historyId, providerMessageId: result.messageId });
+      } else {
+        failedItems.push({ id: historyId, errorMessage: result.error || "Unknown error" });
+      }
     }
   }
-  await Promise.all(historyUpdates);
+  await Promise.all([
+    markManySent(sentItems).catch((err) => log2.warn("Failed to update notification history", err)),
+    markManyFailed(failedItems).catch((err) => log2.warn("Failed to update notification history", err))
+  ]);
   return { results, successCount, failureCount, batchId };
 }
 
@@ -4100,7 +4133,8 @@ async function sendSMSBulk(items, options) {
     concurrency
   );
   const resultsMap = /* @__PURE__ */ new Map();
-  const historyUpdates = [];
+  const sentItems = [];
+  const failedItems = [];
   for (let i = 0; i < prepared.length; i++) {
     const { index: index3, phone } = prepared[i];
     const result = sendResults[i];
@@ -4115,13 +4149,17 @@ async function sendSMSBulk(items, options) {
     }
     const historyId = historyRecords[i]?.id;
     if (historyId && isHistoryEnabled()) {
-      const promise = result.success ? markNotificationSent(historyId, result.messageId) : markNotificationFailed(historyId, result.error || "Unknown error");
-      historyUpdates.push(
-        promise.catch((err) => log4.warn("Failed to update notification history", err))
-      );
+      if (result.success) {
+        sentItems.push({ id: historyId, providerMessageId: result.messageId });
+      } else {
+        failedItems.push({ id: historyId, errorMessage: result.error || "Unknown error" });
+      }
     }
   }
-  await Promise.all(historyUpdates);
+  await Promise.all([
+    markManySent(sentItems).catch((err) => log4.warn("Failed to update notification history", err)),
+    markManyFailed(failedItems).catch((err) => log4.warn("Failed to update notification history", err))
+  ]);
   const results = new Array(items.length);
   let successCount = 0;
   let failureCount = earlyFailures.length;
@@ -4381,7 +4419,8 @@ async function sendSlackBulk(items, options) {
   for (const { index: index3, result } of earlyFailures) {
     results[index3] = result;
   }
-  const historyUpdates = [];
+  const sentItems = [];
+  const failedItems = [];
   for (let i = 0; i < prepared.length; i++) {
     const { index: index3 } = prepared[i];
     const result = sendResults[i];
@@ -4395,13 +4434,17 @@ async function sendSlackBulk(items, options) {
     }
     const historyId = historyRecords[i]?.id;
     if (historyId && isHistoryEnabled()) {
-      const promise = result.success ? markNotificationSent(historyId, result.messageId) : markNotificationFailed(historyId, result.error || "Unknown error");
-      historyUpdates.push(
-        promise.catch((err) => log6.warn("Failed to update notification history", err))
-      );
+      if (result.success) {
+        sentItems.push({ id: historyId, providerMessageId: result.messageId });
+      } else {
+        failedItems.push({ id: historyId, errorMessage: result.error || "Unknown error" });
+      }
     }
   }
-  await Promise.all(historyUpdates);
+  await Promise.all([
+    markManySent(sentItems).catch((err) => log6.warn("Failed to update notification history", err)),
+    markManyFailed(failedItems).catch((err) => log6.warn("Failed to update notification history", err))
+  ]);
   return { results, successCount, failureCount, batchId };
 }