feat: integrate analytics and fragment receipt improvements

api/src/send-chain/send-downstream-delivery.service.ts

@@ -9,6 +9,7 @@ import type { GatewaySubmitResultDto, GatewaySubmitSegmentResultDto, GatewayRece
 import { positiveInteger, normalizeReceiptStatus, normalizeCarrier, DEFAULT_DOWNSTREAM_RETRY_DELAY_MS, DEFAULT_DOWNSTREAM_RETRY_MAX_DELAY_MS, DEFAULT_DOWNSTREAM_MAX_RETRIES, DEFAULT_DOWNSTREAM_PENDING_TIMEOUT_HOURS, DEFAULT_RECEIPT_TIMEOUT_HOURS, DEFAULT_GATEWAY_SUBMIT_REQUEUE_STALE_MS, DEFAULT_DOWNSTREAM_MANUAL_REQUEUE_STALE_MS, DEFAULT_UPSTREAM_RECEIPT_INBOX_PROCESSING_STALE_MS, DEFAULT_UPSTREAM_RECEIPT_INBOX_MAX_ATTEMPTS, DEFAULT_UPSTREAM_RECEIPT_INBOX_MAX_AGE_HOURS, gatewaySubmitRequeueKey, isObjectRecord, asDateOrNull, downstreamRetryDelayMs, downstreamAckTimeoutMs, downstreamRetryBaseDelayMs, downstreamRetryMaxDelayMs, downstreamMaxRetries, downstreamPendingTimeoutHours, downstreamControlFailureMessage, normalizeSubmitStatus, downstreamDeliveryAttemptKey, hasRecoveryAuditStateChanged, normalizeRecoveryFailureCategory, aggregateReceiptSegmentState, isSameUpstreamEndpointIdentity, receiptEventKey } from './send-chain.helpers';
 import type { SendSubmissionService } from './send-submission.service';
 import type { SendCompletionCallbacks, SendCompletionFacade } from './send-completion.service';
+import { queueFinalReceiptDeliveries, type DownstreamDeliveryQueueRequest } from './downstream-receipt-targets';
 
 
 /**
@@ -188,14 +189,7 @@ export class SendDownstreamDeliveryService {
     });
   }
 
-  async queueAndTryDownstreamDelivery(data: {
-    tenantId: string;
-    applicationId?: string | null;
-    messageRecordId?: string | null;
-    messageId?: string | null;
-    deliveryType: 'receipt' | 'uplink';
-    payload: Record<string, unknown>;
-  }) {
+  async queueAndTryDownstreamDelivery(data: DownstreamDeliveryQueueRequest) {
     if (!data.applicationId) {
       return null;
     }
@@ -211,7 +205,7 @@ export class SendDownstreamDeliveryService {
       },
     });
     const deliveryAllowed = application?.status === 'active' || application?.status === 'disabling';
-    if (deliveryAllowed) {
+    if (deliveryAllowed && data.queueHttpWebhook !== false) {
       try {
         await this.openApi?.queueWebhookEvent({
           tenantId: data.tenantId,
@@ -224,14 +218,18 @@ export class SendDownstreamDeliveryService {
         });
       } catch (error) {
         this.logger.error(`HTTP webhook queue failed for ${data.deliveryType}/${data.messageId ?? '-'}: ${error instanceof Error ? error.message : String(error)}`);
+        if (data.propagateHttpQueueError) throw error;
       }
     }
+    if (data.queueCmppDelivery === false) {
+      return null;
+    }
     if (application?.interfaceEnabled !== true) {
       return null;
     }
     const payload = { account: application?.cmppAccount, applicationId: data.applicationId, ...data.payload };
     const dedupeKey = data.deliveryType === 'receipt' && data.messageRecordId
-      ? `receipt:${data.messageRecordId}`
+      ? data.receiptDedupeKey ?? `receipt:${data.messageRecordId}`
       : data.deliveryType === 'uplink' && typeof data.payload.uplinkMessageId === 'string'
         ? `uplink:${data.payload.uplinkMessageId}`
         : null;
@@ -419,6 +417,7 @@ export class SendDownstreamDeliveryService {
       phoneNumber: string;
       cmppSubmitSequenceId?: string | null;
       cmppSubmitGroupMessageId?: string | null;
+      cmppRegisteredDelivery?: boolean | null;
     },
     errorCode: string,
     reason: string,
@@ -450,13 +449,12 @@ export class SendDownstreamDeliveryService {
         deliveredAt,
       },
     });
-    await this.facade.queueAndTryDownstreamDelivery({
-      tenantId: message.tenantId,
-      applicationId: message.applicationId,
-      messageRecordId: message.id,
-      messageId: message.messageId,
-      deliveryType: 'receipt',
-      payload: {
+    await queueFinalReceiptDeliveries(
+      this.prisma,
+      (request) => this.facade.queueAndTryDownstreamDelivery(request),
+      {
+        message,
+        payload: {
         messageId: message.messageId,
         gatewayMessageId: `PLATFORM:${message.messageId}`,
         phoneNumber: message.phoneNumber,
@@ -464,11 +462,10 @@ export class SendDownstreamDeliveryService {
         rawStatus: 'REJECTD',
         errorCode,
         errorMessage: reason,
-        submitSequenceId: message.cmppSubmitSequenceId ? Number(message.cmppSubmitSequenceId) : undefined,
-        submitGroupMessageId: message.cmppSubmitGroupMessageId ?? undefined,
         deliveredAt: deliveredAt.toISOString(),
+        },
       },
-    });
+    );
     if (message.batchTaskId) await this.facade.refreshTaskProgress(message.batchTaskId);
     return receipt;
   }