fix: harden dependencies and downstream delivery

api/src/operations/operations.service.spec.ts

@@ -254,6 +254,7 @@ describe('OperationsService', () => {
       .mockResolvedValueOnce(1)
       .mockResolvedValueOnce(1)
       .mockResolvedValueOnce(2);
+    prisma.accountTransaction.aggregate.mockResolvedValueOnce({ _count: { _all: 2 }, _sum: { amountCents: 10 } });
     const service = new OperationsService(prisma as never);
 
     await expect(service.dashboard({ tenantId: 'tenant-1' })).resolves.toEqual(
@@ -269,6 +270,7 @@ describe('OperationsService', () => {
           templates: 1,
           total: 5,
         },
+        today: expect.objectContaining({ returnedCents: 10 }),
         gatewayConnections: [{ status: 'connected', _count: { _all: 1 }, _sum: { currentConnections: 2, desiredConnections: 2 } }],
         downstreamDeliverySummary: expect.objectContaining({
           pending: 3,
@@ -282,7 +284,14 @@ describe('OperationsService', () => {
       }),
     );
     expect(prisma.cmppDownstreamDelivery.count).toHaveBeenNthCalledWith(4, {
-      where: { tenantId: 'tenant-1', status: 'pending', createdAt: { lte: expect.any(Date) } },
+      where: {
+        tenantId: 'tenant-1',
+        status: 'pending',
+        OR: [
+          { lastRetriedAt: null, createdAt: { lte: expect.any(Date) } },
+          { lastRetriedAt: { lte: expect.any(Date) } },
+        ],
+      },
     });
     expect(prisma.cmppDownstreamDelivery.count).toHaveBeenNthCalledWith(5, {
       where: { tenantId: 'tenant-1', status: 'awaiting_ack', ackDeadlineAt: { lte: expect.any(Date) } },
@@ -294,6 +303,18 @@ describe('OperationsService', () => {
         updatedAt: { gte: expect.any(Date) },
       },
     });
+    expect(prisma.accountTransaction.aggregate).toHaveBeenCalledWith({
+      where: {
+        tenantId: 'tenant-1',
+        createdAt: { gte: expect.any(Date) },
+        OR: [
+          { transactionType: 'refunded' },
+          { transactionType: 'released', relatedType: 'sms_message_record' },
+        ],
+      },
+      _sum: { amountCents: true },
+      _count: { _all: true },
+    });
     await service.statistics({ tenantId: 'tenant-1', groupBy: 'application' });
 
     expect(prisma.smsMessageRecord.groupBy).toHaveBeenCalledWith({
@@ -516,10 +537,16 @@ describe('OperationsService', () => {
       by: ['applicationId'],
       where: {
         AND: [
-          { tenantId: 'tenant-1', applicationId: 'app-1', deliveryType: undefined },
+          { tenantId: 'tenant-1', applicationId: 'app-1', deliveryType: undefined, createdAt: undefined },
           {
             OR: [
-              { status: 'pending', createdAt: { lte: expect.any(Date) } },
+              {
+                status: 'pending',
+                OR: [
+                  { lastRetriedAt: null, createdAt: { lte: expect.any(Date) } },
+                  { lastRetriedAt: { lte: expect.any(Date) } },
+                ],
+              },
               { status: 'awaiting_ack', ackDeadlineAt: { lte: expect.any(Date) } },
               { status: { in: ['failed', 'unconfirmed', 'rejected'] }, updatedAt: { gte: expect.any(Date) } },
             ],

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);