@powerhousedao/service-offering 0.0.6 → 0.0.7

package/dist/editors/subscription-instance-editor/components/mapOfferingToSubscription.d.ts

@@ -19,12 +19,12 @@ export interface MapOfferingOptions {
  * This is a one-time snapshot — the SI lives independently after creation.
  *
  * Logic:
- * 1. Find the selected tier
- * 2. For each service group, find the tier-specific pricing for the selected billing cycle
- * 3. Apply billing cycle discounts if any
- * 4. Map services based on service level bindings (INCLUDED, OPTIONAL, CUSTOM, VARIABLE)
- * 5. Map usage limits to metrics with freeLimit/paidLimit
- * 6. Calculate tier price from service group sums (CALCULATED mode) or use manual price
+ * 1. Find the selected tier and resolve pricing from finalConfiguration
+ * 2. Map offering service groups with tier-specific pricing
+ * 3. Map option group configs from finalConfiguration as additional service groups
+ * 4. Map add-on configs from finalConfiguration as optional service groups
+ * 5. Map remaining standalone services with tier service levels and usage limits
+ * 6. Calculate tier price from finalConfig or service group sums (CALCULATED) or manual price
  */
 export declare function mapOfferingToSubscription(options: MapOfferingOptions): InitializeSubscriptionInput;
 //# sourceMappingURL=mapOfferingToSubscription.d.ts.map

package/dist/editors/subscription-instance-editor/components/mapOfferingToSubscription.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapOfferingToSubscription.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/mapOfferingToSubscription.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,oBAAoB,EAOrB,MAAM,+DAA+D,CAAC;AACvE,OAAO,KAAK,EACV,2BAA2B,EAK3B,YAAY,IAAI,cAAc,EAC/B,MAAM,oEAAoE,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,gDAAgD;IAChD,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,oBAAoB,EAAE,cAAc,CAAC;IACrC,oBAAoB;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,kBAAkB,GAC1B,2BAA2B,CA6D7B"}
+{"version":3,"file":"mapOfferingToSubscription.d.ts","sourceRoot":"","sources":["../../../../editors/subscription-instance-editor/components/mapOfferingToSubscription.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,oBAAoB,EAMrB,MAAM,+DAA+D,CAAC;AACvE,OAAO,KAAK,EACV,2BAA2B,EAK3B,YAAY,IAAI,cAAc,EAC/B,MAAM,oEAAoE,CAAC;AAE5E,MAAM,WAAW,kBAAkB;IACjC,gDAAgD;IAChD,QAAQ,EAAE,oBAAoB,CAAC;IAC/B,2BAA2B;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,wCAAwC;IACxC,oBAAoB,EAAE,cAAc,CAAC;IACrC,oBAAoB;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,kBAAkB,GAC1B,2BAA2B,CAqF7B"}

package/dist/editors/subscription-instance-editor/components/mapOfferingToSubscription.js

@@ -4,12 +4,12 @@ import { generateId } from "document-model/core";
  * This is a one-time snapshot — the SI lives independently after creation.
  *
  * Logic:
- * 1. Find the selected tier
- * 2. For each service group, find the tier-specific pricing for the selected billing cycle
- * 3. Apply billing cycle discounts if any
- * 4. Map services based on service level bindings (INCLUDED, OPTIONAL, CUSTOM, VARIABLE)
- * 5. Map usage limits to metrics with freeLimit/paidLimit
- * 6. Calculate tier price from service group sums (CALCULATED mode) or use manual price
+ * 1. Find the selected tier and resolve pricing from finalConfiguration
+ * 2. Map offering service groups with tier-specific pricing
+ * 3. Map option group configs from finalConfiguration as additional service groups
+ * 4. Map add-on configs from finalConfiguration as optional service groups
+ * 5. Map remaining standalone services with tier service levels and usage limits
+ * 6. Calculate tier price from finalConfig or service group sums (CALCULATED) or manual price
  */
 export function mapOfferingToSubscription(options) {
     const { offering, tierId, selectedBillingCycle, customerId, customerName, customerEmail, createdAt, } = options;
@@ -17,21 +17,34 @@ export function mapOfferingToSubscription(options) {
     if (!tier) {
         throw new Error(`Tier ${tierId} not found in offering`);
     }
-    const currency = tier.pricing.currency;
+    const finalConfig = offering.finalConfiguration;
+    const currency = finalConfig?.tierCurrency ?? tier.pricing.currency;
     const pricingMode = tier.pricingMode || "MANUAL_OVERRIDE";
-    // Map service groups with their tier-specific pricing
-    const serviceGroups = mapServiceGroups(offering.serviceGroups, tier, selectedBillingCycle, currency);
-    // Map standalone services (not in any group) based on tier service levels
-    const standaloneServices = mapStandaloneServices(offering.services, tier, currency);
+    // Track which services are accounted for in groups
+    const groupedServiceIds = new Set();
+    // 1. Map offering service groups with tier-specific pricing
+    const serviceGroups = mapOfferingServiceGroups(offering, tier, selectedBillingCycle, currency, groupedServiceIds);
+    // 2. Map option group configs from finalConfiguration as service groups
+    if (finalConfig) {
+        mapFinalConfigGroups(offering, tier, finalConfig, currency, groupedServiceIds, serviceGroups);
+    }
+    // 3. Map remaining standalone services (not in any group or option group)
+    const standaloneServices = offering.services
+        .filter((s) => !groupedServiceIds.has(s.id))
+        .filter((svc) => {
+        const level = tier.serviceLevels.find((sl) => sl.serviceId === svc.id);
+        return (level &&
+            level.level !== "NOT_INCLUDED" &&
+            level.level !== "NOT_APPLICABLE");
+    })
+        .map((svc) => mapServiceToInput(svc, tier, currency, selectedBillingCycle));
     // Calculate tier price
     let tierPrice;
     if (pricingMode === "CALCULATED") {
-        tierPrice = serviceGroups.reduce((sum, grp) => {
-            return sum + (grp.recurringAmount ?? 0);
-        }, 0);
+        tierPrice = serviceGroups.reduce((sum, grp) => sum + (grp.recurringAmount ?? 0), 0);
     }
     else {
-        tierPrice = tier.pricing.amount ?? undefined;
+        tierPrice = finalConfig?.tierBasePrice ?? tier.pricing.amount ?? undefined;
     }
     return {
         customerId: customerId ?? undefined,
@@ -51,18 +64,21 @@ export function mapOfferingToSubscription(options) {
         serviceGroups,
     };
 }
-function mapServiceGroups(soGroups, tier, selectedBillingCycle, globalCurrency) {
-    return soGroups.map((group) => {
+/**
+ * Maps offering service groups to subscription service groups.
+ * Finds services by their serviceGroupId and applies tier-specific pricing.
+ */
+function mapOfferingServiceGroups(offering, tier, selectedBillingCycle, globalCurrency, groupedServiceIds) {
+    return offering.serviceGroups.map((group) => {
+        // Find services that belong to this service group
+        const groupServices = offering.services.filter((s) => s.serviceGroupId === group.id);
+        groupServices.forEach((s) => groupedServiceIds.add(s.id));
         // Find tier-specific pricing for this group
         const tierPricing = group.tierPricing.find((tp) => tp.tierId === tier.id);
         // Find the recurring price option matching the selected billing cycle
-        let recurringOption;
-        if (tierPricing) {
-            recurringOption = tierPricing.recurringPricing.find((rp) => rp.billingCycle === selectedBillingCycle);
-            // Fallback to group's own billing cycle if no match
-            if (!recurringOption) {
-                recurringOption = tierPricing.recurringPricing.find((rp) => rp.billingCycle === group.billingCycle);
-            }
+        let recurringOption = tierPricing?.recurringPricing.find((rp) => rp.billingCycle === selectedBillingCycle);
+        if (!recurringOption) {
+            recurringOption = tierPricing?.recurringPricing.find((rp) => rp.billingCycle === group.billingCycle);
         }
         // Apply billing cycle discount from tier if applicable
         let discountedAmount = recurringOption?.amount;
@@ -72,12 +88,10 @@ function mapServiceGroups(soGroups, tier, selectedBillingCycle, globalCurrency)
             if (cycleDiscount) {
                 const originalAmount = recurringOption.amount;
                 const rule = cycleDiscount.discountRule;
-                if (rule.discountType === "PERCENTAGE") {
-                    discountedAmount = originalAmount * (1 - rule.discountValue / 100);
-                }
-                else {
-                    discountedAmount = originalAmount - rule.discountValue;
-                }
+                discountedAmount =
+                    rule.discountType === "PERCENTAGE"
+                        ? originalAmount * (1 - rule.discountValue / 100)
+                        : originalAmount - rule.discountValue;
                 discountInput = {
                     originalAmount,
                     discountType: rule.discountType,
@@ -86,16 +100,14 @@ function mapServiceGroups(soGroups, tier, selectedBillingCycle, globalCurrency)
                 };
             }
         }
-        // Also check if the recurring option itself has a discount
+        // Fallback to the recurring option's own discount
         if (recurringOption?.discount && !discountInput) {
             const originalAmount = recurringOption.amount;
             const d = recurringOption.discount;
-            if (d.discountType === "PERCENTAGE") {
-                discountedAmount = originalAmount * (1 - d.discountValue / 100);
-            }
-            else {
-                discountedAmount = originalAmount - d.discountValue;
-            }
+            discountedAmount =
+                d.discountType === "PERCENTAGE"
+                    ? originalAmount * (1 - d.discountValue / 100)
+                    : originalAmount - d.discountValue;
             discountInput = {
                 originalAmount,
                 discountType: d.discountType,
@@ -113,8 +125,15 @@ function mapServiceGroups(soGroups, tier, selectedBillingCycle, globalCurrency)
                 setupCurrency = setupCostOption.currency;
             }
         }
-        // Map services in this group based on tier service levels
-        const groupServices = mapGroupServices(group.id, tier, globalCurrency);
+        // Map services in this group
+        const mappedServices = groupServices
+            .filter((svc) => {
+            const level = tier.serviceLevels.find((sl) => sl.serviceId === svc.id);
+            return (!level ||
+                (level.level !== "NOT_INCLUDED" && level.level !== "NOT_APPLICABLE"));
+        })
+            .map((svc) => mapServiceToInput(svc, tier, globalCurrency, (recurringOption?.billingCycle ??
+            group.billingCycle)));
         return {
             id: generateId(),
             name: group.name,
@@ -127,54 +146,100 @@ function mapServiceGroups(soGroups, tier, selectedBillingCycle, globalCurrency)
             recurringBillingCycle: (recurringOption?.billingCycle ??
                 group.billingCycle),
             recurringDiscount: discountInput,
-            services: groupServices,
+            services: mappedServices,
         };
     });
 }
-function mapGroupServices(groupId, tier, globalCurrency) {
-    // Find services that belong to this group via tier service levels
-    const relevantLevels = tier.serviceLevels.filter((sl) => {
-        // Include services that are INCLUDED, OPTIONAL, CUSTOM, or VARIABLE for this tier
-        return (sl.level === "INCLUDED" ||
-            sl.level === "OPTIONAL" ||
-            sl.level === "CUSTOM" ||
-            sl.level === "VARIABLE");
-    });
-    return relevantLevels.map((sl) => {
-        // Map usage limits for this service
-        const metrics = mapUsageLimits(sl.serviceId, tier.usageLimits, globalCurrency);
-        return {
+/**
+ * Maps finalConfiguration option group configs and add-on configs
+ * into subscription service groups.
+ */
+function mapFinalConfigGroups(offering, tier, finalConfig, globalCurrency, groupedServiceIds, serviceGroups) {
+    // Non-add-on option groups
+    for (const ogConfig of finalConfig.optionGroupConfigs) {
+        const og = offering.optionGroups.find((g) => g.id === ogConfig.optionGroupId);
+        if (!og || og.isAddOn)
+            continue;
+        const services = offering.services.filter((s) => s.optionGroupId === og.id);
+        if (services.length === 0)
+            continue;
+        services.forEach((s) => groupedServiceIds.add(s.id));
+        serviceGroups.push({
             id: generateId(),
-            name: null,
-            description: null,
-            customValue: sl.customValue ?? null,
-            metrics,
-        };
-    });
-}
-function mapStandaloneServices(soServices, tier, globalCurrency) {
-    // Find services that are NOT in any service group
-    const standaloneServices = soServices.filter((s) => !s.serviceGroupId);
-    return standaloneServices
-        .filter((svc) => {
-        // Only include services that have a service level for this tier
-        const level = tier.serviceLevels.find((sl) => sl.serviceId === svc.id);
-        return (level &&
-            level.level !== "NOT_INCLUDED" &&
-            level.level !== "NOT_APPLICABLE");
-    })
-        .map((svc) => {
-        const level = tier.serviceLevels.find((sl) => sl.serviceId === svc.id);
-        const metrics = mapUsageLimits(svc.id, tier.usageLimits, globalCurrency);
-        return {
+            name: og.name,
+            optional: false,
+            costType: og.costType ?? undefined,
+            recurringAmount: ogConfig.recurringAmount ?? undefined,
+            recurringCurrency: ogConfig.currency ?? globalCurrency,
+            recurringBillingCycle: ogConfig.effectiveBillingCycle,
+            recurringDiscount: mapResolvedDiscount(ogConfig.discount, og.discountMode === "INHERIT_TIER"
+                ? "TIER_INHERITED"
+                : "GROUP_INDEPENDENT"),
+            setupAmount: ogConfig.setupCost ?? undefined,
+            setupCurrency: ogConfig.setupCostCurrency ?? undefined,
+            services: services.map((svc) => mapServiceToInput(svc, tier, globalCurrency, ogConfig.effectiveBillingCycle)),
+        });
+    }
+    // Add-on option groups
+    for (const aoConfig of finalConfig.addOnConfigs) {
+        const og = offering.optionGroups.find((g) => g.id === aoConfig.optionGroupId);
+        if (!og)
+            continue;
+        const services = offering.services.filter((s) => s.optionGroupId === og.id);
+        if (services.length === 0)
+            continue;
+        services.forEach((s) => groupedServiceIds.add(s.id));
+        serviceGroups.push({
             id: generateId(),
-            name: svc.title,
-            description: svc.description ?? null,
-            customValue: level?.customValue ?? null,
-            metrics,
-        };
-    });
+            name: og.name,
+            optional: true,
+            costType: og.costType ?? undefined,
+            recurringAmount: aoConfig.recurringAmount ?? undefined,
+            recurringCurrency: aoConfig.currency ?? globalCurrency,
+            recurringBillingCycle: aoConfig.selectedBillingCycle,
+            recurringDiscount: mapResolvedDiscount(aoConfig.discount, og.discountMode === "INHERIT_TIER"
+                ? "TIER_INHERITED"
+                : "GROUP_INDEPENDENT"),
+            setupAmount: aoConfig.setupCost ?? undefined,
+            setupCurrency: aoConfig.setupCostCurrency ?? undefined,
+            services: services.map((svc) => mapServiceToInput(svc, tier, globalCurrency, aoConfig.selectedBillingCycle)),
+        });
+    }
+}
+/**
+ * Maps a single service from the offering to an InitializeServiceInput.
+ * Includes name, description, customValue from tier service levels,
+ * billing cycle, and usage metrics.
+ */
+function mapServiceToInput(svc, tier, globalCurrency, billingCycle) {
+    const level = tier.serviceLevels.find((sl) => sl.serviceId === svc.id);
+    const metrics = mapUsageLimits(svc.id, tier.usageLimits, globalCurrency);
+    return {
+        id: generateId(),
+        name: svc.title,
+        description: svc.description ?? null,
+        customValue: level?.customValue ?? null,
+        recurringBillingCycle: billingCycle,
+        metrics,
+    };
 }
+/**
+ * Maps a ResolvedDiscount from the offering to a DiscountInfoInitInput,
+ * or returns undefined if no discount.
+ */
+function mapResolvedDiscount(discount, source) {
+    if (!discount)
+        return undefined;
+    return {
+        originalAmount: discount.originalAmount,
+        discountType: discount.discountType,
+        discountValue: discount.discountValue,
+        source,
+    };
+}
+/**
+ * Maps usage limits from the tier to InitializeMetricInput for a given service.
+ */
 function mapUsageLimits(serviceId, usageLimits, globalCurrency) {
     const limits = usageLimits.filter((ul) => ul.serviceId === serviceId);
     return limits.map((ul) => {

package/dist/subgraphs/resources-services/resolvers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/resources-services/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAsC5D,eAAO,MAAM,YAAY,GAAI,UAAU,SAAS,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAuZxE,CAAC"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/resources-services/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAsC5D,eAAO,MAAM,YAAY,GAAI,UAAU,SAAS,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAoaxE,CAAC"}

package/dist/subgraphs/resources-services/resolvers.js

@@ -277,6 +277,14 @@ export const getResolvers = (subgraph) => {
                         resourceLabel: name,
                         resourceThumbnailUrl: serviceOfferingState.thumbnailUrl,
                     }));
+                    // Set billing projection from tier price
+                    const projectedAmount = subscriptionInput.tierPrice ?? finalConfiguration.tierBasePrice;
+                    if (projectedAmount != null) {
+                        await reactor.addAction(subscriptionInstanceDoc.header.id, SubscriptionInstance.actions.updateBillingProjection({
+                            projectedBillAmount: projectedAmount,
+                            projectedBillCurrency: finalConfiguration.tierCurrency || "USD",
+                        }));
+                    }
                     return {
                         success: true,
                         data: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/service-offering",
   "description": "service offering document models",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "license": "AGPL-3.0-only",
   "type": "module",
   "files": [