@powerhousedao/service-offering 1.0.0-dev.3 → 1.0.0-dev.4

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

@@ -1,3 +1,3 @@
-import { type ISubgraph } from "@powerhousedao/reactor-api";
-export declare const getResolvers: (subgraph: ISubgraph) => Record<string, unknown>;
+import { BaseSubgraph } from "@powerhousedao/reactor-api";
+export declare const getResolvers: (subgraph: BaseSubgraph) => Record<string, unknown>;
 //# sourceMappingURL=resolvers.d.ts.map

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;AAsD5D,eAAO,MAAM,YAAY,GAAI,UAAU,SAAS,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CA6fxE,CAAC"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/resources-services/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAsD1D,eAAO,MAAM,YAAY,GAAI,UAAU,YAAY,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAib3E,CAAC"}

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

@@ -1,150 +1,95 @@
-import {} from "@powerhousedao/reactor-api";
+import { BaseSubgraph } from "@powerhousedao/reactor-api";
 import { createAction, generateId } from "document-model/core";
 import { addFile } from "document-drive";
 import { ResourceInstanceV1, SubscriptionInstanceV1, } from "@powerhousedao/service-offering/document-models";
 export const getResolvers = (subgraph) => {
     const reactor = subgraph.reactor;
+    const reactorClient = subgraph.reactorClient;
     return {
         Query: {
             resourceTemplates: async (_, args) => {
                 const { id, status, operatorId } = args.filter || {};
-                // If filtering by specific id, try to fetch directly
+                // If filtering by specific id, fetch directly
                 if (id) {
                     try {
-                        const doc = await reactor.getDocument(id);
-                        if (doc &&
-                            doc.header.documentType === "powerhouse/resource-template") {
-                            const state = doc.state.global;
-                            // Check status filter if provided
-                            if (status &&
-                                status.length > 0 &&
-                                !status.includes(state.status)) {
-                                return [];
-                            }
-                            // Check operatorId filter if provided
-                            if (operatorId && state.operatorId !== operatorId) {
-                                return [];
-                            }
-                            return [mapResourceTemplateState(state, doc)];
+                        const result = await reactorClient.find({ type: "powerhouse/resource-template", ids: [id] });
+                        const docs = result.results;
+                        if (docs.length === 0)
+                            return [];
+                        const doc = docs[0];
+                        const state = doc.state.global;
+                        if (status && status.length > 0 && !status.includes(state.status)) {
+                            return [];
                         }
+                        if (operatorId && state.operatorId !== operatorId) {
+                            return [];
+                        }
+                        return [mapResourceTemplateState(state, doc)];
                     }
                     catch {
-                        // Document not found
+                        return [];
                     }
-                    return [];
                 }
-                // Scan all drives for resource template documents
-                const drives = await reactor.getDrives();
+                // Find all resource template documents
+                const result = await reactorClient.find({ type: "powerhouse/resource-template" });
+                const docs = result.results;
                 const resourceTemplates = [];
-                for (const driveId of drives) {
-                    try {
-                        const docIds = await reactor.getDocuments(driveId);
-                        const docs = await Promise.all(docIds.map(async (docId) => {
-                            try {
-                                return await reactor.getDocument(docId);
-                            }
-                            catch {
-                                return null;
-                            }
-                        }));
-                        for (const doc of docs) {
-                            if (doc &&
-                                doc.header.documentType === "powerhouse/resource-template") {
-                                const resourceDoc = doc;
-                                const state = resourceDoc.state.global;
-                                // Apply status filter if provided
-                                if (status &&
-                                    status.length > 0 &&
-                                    !status.includes(state.status)) {
-                                    continue;
-                                }
-                                // Apply operatorId filter if provided
-                                if (operatorId && state.operatorId !== operatorId) {
-                                    continue;
-                                }
-                                resourceTemplates.push(mapResourceTemplateState(state, doc));
-                            }
-                        }
+                for (const doc of docs) {
+                    const state = doc.state.global;
+                    if (status && status.length > 0 && !status.includes(state.status)) {
+                        continue;
                     }
-                    catch (error) {
-                        console.warn(`Failed to inspect drive ${driveId}:`, error);
+                    if (operatorId && state.operatorId !== operatorId) {
+                        continue;
                     }
+                    resourceTemplates.push(mapResourceTemplateState(state, doc));
                 }
                 return resourceTemplates;
             },
             serviceOfferings: async (_, args) => {
                 const { id, status, operatorId, resourceTemplateId } = args.filter || {};
-                // If filtering by specific id, try to fetch directly
+                // If filtering by specific id, fetch directly
                 if (id) {
                     try {
-                        const doc = await reactor.getDocument(id);
-                        if (doc &&
-                            doc.header.documentType === "powerhouse/service-offering") {
-                            const state = doc.state.global;
-                            // Check status filter if provided
-                            if (status &&
-                                status.length > 0 &&
-                                !status.includes(state.status)) {
-                                return [];
-                            }
-                            // Check operatorId filter if provided
-                            if (operatorId && state.operatorId !== operatorId) {
-                                return [];
-                            }
-                            // Check resourceTemplateId filter if provided
-                            if (resourceTemplateId &&
-                                state.resourceTemplateId !== resourceTemplateId) {
-                                return [];
-                            }
-                            return [mapServiceOfferingState(state, doc)];
+                        const result = await reactorClient.find({ type: "powerhouse/service-offering", ids: [id] });
+                        const docs = result.results;
+                        if (docs.length === 0)
+                            return [];
+                        const doc = docs[0];
+                        const state = doc.state.global;
+                        if (status && status.length > 0 && !status.includes(state.status)) {
+                            return [];
                         }
+                        if (operatorId && state.operatorId !== operatorId) {
+                            return [];
+                        }
+                        if (resourceTemplateId &&
+                            state.resourceTemplateId !== resourceTemplateId) {
+                            return [];
+                        }
+                        return [mapServiceOfferingState(state, doc)];
                     }
                     catch {
-                        // Document not found
+                        return [];
                     }
-                    return [];
                 }
-                // Scan all drives for service offering documents
-                const drives = await reactor.getDrives();
+                // Find all service offering documents
+                const result = await reactorClient.find({ type: "powerhouse/service-offering" });
+                const docs = result.results;
                 const serviceOfferings = [];
-                for (const driveId of drives) {
-                    try {
-                        const docIds = await reactor.getDocuments(driveId);
-                        const docs = await Promise.all(docIds.map(async (docId) => {
-                            try {
-                                return await reactor.getDocument(docId);
-                            }
-                            catch {
-                                return null;
-                            }
-                        }));
-                        for (const doc of docs) {
-                            if (doc &&
-                                doc.header.documentType === "powerhouse/service-offering") {
-                                const offeringDoc = doc;
-                                const state = offeringDoc.state.global;
-                                // Apply status filter if provided
-                                if (status &&
-                                    status.length > 0 &&
-                                    !status.includes(state.status)) {
-                                    continue;
-                                }
-                                // Apply operatorId filter if provided
-                                if (operatorId && state.operatorId !== operatorId) {
-                                    continue;
-                                }
-                                // Apply resourceTemplateId filter if provided
-                                if (resourceTemplateId &&
-                                    state.resourceTemplateId !== resourceTemplateId) {
-                                    continue;
-                                }
-                                serviceOfferings.push(mapServiceOfferingState(state, doc));
-                            }
-                        }
+                for (const doc of docs) {
+                    const state = doc.state.global;
+                    if (status && status.length > 0 && !status.includes(state.status)) {
+                        continue;
                     }
-                    catch (error) {
-                        console.warn(`Failed to inspect drive ${driveId}:`, error);
+                    if (operatorId && state.operatorId !== operatorId) {
+                        continue;
                     }
+                    if (resourceTemplateId &&
+                        state.resourceTemplateId !== resourceTemplateId) {
+                        continue;
+                    }
+                    serviceOfferings.push(mapServiceOfferingState(state, doc));
                 }
                 return serviceOfferings;
             },
@@ -292,7 +237,7 @@ export const getResolvers = (subgraph) => {
                     const subscriptionInstanceDoc = await reactor.addDocument("powerhouse/subscription-instance");
                     // resolve parent folders for both drives
                     const teamParentFolder = teamBuilderAdminDrive.state.global.nodes?.find((node) => node.kind === "folder")?.parentFolder;
-                    const operatorDrive = await getOperatorDrive(reactor, resourceTemplateId);
+                    const operatorDrive = await getOperatorDrive(reactorClient, resourceTemplateId);
                     if (!operatorDrive) {
                         throw new Error(`Operator drive not found for resource template ${resourceTemplateId}`);
                     }
@@ -436,6 +381,12 @@ function mapResourceTemplateState(state, doc) {
             parentServiceId: service.parentServiceId || null,
             isSetupFormation: service.isSetupFormation,
             optionGroupId: service.optionGroupId || null,
+            facetBindings: (service.facetBindings || []).map((binding) => ({
+                id: binding.id,
+                facetName: binding.facetName,
+                facetType: binding.facetType,
+                supportedOptions: binding.supportedOptions,
+            })),
         })),
         optionGroups: (state.optionGroups || []).map((group) => ({
             id: group.id,
@@ -526,10 +477,10 @@ function mapServiceOfferingState(state, doc) {
             name: tier.name,
             description: tier.description || null,
             isCustomPricing: tier.isCustomPricing,
-            pricingMode: tier.pricingMode || null,
+            pricingMode: tier.pricingMode,
             pricing: tier.pricing
                 ? {
-                    amount: tier.pricing.amount ?? null,
+                    amount: tier.pricing.amount,
                     currency: tier.pricing.currency,
                 }
                 : null,
@@ -543,6 +494,7 @@ function mapServiceOfferingState(state, doc) {
                 id: level.id,
                 serviceId: level.serviceId,
                 level: level.level,
+                description: level.description || null,
             })),
             usageLimits: tier.usageLimits.map((limit) => ({
                 id: limit.id,
@@ -557,7 +509,7 @@ function mapServiceOfferingState(state, doc) {
             description: group.description || null,
             isAddOn: group.isAddOn,
             defaultSelected: group.defaultSelected,
-            pricingMode: group.pricingMode || null,
+            pricingMode: group.pricingMode,
             standalonePricing: group.standalonePricing
                 ? {
                     amount: group.standalonePricing.amount,
@@ -582,12 +534,12 @@ function mapServiceOfferingState(state, doc) {
         })),
     };
 }
-async function getOperatorDrive(reactor, resourceTemplateId) {
-    const drives = await reactor.getDrives();
-    const results = await Promise.all(drives.map(async (drive) => {
-        const docIds = await reactor.getDocuments(drive);
-        return docIds.includes(resourceTemplateId) ? drive : null;
-    }));
-    const driveId = results.find((id) => id !== null);
-    return driveId ? reactor.getDrive(driveId) : undefined;
+/**
+ * Find the drive that contains a given resource template document.
+ * Uses reactorClient to find the parent drive.
+ */
+async function getOperatorDrive(reactorClient, resourceTemplateId) {
+    const result = await reactorClient.getParents(resourceTemplateId);
+    const parentDrive = result.results.find((doc) => doc.header.documentType === "powerhouse/document-drive");
+    return parentDrive;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/resources-services/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YAsVpB,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../subgraphs/resources-services/schema.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAE5C,eAAO,MAAM,MAAM,EAAE,YAoRpB,CAAC"}

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

@@ -45,7 +45,7 @@ export const schema = gql `
 
   input RSResourceTemplatesFilter {
     id: PHID
-    status: [RSTemplateStatusInput!]
+    status: [RSTemplateStatus!]
     operatorId: PHID
   }
 
@@ -58,7 +58,7 @@ export const schema = gql `
 
   # ============ Resource Template Types ============
 
-  enum RSTemplateStatusInput {
+  enum RSTemplateStatus {
     DRAFT
     COMING_SOON
     ACTIVE
@@ -81,30 +81,16 @@ export const schema = gql `
     facetTargets: [RSFacetTarget!]!
     services: [RSService!]!
     optionGroups: [RSOptionGroup!]!
-    faqFields: [RSFaqField!]
+    faqFields: [RSFaqField!]!
     contentSections: [RSContentSection!]!
   }
 
-  enum RSTemplateStatus {
-    DRAFT
-    COMING_SOON
-    ACTIVE
-    DEPRECATED
-  }
-
   type RSTargetAudience {
     id: OID!
     label: String!
     color: String
   }
 
-  type RSOfferingFacetTarget {
-    id: OID!
-    categoryKey: String!
-    categoryLabel: String!
-    selectedOptions: [String!]!
-  }
-
   type RSService {
     id: OID!
     title: String!
@@ -116,6 +102,13 @@ export const schema = gql `
     facetBindings: [RSResourceFacetBinding!]!
   }
 
+  type RSResourceFacetBinding {
+    id: OID!
+    facetName: String!
+    facetType: PHID!
+    supportedOptions: [OID!]!
+  }
+
   type RSOptionGroup {
     id: OID!
     name: String!
@@ -152,7 +145,7 @@ export const schema = gql `
     status: RSServiceStatus!
     lastModified: DateTime!
     availableBillingCycles: [RSBillingCycle!]!
-    facetTargets: [RSOfferingFacetTarget!]!
+    facetTargets: [RSFacetTarget!]!
     services: [RSOfferingService!]!
     tiers: [RSServiceSubscriptionTier!]!
     optionGroups: [RSOfferingOptionGroup!]!
@@ -172,40 +165,34 @@ export const schema = gql `
     selectedOptions: [String!]!
   }
 
-  # ---------- Discount & Pricing Primitives ----------
+  # ---------- Primitives ----------
 
   enum RSDiscountType {
     PERCENTAGE
-    FLAT_AMOUNT
+    FIXED_AMOUNT
   }
 
-  type RSDiscountRule {
-    discountType: RSDiscountType!
-    discountValue: Float!
+  enum RSBillingCycle {
+    MONTHLY
+    QUARTERLY
+    SEMI_ANNUAL
+    ANNUAL
   }
 
   type RSBillingCycleDiscount {
-    billingCycle: RSBillingCycle!
-    discountRule: RSDiscountRule!
-  }
-
-  type RSSetupCost {
-    amount: Amount_Money!
-    currency: Currency!
-    discount: RSDiscountRule
+    cycle: RSBillingCycle!
+    discountType: RSDiscountType!
+    discountValue: Float!
   }
 
-  type RSRecurringPriceOption {
-    id: OID!
-    billingCycle: RSBillingCycle!
+  type RSPricing {
     amount: Amount_Money!
     currency: Currency!
-    discount: RSDiscountRule
   }
 
   enum RSDiscountMode {
     INHERIT_TIER
-    INDEPENDENT
+    OWN_DISCOUNTS
   }
 
   # ---------- Services ----------
@@ -219,18 +206,12 @@ export const schema = gql `
     optionGroupId: OID
   }
 
-  type RSResourceFacetBinding {
-    id: OID!
-    facetName: String!
-    facetType: PHID!
-    supportedOptions: [OID!]!
-  }
-
   # ---------- Tiers ----------
 
   enum RSTierPricingMode {
-    CALCULATED
-    MANUAL_OVERRIDE
+    CUSTOM
+    FIXED
+    PER_SEAT
   }
 
   type RSServiceSubscriptionTier {
@@ -238,66 +219,26 @@ export const schema = gql `
     name: String!
     description: String
     isCustomPricing: Boolean!
-    pricingMode: RSTierPricingMode
-    pricing: RSServicePricing!
+    pricingMode: RSTierPricingMode!
+    pricing: RSPricing
     defaultBillingCycle: RSBillingCycle
     billingCycleDiscounts: [RSBillingCycleDiscount!]!
     serviceLevels: [RSServiceLevelBinding!]!
-    usageLimits: [RSServiceUsageLimit!]!
-  }
-
-  type RSServicePricing {
-    amount: Amount_Money
-    currency: Currency!
-  }
-
-  enum RSBillingCycle {
-    MONTHLY
-    QUARTERLY
-    SEMI_ANNUAL
-    ANNUAL
-    ONE_TIME
+    usageLimits: [RSUsageLimit!]!
   }
 
   type RSServiceLevelBinding {
     id: OID!
     serviceId: OID!
-    level: RSServiceLevel!
-    customValue: String
-    optionGroupId: OID
-  }
-
-  enum RSServiceLevel {
-    INCLUDED
-    NOT_INCLUDED
-    OPTIONAL
-    CUSTOM
-    VARIABLE
-    NOT_APPLICABLE
+    level: String!
+    description: String
   }
 
-  type RSServiceUsageLimit {
+  type RSUsageLimit {
     id: OID!
-    serviceId: OID!
-    metric: String!
-    unitName: String
-    freeLimit: Int
-    paidLimit: Int
-    resetCycle: RSUsageResetCycle
-    notes: String
-    unitPrice: Amount_Money
-    unitPriceCurrency: Currency
-  }
-
-  enum RSUsageResetCycle {
-    NONE
-    HOURLY
-    DAILY
-    WEEKLY
-    MONTHLY
-    QUARTERLY
-    SEMI_ANNUAL
-    ANNUAL
+    name: String!
+    limit: Int!
+    unit: String
   }
 
   # ---------- Option Groups ----------
@@ -318,9 +259,9 @@ export const schema = gql `
     description: String
     isAddOn: Boolean!
     defaultSelected: Boolean!
-    pricingMode: RSAddOnPricingMode
-    standalonePricing: RSStandalonePricing
-    tierDependentPricing: [RSOptionGroupTierPricing!]
+    pricingMode: RSAddOnPricingMode!
+    standalonePricing: RSPricing
+    tierDependentPricing: [RSTierDependentPricing!]!
     costType: RSGroupCostType
     availableBillingCycles: [RSBillingCycle!]!
     billingCycleDiscounts: [RSBillingCycleDiscount!]!
@@ -329,16 +270,9 @@ export const schema = gql `
     currency: Currency
   }
 
-  type RSStandalonePricing {
-    setupCost: RSSetupCost
-    recurringPricing: [RSRecurringPriceOption!]!
-  }
-
-  type RSOptionGroupTierPricing {
-    id: OID!
+  type RSTierDependentPricing {
     tierId: OID!
-    setupCost: RSSetupCost
-    setupCostDiscounts: [RSBillingCycleDiscount!]!
-    recurringPricing: [RSRecurringPriceOption!]!
+    amount: Amount_Money!
+    currency: Currency!
   }
 `;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@powerhousedao/service-offering",
   "description": "service offering document models",
-  "version": "1.0.0-dev.3",
+  "version": "1.0.0-dev.4",
   "license": "AGPL-3.0-only",
   "repository": {
     "type": "git",