fix: harden dependencies and downstream delivery

api/src/operations/operations.service.ts

@@ -186,7 +186,7 @@ export class OperationsService {
         _count: { _all: true },
       }),
       this.prisma.accountTransaction.aggregate({
-        where: { tenantId: query.tenantId, transactionType: 'refunded', createdAt: { gte: sinceToday } },
+        where: returnedTransactionWhere(sinceToday, query.tenantId),
         _sum: { amountCents: true },
         _count: { _all: true },
       }),
@@ -230,8 +230,7 @@ export class OperationsService {
       this.prisma.cmppDownstreamDelivery.count({
         where: {
           tenantId: query.tenantId,
-          status: 'pending',
-          createdAt: { lte: downstreamAlertWindow.stalledPendingAt },
+          ...stalledPendingWhere(downstreamAlertWindow.stalledPendingAt),
         },
       }),
       this.prisma.cmppDownstreamDelivery.count({
@@ -261,6 +260,7 @@ export class OperationsService {
         unknown: todayTotals.unknown,
         successRate: todayTotals.total > 0 ? Number(((todayTotals.delivered / todayTotals.total) * 100).toFixed(1)) : 0,
         spendCents: todayTotals.amountCents,
+        returnedCents: transactionAggregate._sum.amountCents ?? 0,
         billingUnits: todayTotals.billingUnits,
       },
       uplinkCount,
@@ -439,8 +439,7 @@ export class OperationsService {
       this.prisma.cmppDownstreamDelivery.count({
         where: {
           ...scopedWhere,
-          status: 'pending',
-          createdAt: { lte: downstreamAlertWindow.stalledPendingAt },
+          ...stalledPendingWhere(downstreamAlertWindow.stalledPendingAt),
         },
       }),
       this.prisma.cmppDownstreamDelivery.count({
@@ -841,6 +840,17 @@ function startOfToday() {
   return date;
 }
 
+function returnedTransactionWhere(since: Date, tenantId?: string): Prisma.AccountTransactionWhereInput {
+  return {
+    tenantId,
+    createdAt: { gte: since },
+    OR: [
+      { transactionType: 'refunded' },
+      { transactionType: 'released', relatedType: 'sms_message_record' },
+    ],
+  };
+}
+
 function createdAtRange(range?: string): Prisma.DateTimeFilter | undefined {
   if (!range || range === 'all') {
     return undefined;
@@ -882,7 +892,7 @@ function downstreamAlertWhere(
       scopedWhere,
       {
         OR: [
-          { status: 'pending', createdAt: { lte: window.stalledPendingAt } },
+          stalledPendingWhere(window.stalledPendingAt),
           { status: 'awaiting_ack', ackDeadlineAt: { lte: window.now } },
           { status: { in: ['failed', 'unconfirmed', 'rejected'] }, updatedAt: { gte: window.recentFailedAt } },
         ],
@@ -891,6 +901,16 @@ function downstreamAlertWhere(
   };
 }
 
+function stalledPendingWhere(cutoff: Date): Prisma.CmppDownstreamDeliveryWhereInput {
+  return {
+    status: 'pending',
+    OR: [
+      { lastRetriedAt: null, createdAt: { lte: cutoff } },
+      { lastRetriedAt: { lte: cutoff } },
+    ],
+  };
+}
+
 function downstreamDeliveryScopedWhere(query: DownstreamDeliveryDashboardQuery): Prisma.CmppDownstreamDeliveryWhereInput {
   const createdAtFrom = parseDateBoundary(query.createdAtFrom, false);
   const createdAtTo = parseDateBoundary(query.createdAtTo, true);