fix: coordinate SMS completion and improve operations diagnostics

api/src/open-api/open-api.service.ts

@@ -526,24 +526,28 @@ export class OpenApiService implements OnModuleInit, OnModuleDestroy {
     return row;
   }
 
-  async queueWebhookEvent(data: {
-    tenantId: string;
-    applicationId?: string | null;
-    messageRecordId?: string | null;
-    messageId?: string | null;
-    uplinkMessageId?: string | null;
-    eventType: 'receipt' | 'uplink';
-    payload: Record<string, unknown>;
-  }) {
+  async queueWebhookEvent(
+    data: {
+      tenantId: string;
+      applicationId?: string | null;
+      messageRecordId?: string | null;
+      messageId?: string | null;
+      uplinkMessageId?: string | null;
+      eventType: 'receipt' | 'uplink';
+      payload: Record<string, unknown>;
+    },
+    transaction?: Prisma.TransactionClient,
+  ) {
+    const db = transaction ?? this.prisma;
     if (!data.applicationId) return null;
-    const application = await this.prisma.smsApplication.findUnique({
+    const application = await db.smsApplication.findUnique({
       where: { id: data.applicationId },
       include: { httpConfig: true },
     });
     const config = application?.httpConfig;
     const enabled = data.eventType === 'receipt' ? config?.receiptWebhookEnabled : config?.uplinkWebhookEnabled;
     if (!config?.enabled || !enabled) return null;
-    const endpoint = await this.prisma.httpWebhookEndpoint.findUnique({
+    const endpoint = await db.httpWebhookEndpoint.findUnique({
       where: { applicationId_eventType: { applicationId: data.applicationId, eventType: data.eventType } },
     });
     if (!endpoint || endpoint.status !== 'active') return null;
@@ -553,7 +557,7 @@ export class OpenApiService implements OnModuleInit, OnModuleDestroy {
         : data.eventType === 'uplink' && data.uplinkMessageId
           ? `evt_uplink_${data.uplinkMessageId}`
           : `evt_${randomUUID()}`;
-    const delivery = await this.prisma.$transaction(async (tx) => {
+    const persist = async (tx: Prisma.TransactionClient) => {
       const event = await tx.httpWebhookEvent.upsert({
         where: { eventId },
         update: {},
@@ -573,7 +577,9 @@ export class OpenApiService implements OnModuleInit, OnModuleDestroy {
         update: {},
         create: { eventId: event.id, endpointId: endpoint.id, recoveryVersion: 1 },
       });
-    });
+    };
+    const delivery = transaction ? await persist(transaction) : await this.prisma.$transaction(persist);
+    if (transaction) return delivery;
     if (delivery.status !== 'pending' || delivery.recoveryVersion !== 1) return delivery;
     await this.queue?.add(
       'deliver',