fix: harden admin and CMPP delivery workflows

api/src/operations/operations.service.ts

@@ -49,12 +49,16 @@ export interface DownstreamDeliveryQuery {
   keyword?: string;
   page?: number;
   pageSize?: number;
+  createdAtFrom?: string;
+  createdAtTo?: string;
 }
 
 export interface DownstreamDeliveryDashboardQuery {
   tenantId?: string;
   applicationId?: string;
   deliveryType?: string;
+  createdAtFrom?: string;
+  createdAtTo?: string;
 }
 
 export interface DownstreamRecoveryStatusQuery {
@@ -140,6 +144,7 @@ export class OperationsService {
 
   async dashboard(query: { tenantId?: string }) {
     const sinceToday = startOfToday();
+    const downstreamAlertWindow = downstreamAlertWindows();
     const messageWhereClause = messageWhere({ tenantId: query.tenantId });
     const todayMessageWhereClause = { ...messageWhereClause, queuedAt: { gte: sinceToday } };
     const [
@@ -158,6 +163,7 @@ export class OperationsService {
       downstreamFailedCount,
       downstreamDeliveredCount,
       downstreamStalledPendingCount,
+      downstreamStalledAckCount,
       downstreamRecentFailedCount,
     ] = await Promise.all([
       this.prisma.smsBatchTask.count({ where: { tenantId: query.tenantId } }),
@@ -225,19 +231,26 @@ export class OperationsService {
         where: {
           tenantId: query.tenantId,
           status: 'pending',
-          createdAt: { lte: new Date(Date.now() - downstreamAlertPendingMinutes() * 60_000) },
+          createdAt: { lte: downstreamAlertWindow.stalledPendingAt },
         },
       }),
       this.prisma.cmppDownstreamDelivery.count({
         where: {
           tenantId: query.tenantId,
-          status: 'failed',
-          updatedAt: { gte: new Date(Date.now() - downstreamAlertRecentFailedHours() * 60 * 60_000) },
+          status: 'awaiting_ack',
+          ackDeadlineAt: { lte: downstreamAlertWindow.now },
+        },
+      }),
+      this.prisma.cmppDownstreamDelivery.count({
+        where: {
+          tenantId: query.tenantId,
+          status: { in: ['failed', 'unconfirmed', 'rejected'] },
+          updatedAt: { gte: downstreamAlertWindow.recentFailedAt },
         },
       }),
     ]);
     const todayTotals = summarizeMessageGroups(todayMessageGroups);
-    const downstreamAlertCount = downstreamStalledPendingCount + downstreamRecentFailedCount;
+    const downstreamAlertCount = downstreamStalledPendingCount + downstreamStalledAckCount + downstreamRecentFailedCount;
     return {
       taskCount,
       messageStatus: messageGroups,
@@ -261,6 +274,7 @@ export class OperationsService {
         failed: downstreamFailedCount,
         delivered: downstreamDeliveredCount,
         stalledPending: downstreamStalledPendingCount,
+        stalledAck: downstreamStalledAckCount,
         recentFailed: downstreamRecentFailedCount,
         alertCount: downstreamAlertCount,
       },
@@ -413,9 +427,8 @@ export class OperationsService {
 
   async downstreamDeliveryDashboard(query: DownstreamDeliveryDashboardQuery) {
     const scopedWhere = downstreamDeliveryScopedWhere(query);
-    const stalledPendingAt = new Date(Date.now() - downstreamAlertPendingMinutes() * 60_000);
-    const recentFailedAt = new Date(Date.now() - downstreamAlertRecentFailedHours() * 60 * 60_000);
-    const [total, pending, awaitingAck, delivered, failed, unconfirmed, rejected, stalledPending, stalledAck, recentFailed, typeGroups, applicationGroups, retryZero, retryLow, retryHigh] = await Promise.all([
+    const downstreamAlertWindow = downstreamAlertWindows();
+    const [total, pending, awaitingAck, delivered, failed, unconfirmed, rejected, stalledPending, stalledAck, recentFailed, typeGroups, applicationGroups, applicationAlertGroups, retryZero, retryLow, retryHigh] = await Promise.all([
       this.prisma.cmppDownstreamDelivery.count({ where: scopedWhere }),
       this.prisma.cmppDownstreamDelivery.count({ where: { ...scopedWhere, status: 'pending' } }),
       this.prisma.cmppDownstreamDelivery.count({ where: { ...scopedWhere, status: 'awaiting_ack' } }),
@@ -427,17 +440,17 @@ export class OperationsService {
         where: {
           ...scopedWhere,
           status: 'pending',
-          createdAt: { lte: stalledPendingAt },
+          createdAt: { lte: downstreamAlertWindow.stalledPendingAt },
         },
       }),
       this.prisma.cmppDownstreamDelivery.count({
-        where: { ...scopedWhere, status: 'awaiting_ack', ackDeadlineAt: { lte: new Date() } },
+        where: { ...scopedWhere, status: 'awaiting_ack', ackDeadlineAt: { lte: downstreamAlertWindow.now } },
       }),
       this.prisma.cmppDownstreamDelivery.count({
         where: {
           ...scopedWhere,
           status: { in: ['failed', 'unconfirmed', 'rejected'] },
-          updatedAt: { gte: recentFailedAt },
+          updatedAt: { gte: downstreamAlertWindow.recentFailedAt },
         },
       }),
       this.prisma.cmppDownstreamDelivery.groupBy({
@@ -450,6 +463,11 @@ export class OperationsService {
         where: scopedWhere,
         _count: { _all: true },
       }),
+      this.prisma.cmppDownstreamDelivery.groupBy({
+        by: ['applicationId'],
+        where: downstreamAlertWhere(scopedWhere, downstreamAlertWindow),
+        _count: { _all: true },
+      }),
       this.prisma.cmppDownstreamDelivery.count({
         where: {
           ...scopedWhere,
@@ -480,8 +498,11 @@ export class OperationsService {
       })
       : [];
     const applicationMap = new Map<string, string>(applications.map((item) => [item.id, item.name]));
+    const applicationAlertMap = new Map<string, number>(
+      applicationAlertGroups.map((item) => [item.applicationId, item._count._all]),
+    );
     const groupedByType = groupDownstreamByType(typeGroups);
-    const groupedByApplication = groupDownstreamByApplication(applicationGroups, applicationMap);
+    const groupedByApplication = groupDownstreamByApplication(applicationGroups, applicationMap, applicationAlertMap);
 
     return {
       summary: {
@@ -844,14 +865,49 @@ function downstreamAlertRecentFailedHours() {
   return Number.isFinite(value) && value > 0 ? value : 1;
 }
 
+function downstreamAlertWindows(now = new Date()) {
+  return {
+    now,
+    stalledPendingAt: new Date(now.getTime() - downstreamAlertPendingMinutes() * 60_000),
+    recentFailedAt: new Date(now.getTime() - downstreamAlertRecentFailedHours() * 60 * 60_000),
+  };
+}
+
+function downstreamAlertWhere(
+  scopedWhere: Prisma.CmppDownstreamDeliveryWhereInput,
+  window: ReturnType<typeof downstreamAlertWindows>,
+): Prisma.CmppDownstreamDeliveryWhereInput {
+  return {
+    AND: [
+      scopedWhere,
+      {
+        OR: [
+          { status: 'pending', createdAt: { lte: window.stalledPendingAt } },
+          { status: 'awaiting_ack', ackDeadlineAt: { lte: window.now } },
+          { status: { in: ['failed', 'unconfirmed', 'rejected'] }, updatedAt: { gte: window.recentFailedAt } },
+        ],
+      },
+    ],
+  };
+}
+
 function downstreamDeliveryScopedWhere(query: DownstreamDeliveryDashboardQuery): Prisma.CmppDownstreamDeliveryWhereInput {
+  const createdAtFrom = parseDateBoundary(query.createdAtFrom, false);
+  const createdAtTo = parseDateBoundary(query.createdAtTo, true);
   return {
     tenantId: query.tenantId,
     applicationId: query.applicationId,
     deliveryType: query.deliveryType && query.deliveryType !== 'all' ? query.deliveryType : undefined,
+    createdAt: createdAtFrom || createdAtTo ? { gte: createdAtFrom, lte: createdAtTo } : undefined,
   };
 }
 
+function parseDateBoundary(value?: string, endOfDay = false) {
+  if (!value) return undefined;
+  const parsed = new Date(`${value}T${endOfDay ? '23:59:59.999' : '00:00:00.000'}+08:00`);
+  return Number.isNaN(parsed.getTime()) ? undefined : parsed;
+}
+
 function downstreamRecoveryStatusWhere(query: DownstreamRecoveryStatusQuery) {
   return {
     tenantId: query.tenantId,
@@ -943,6 +999,7 @@ function groupDownstreamByType(
 function groupDownstreamByApplication(
   groups: Array<{ applicationId: string; status: string; _count: { _all: number } }>,
   applicationMap: Map<string, string>,
+  applicationAlertMap: Map<string, number>,
 ) {
   const summaryMap = new Map<string, { applicationId: string; name: string; pending: number; awaitingAck: number; failed: number; unconfirmed: number; rejected: number; delivered: number; alertCount: number }>();
   groups.forEach((item) => {
@@ -970,7 +1027,7 @@ function groupDownstreamByApplication(
     } else if (item.status === 'delivered') {
       current.delivered += item._count._all;
     }
-    current.alertCount = current.pending + current.failed + current.unconfirmed + current.rejected;
+    current.alertCount = applicationAlertMap.get(item.applicationId) ?? 0;
     summaryMap.set(item.applicationId, current);
   });
   return [...summaryMap.values()];