@dainamite/cpq 0.2.2 → 0.4.0

package/dist/modules/cpq/services/cpqOrderService.js

@@ -237,11 +237,14 @@ class DefaultCpqOrderService {
       deletedAt: null
     }) : null;
     const quoteType = sourceQuote?.quoteType ?? "new";
-    const arcEvents = [];
+    const postCommitEvents = [];
     if (quoteType === "new") {
-      await this.createInventoryFromOrder(orderConfig, orderLines, scope);
+      const inventory = await this.createInventoryFromOrder(orderConfig, orderLines, scope);
+      if (inventory) {
+        postCommitEvents.push(() => emitActivatedEvent(orderConfig, inventory, scope));
+      }
     } else {
-      arcEvents.push(
+      postCommitEvents.push(
         ...await this.applyArcOrder(orderConfig, sourceQuote, orderLines, scope)
       );
     }
@@ -250,7 +253,7 @@ class DefaultCpqOrderService {
     salesOrder.status = "active";
     salesOrder.placedAt = /* @__PURE__ */ new Date();
     await em.flush();
-    for (const fire of arcEvents) {
+    for (const fire of postCommitEvents) {
       try {
         await fire();
       } catch (err) {
@@ -323,9 +326,7 @@ class DefaultCpqOrderService {
           },
           scope
         );
-        events.push(
-          () => emitArcEvent("cpq.subscription.amended", result, eventBaseEnvelope)
-        );
+        events.push(() => emitAmendedEvent(result, eventBaseEnvelope));
       }
     } else if (quoteType === "cancel") {
       for (const target of targets) {
@@ -342,15 +343,7 @@ class DefaultCpqOrderService {
           },
           scope
         );
-        events.push(
-          () => emitArcEvent("cpq.subscription.cancelled", result, {
-            ...eventBaseEnvelope,
-            etfAmount: sourceQuote.arcEtfAmount ?? null,
-            etfCurrency: sourceQuote.arcEtfCurrency ?? null,
-            reasonCode: sourceQuote.arcReasonCode ?? null,
-            reasonText: sourceQuote.arcReasonText ?? null
-          })
-        );
+        events.push(() => emitCancelledEvent(result, eventBaseEnvelope));
       }
     } else if (quoteType === "renew") {
       const standalone = targets.filter((t) => t.mergeAction === "standalone");
@@ -379,15 +372,7 @@ class DefaultCpqOrderService {
             },
             scope
           );
-          events.push(
-            () => emitArcEvent("cpq.subscription.renewed", result, {
-              ...eventBaseEnvelope,
-              term: {
-                newTermStart: target.newTermStart.toISOString(),
-                newTermEnd: target.newTermEnd.toISOString()
-              }
-            })
-          );
+          events.push(() => emitRenewedEvent(result, eventBaseEnvelope));
         }
       } else if (absorb.length >= 2 && standalone.length === 0) {
         if (!sourceQuote.arcMergeNewTermStart || !sourceQuote.arcMergeNewTermEnd) {
@@ -422,7 +407,11 @@ class DefaultCpqOrderService {
         );
         for (const sourceLog of merge.sourceChangeLogs) {
           events.push(
-            () => emitSupersededEvent(sourceLog, merge.mergedSubscription.id, eventBaseEnvelope)
+            () => emitSupersededEvent(
+              sourceLog,
+              iso10(merge.mergedSubscription.currentTermStart),
+              eventBaseEnvelope
+            )
           );
         }
       } else {
@@ -438,7 +427,7 @@ class DefaultCpqOrderService {
   }
   // ─── Inventory Creation ─────────────────────────────────────
   async createInventoryFromOrder(orderConfig, orderLines, scope) {
-    if (orderLines.length === 0) return;
+    if (orderLines.length === 0) return null;
     const specIds = [...new Set(orderLines.map((l) => l.specId).filter(Boolean))];
     const specs = specIds.length > 0 ? await this.em.find(CpqProductSpecification, {
       id: { $in: specIds },
@@ -458,7 +447,7 @@ class DefaultCpqOrderService {
     const hasSubscriptionContent = subscriptionLines.some(
       (l) => Number(l.mrcTotal) > 0 || Number(l.nrcTotal) > 0
     );
-    if (!hasSubscriptionContent && assetLines.length === 0) return;
+    if (!hasSubscriptionContent && assetLines.length === 0) return null;
     const subscriptionName = await this.buildSubscriptionName(orderConfig, orderLines, scope);
     const lineWithDates = orderLines.find((l) => l.startDate != null) ?? orderLines[0];
     const lineWithTerm = orderLines.find((l) => l.termMonths != null) ?? orderLines[0];
@@ -537,6 +526,13 @@ class DefaultCpqOrderService {
         scope
       );
     }
+    const eventItems = subscriptionLines.slice(0, allSubItems.length).map((line, i) => ({
+      subscriptionItemId: allSubItems[i].id,
+      productName: this.getLineName(line),
+      mrcTotal: Number(line.mrcTotal),
+      nrcTotal: Number(line.nrcTotal)
+    })).filter((it) => it.mrcTotal > 0 || it.nrcTotal > 0);
+    return { subscriptionId: subscription.id, items: eventItems };
   }
   // ─── Get / List ─────────────────────────────────────────────
   async getOrder(orderId, scope) {
@@ -828,72 +824,130 @@ function resolveLineName(line, specMap) {
   }
   return "Configured Item";
 }
-async function emitArcEvent(eventId, result, envelope) {
-  const sub = result.subscription;
-  await emitCpqEvent(eventId, {
-    subscriptionId: sub.id,
-    customerId: sub.customerId,
+async function emitActivatedEvent(orderConfig, inventory, scope) {
+  const items = inventory.items.map((it) => ({
+    subscriptionItemId: it.subscriptionItemId,
+    productName: it.productName,
+    // `mrcTotal` / `nrcTotal` are line totals — CPQ pricing already
+    // applied the line quantity. Quantity is therefore 1 here so
+    // `unitPrice × quantity` stays internally consistent no matter
+    // how the connector treats the multiplier.
+    quantity: 1,
+    charges: [
+      ...it.mrcTotal > 0 ? [{ type: "recurring", unitPrice: it.mrcTotal, description: "Recurring charge" }] : [],
+      ...it.nrcTotal > 0 ? [{ type: "one_time", amount: it.nrcTotal, description: "One-time charge" }] : []
+    ]
+  }));
+  await emitCpqEvent("cpq.subscription.activated", {
+    subscriptionId: inventory.subscriptionId,
+    customerId: orderConfig.customerId,
+    organizationId: scope.organizationId,
+    tenantId: scope.tenantId,
+    currencyCode: orderConfig.currencyCode,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    activationDate: (/* @__PURE__ */ new Date()).toISOString().slice(0, 10),
+    sourceQuoteId: orderConfig.sourceQuoteId ?? null,
+    sourceOrderId: orderConfig.id,
+    items
+  });
+}
+function iso10(value) {
+  if (!value) return null;
+  if (value instanceof Date) return value.toISOString().slice(0, 10);
+  return String(value).slice(0, 10);
+}
+function buildArcAddedItems(changeLog) {
+  const after = changeLog.afterSnapshot;
+  const nameById = new Map(
+    (after?.items ?? []).map((i) => [String(i.id), i.name ?? ""])
+  );
+  const summary = changeLog.lineChanges ?? [];
+  const out = [];
+  for (const change of summary) {
+    if (change.action !== "add" || typeof change.itemId !== "string") continue;
+    const mrc = Number(change.mrcAmount);
+    const nrc = Number(change.nrcAmount);
+    out.push({
+      subscriptionItemId: change.itemId,
+      productName: nameById.get(change.itemId) || "Configured item",
+      quantity: 1,
+      charges: [
+        ...mrc > 0 ? [{ type: "recurring", unitPrice: mrc, description: "Recurring charge" }] : [],
+        ...nrc > 0 ? [{ type: "one_time", amount: nrc, description: "One-time charge" }] : []
+      ]
+    });
+  }
+  return out;
+}
+function buildArcRemovedItemIds(changeLog) {
+  const summary = changeLog.lineChanges ?? [];
+  return summary.filter((c) => c.action === "cancel" && typeof c.itemId === "string").map((c) => c.itemId);
+}
+async function emitAmendedEvent(result, envelope) {
+  await emitCpqEvent("cpq.subscription.amended", {
+    tenantId: envelope.tenantId,
+    organizationId: envelope.organizationId,
+    subscriptionId: result.subscription.id,
+    customerId: result.subscription.customerId,
+    // No operator-chosen amend date today — the activation moment is
+    // the effective date. The billing connector computes the mid-cycle
+    // proration from this date + the account's billing cycle.
+    effectiveDate: iso10(result.changeLog.effectiveAt),
+    addedItems: buildArcAddedItems(result.changeLog),
+    removedSubscriptionItemIds: buildArcRemovedItemIds(result.changeLog),
+    sourceQuoteId: envelope.sourceQuoteId,
+    sourceOrderId: envelope.sourceOrderId,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  });
+}
+async function emitRenewedEvent(result, envelope) {
+  await emitCpqEvent("cpq.subscription.renewed", {
+    tenantId: envelope.tenantId,
     organizationId: envelope.organizationId,
+    subscriptionId: result.subscription.id,
+    customerId: result.subscription.customerId,
+    newTermStart: iso10(result.subscription.currentTermStart),
+    newTermEnd: iso10(result.subscription.currentTermEnd),
+    addedItems: buildArcAddedItems(result.changeLog),
+    sourceQuoteId: envelope.sourceQuoteId,
+    sourceOrderId: envelope.sourceOrderId,
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  });
+}
+async function emitCancelledEvent(result, envelope) {
+  await emitCpqEvent("cpq.subscription.cancelled", {
     tenantId: envelope.tenantId,
-    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    organizationId: envelope.organizationId,
+    subscriptionId: result.subscription.id,
+    customerId: result.subscription.customerId,
+    effectiveDate: iso10(result.changeLog.effectiveAt),
     sourceQuoteId: envelope.sourceQuoteId,
     sourceOrderId: envelope.sourceOrderId,
-    performedByUserId: null,
-    changeLogId: result.changeLog.id,
-    proration: buildProrationPayload(sub, result.changeLog.beforeSnapshot ?? null),
-    ...envelope.term ? { term: envelope.term } : {},
-    ...envelope.etfAmount !== void 0 ? { etfAmount: envelope.etfAmount } : {},
-    ...envelope.etfCurrency !== void 0 ? { etfCurrency: envelope.etfCurrency } : {},
-    ...envelope.reasonCode !== void 0 ? { reasonCode: envelope.reasonCode } : {},
-    ...envelope.reasonText !== void 0 ? { reasonText: envelope.reasonText } : {}
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
   });
 }
-async function emitMergedEvent(merge, envelope, mergedFromSubscriptionIds) {
-  const m = merge.mergedSubscription;
+async function emitMergedEvent(merge, envelope, sourceSubscriptionIds) {
   await emitCpqEvent("cpq.subscription.merged", {
-    subscriptionId: m.id,
-    customerId: m.customerId,
-    organizationId: envelope.organizationId,
     tenantId: envelope.tenantId,
-    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    organizationId: envelope.organizationId,
+    mergedSubscriptionId: merge.mergedSubscription.id,
+    sourceSubscriptionIds,
     sourceQuoteId: envelope.sourceQuoteId,
     sourceOrderId: envelope.sourceOrderId,
-    performedByUserId: null,
-    changeLogId: merge.mergeResultChangeLog.id,
-    mergedFromSubscriptionIds,
-    term: {
-      newTermStart: m.currentTermStart?.toISOString() ?? null,
-      newTermEnd: m.currentTermEnd?.toISOString() ?? null,
-      newTermMonths: m.termMonths ?? null
-    },
-    proration: buildProrationPayload(m, null)
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
   });
 }
-async function emitSupersededEvent(sourceLog, newMergeSubId, envelope) {
+async function emitSupersededEvent(sourceLog, effectiveDate, envelope) {
   await emitCpqEvent("cpq.subscription.superseded", {
-    subscriptionId: sourceLog.subscriptionId,
-    organizationId: envelope.organizationId,
     tenantId: envelope.tenantId,
-    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    organizationId: envelope.organizationId,
+    subscriptionId: sourceLog.subscriptionId,
+    effectiveDate,
     sourceQuoteId: envelope.sourceQuoteId,
     sourceOrderId: envelope.sourceOrderId,
-    performedByUserId: null,
-    changeLogId: sourceLog.id,
-    mergedIntoSubscriptionId: newMergeSubId
+    timestamp: (/* @__PURE__ */ new Date()).toISOString()
   });
 }
-function buildProrationPayload(sub, beforeSnapshot) {
-  const oldMrc = beforeSnapshot ? Number(beforeSnapshot.mrcAmount ?? 0) : 0;
-  return {
-    oldMrcAmount: oldMrc,
-    newMrcAmount: Number(sub.mrcAmount),
-    currency: sub.currencyCode,
-    billingCycleStart: null,
-    billingCycleEnd: null,
-    daysElapsedInCycle: null,
-    daysRemainingInCycle: null
-  };
-}
 export {
   DefaultCpqOrderService,
   OrderError