@powerhousedao/service-offering 1.0.0-dev.10 → 1.0.0-dev.12

package/dist/document-models/subscription-instance/v1/src/reducers/metrics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../../../../document-models/subscription-instance/v1/src/reducers/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,0EAA0E,CAAC;AAetI,eAAO,MAAM,qCAAqC,EAAE,qCAsHjD,CAAC"}
+{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../../../../../document-models/subscription-instance/v1/src/reducers/metrics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,0EAA0E,CAAC;AAgBtI,eAAO,MAAM,qCAAqC,EAAE,qCAsHjD,CAAC"}

package/dist/document-models/subscription-instance/v1/src/reducers/metrics.js

@@ -1,7 +1,8 @@
+import { findService } from "./utils.js";
 import { AddServiceMetricServiceNotFoundError, UpdateMetricServiceNotFoundError, UpdateMetricNotFoundError, UpdateMetricUsageServiceNotFoundError, UpdateMetricUsageNotFoundError, RemoveServiceMetricServiceNotFoundError, RemoveServiceMetricNotFoundError, IncrementMetricUsageServiceNotFoundError, IncrementMetricUsageNotFoundError, DecrementMetricUsageServiceNotFoundError, DecrementMetricUsageNotFoundError, } from "../../gen/metrics/error.js";
 export const subscriptionInstanceMetricsOperations = {
     addServiceMetricOperation(state, action) {
-        const svc = state.services.find((s) => s.id === action.input.serviceId);
+        const svc = findService(state, action.input.serviceId);
         if (!svc) {
             throw new AddServiceMetricServiceNotFoundError(`Service with ID ${action.input.serviceId} not found`);
         }
@@ -30,7 +31,7 @@ export const subscriptionInstanceMetricsOperations = {
         });
     },
     updateMetricOperation(state, action) {
-        const svc = state.services.find((s) => s.id === action.input.serviceId);
+        const svc = findService(state, action.input.serviceId);
         if (!svc) {
             throw new UpdateMetricServiceNotFoundError(`Service with ID ${action.input.serviceId} not found`);
         }
@@ -50,7 +51,7 @@ export const subscriptionInstanceMetricsOperations = {
             metric.nextUsageReset = action.input.nextUsageReset || null;
     },
     updateMetricUsageOperation(state, action) {
-        const svc = state.services.find((s) => s.id === action.input.serviceId);
+        const svc = findService(state, action.input.serviceId);
         if (!svc) {
             throw new UpdateMetricUsageServiceNotFoundError(`Service with ID ${action.input.serviceId} not found`);
         }
@@ -61,7 +62,7 @@ export const subscriptionInstanceMetricsOperations = {
         metric.currentUsage = action.input.currentUsage;
     },
     removeServiceMetricOperation(state, action) {
-        const svc = state.services.find((s) => s.id === action.input.serviceId);
+        const svc = findService(state, action.input.serviceId);
         if (!svc) {
             throw new RemoveServiceMetricServiceNotFoundError(`Service with ID ${action.input.serviceId} not found`);
         }
@@ -72,7 +73,7 @@ export const subscriptionInstanceMetricsOperations = {
         svc.metrics.splice(index, 1);
     },
     incrementMetricUsageOperation(state, action) {
-        const svc = state.services.find((s) => s.id === action.input.serviceId);
+        const svc = findService(state, action.input.serviceId);
         if (!svc) {
             throw new IncrementMetricUsageServiceNotFoundError(`Service with ID ${action.input.serviceId} not found`);
         }
@@ -83,7 +84,7 @@ export const subscriptionInstanceMetricsOperations = {
         metric.currentUsage += action.input.incrementBy;
     },
     decrementMetricUsageOperation(state, action) {
-        const svc = state.services.find((s) => s.id === action.input.serviceId);
+        const svc = findService(state, action.input.serviceId);
         if (!svc) {
             throw new DecrementMetricUsageServiceNotFoundError(`Service with ID ${action.input.serviceId} not found`);
         }

package/dist/document-models/subscription-instance/v1/src/reducers/utils.d.ts

@@ -0,0 +1,7 @@
+import type { SubscriptionInstanceState, Service } from "../../gen/schema/types.js";
+/**
+ * Finds a service by ID across both top-level standalone services
+ * and services nested inside service groups.
+ */
+export declare function findService(state: SubscriptionInstanceState, serviceId: string): Service | undefined;
+//# sourceMappingURL=utils.d.ts.map

package/dist/document-models/subscription-instance/v1/src/reducers/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../../document-models/subscription-instance/v1/src/reducers/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,OAAO,EACR,MAAM,2BAA2B,CAAC;AAEnC;;;GAGG;AACH,wBAAgB,WAAW,CACzB,KAAK,EAAE,yBAAyB,EAChC,SAAS,EAAE,MAAM,GAChB,OAAO,GAAG,SAAS,CAQrB"}

package/dist/document-models/subscription-instance/v1/src/reducers/utils.js

@@ -0,0 +1,15 @@
+/**
+ * Finds a service by ID across both top-level standalone services
+ * and services nested inside service groups.
+ */
+export function findService(state, serviceId) {
+    const standalone = state.services.find((s) => s.id === serviceId);
+    if (standalone)
+        return standalone;
+    for (const group of state.serviceGroups) {
+        const grouped = group.services.find((s) => s.id === serviceId);
+        if (grouped)
+            return grouped;
+    }
+    return undefined;
+}

package/dist/document-models/subscription-instance/v1/tests/metrics.test.js

@@ -1,6 +1,45 @@
 import { generateMock } from "@powerhousedao/common/utils";
+import { generateId } from "document-model/core";
 import { describe, expect, it } from "vitest";
-import { reducer, utils, isSubscriptionInstanceDocument, addServiceMetric, updateMetric, updateMetricUsage, removeServiceMetric, incrementMetricUsage, decrementMetricUsage, AddServiceMetricInputSchema, UpdateMetricInputSchema, UpdateMetricUsageInputSchema, RemoveServiceMetricInputSchema, IncrementMetricUsageInputSchema, DecrementMetricUsageInputSchema, } from "@powerhousedao/service-offering/document-models/subscription-instance/v1";
+import { reducer, utils, isSubscriptionInstanceDocument, initializeSubscription, addServiceMetric, updateMetric, updateMetricUsage, removeServiceMetric, incrementMetricUsage, decrementMetricUsage, AddServiceMetricInputSchema, UpdateMetricInputSchema, UpdateMetricUsageInputSchema, RemoveServiceMetricInputSchema, IncrementMetricUsageInputSchema, DecrementMetricUsageInputSchema, } from "@powerhousedao/service-offering/document-models/subscription-instance/v1";
+/** Creates a document with a service group containing a service with a metric. */
+function createDocWithServiceGroup() {
+    const serviceId = generateId();
+    const metricId = generateId();
+    const groupId = generateId();
+    let doc = utils.createDocument();
+    doc = reducer(doc, initializeSubscription({
+        createdAt: new Date().toISOString(),
+        customerName: "Test",
+        selectedBillingCycle: "MONTHLY",
+        globalCurrency: "USD",
+        autoRenew: true,
+        serviceGroups: [
+            {
+                id: groupId,
+                name: "Test Group",
+                optional: false,
+                services: [
+                    {
+                        id: serviceId,
+                        name: "Test Service",
+                        metrics: [
+                            {
+                                id: metricId,
+                                name: "API Calls",
+                                unitName: "calls",
+                                currentUsage: 100,
+                                freeLimit: 50,
+                                paidLimit: 200,
+                            },
+                        ],
+                    },
+                ],
+            },
+        ],
+    }));
+    return { doc, serviceId, metricId, groupId };
+}
 describe("MetricsOperations", () => {
     it("should handle addServiceMetric operation", () => {
         const document = utils.createDocument();
@@ -62,4 +101,52 @@ describe("MetricsOperations", () => {
         expect(updatedDocument.operations.global[0].action.input).toStrictEqual(input);
         expect(updatedDocument.operations.global[0].index).toEqual(0);
     });
+    describe("service group metric operations", () => {
+        it("should increment metric usage for a service inside a service group", () => {
+            const { doc, serviceId, metricId } = createDocWithServiceGroup();
+            const updatedDoc = reducer(doc, incrementMetricUsage({
+                serviceId,
+                metricId,
+                incrementBy: 10,
+                currentTime: new Date().toISOString(),
+            }));
+            const metric = updatedDoc.state.global.serviceGroups[0].services[0].metrics[0];
+            expect(metric.currentUsage).toBe(110);
+            expect(updatedDoc.operations.global[1].error).toBeUndefined();
+        });
+        it("should decrement metric usage for a service inside a service group", () => {
+            const { doc, serviceId, metricId } = createDocWithServiceGroup();
+            const updatedDoc = reducer(doc, decrementMetricUsage({
+                serviceId,
+                metricId,
+                decrementBy: 25,
+                currentTime: new Date().toISOString(),
+            }));
+            const metric = updatedDoc.state.global.serviceGroups[0].services[0].metrics[0];
+            expect(metric.currentUsage).toBe(75);
+            expect(updatedDoc.operations.global[1].error).toBeUndefined();
+        });
+        it("should set metric usage for a service inside a service group", () => {
+            const { doc, serviceId, metricId } = createDocWithServiceGroup();
+            const updatedDoc = reducer(doc, updateMetricUsage({
+                serviceId,
+                metricId,
+                currentUsage: 999,
+                currentTime: new Date().toISOString(),
+            }));
+            const metric = updatedDoc.state.global.serviceGroups[0].services[0].metrics[0];
+            expect(metric.currentUsage).toBe(999);
+            expect(updatedDoc.operations.global[1].error).toBeUndefined();
+        });
+        it("should return error for non-existent service in service group", () => {
+            const { doc, metricId } = createDocWithServiceGroup();
+            const updatedDoc = reducer(doc, incrementMetricUsage({
+                serviceId: "non-existent-id",
+                metricId,
+                incrementBy: 1,
+                currentTime: new Date().toISOString(),
+            }));
+            expect(updatedDoc.operations.global[1].error).toBe("Service with ID non-existent-id not found");
+        });
+    });
 });

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,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAyD/D,eAAO,MAAM,YAAY,GACvB,UAAU,YAAY,KACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAsfxB,CAAC"}
+{"version":3,"file":"resolvers.d.ts","sourceRoot":"","sources":["../../../subgraphs/resources-services/resolvers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAyD/D,eAAO,MAAM,YAAY,GACvB,UAAU,YAAY,KACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CA6gBxB,CAAC"}

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

@@ -1,6 +1,6 @@
 import { getUserSelectionPriceBreakdown, } from "../../document-models/service-offering/v1/src/utils.js";
-import { createAction } from "document-model/core";
-import { addFile, driveCreateDocument } from "document-drive";
+import { createAction, generateId } from "document-model/core";
+import { addFile, addFolder, driveCreateDocument } from "document-drive";
 import { ResourceInstance } from "../../document-models/resource-instance/v1/module.js";
 import { SubscriptionInstance } from "../../document-models/subscription-instance/v1/module.js";
 import { mapOfferingToSubscription } from "../../editors/subscription-instance-editor/components/mapOfferingToSubscription.js";
@@ -269,26 +269,29 @@ export const getResolvers = (subgraph) => {
                     const builderProfileDoc = await reactorClient.createEmpty("powerhouse/builder-profile", { parentIdentifier: driveId });
                     const resourceInstanceDoc = await reactorClient.createEmpty("powerhouse/resource-instance", { parentIdentifier: driveId });
                     const subscriptionInstanceDoc = await reactorClient.createEmpty("powerhouse/subscription-instance", { parentIdentifier: driveId });
-                    // add file references to the team drive
-                    const teamRootFolder = teamBuilderAdminDrive.state.global.nodes.find((node) => node.kind === "folder")?.parentFolder;
+                    // create "Service Subscriptions" folder and organize files in team drive
+                    const teamServiceSubsFolderId = generateId();
                     await reactorClient.execute(driveId, "main", [
+                        addFolder({
+                            id: teamServiceSubsFolderId,
+                            name: "Service Subscriptions",
+                        }),
                         addFile({
                             documentType: "powerhouse/builder-profile",
                             id: builderProfileDoc.header.id,
                             name: `${parsedTeamName} Builder Profile`,
-                            parentFolder: teamRootFolder,
                         }),
                         addFile({
                             documentType: "powerhouse/resource-instance",
                             id: resourceInstanceDoc.header.id,
                             name: `${parsedTeamName} Resource Instance`,
-                            parentFolder: teamRootFolder,
+                            parentFolder: teamServiceSubsFolderId,
                         }),
                         addFile({
                             documentType: "powerhouse/subscription-instance",
                             id: subscriptionInstanceDoc.header.id,
                             name: `${parsedTeamName} Subscription Instance`,
-                            parentFolder: teamRootFolder,
+                            parentFolder: teamServiceSubsFolderId,
                         }),
                     ]);
                     // update builder profile
@@ -307,26 +310,44 @@ export const getResolvers = (subgraph) => {
                     if (!operatorProfileId) {
                         throw new Error(`Operator profile not found for drive ${operatorDrive.header.id}`);
                     }
-                    const operatorParentFolder = operatorDrive.state.global.nodes.find((node) => node.kind === "folder")?.parentFolder;
+                    // find or create "Service Subscriptions" folder in the operator drive
+                    let serviceSubscriptionsFolderId = operatorDrive.state.global.nodes.find((node) => node.kind === "folder" &&
+                        node.name === "Service Subscriptions")?.id;
+                    if (!serviceSubscriptionsFolderId) {
+                        serviceSubscriptionsFolderId = generateId();
+                        await reactorClient.execute(operatorDrive.header.id, "main", [
+                            addFolder({
+                                id: serviceSubscriptionsFolderId,
+                                name: "Service Subscriptions",
+                            }),
+                        ]);
+                    }
+                    // create a team folder inside "Service Subscriptions" for this team's docs
+                    const teamFolderId = generateId();
                     // add reactor-level relationships so Connect syncs the child documents
                     // (createEmpty guarantees CREATE_DOCUMENT is persisted before this runs)
                     await reactorClient.addChildren(operatorDrive.header.id, [
                         resourceInstanceDoc.header.id,
                         subscriptionInstanceDoc.header.id,
                     ]);
-                    // add file references to operator drive
+                    // add team folder and file references to operator drive
                     await reactorClient.execute(operatorDrive.header.id, "main", [
+                        addFolder({
+                            id: teamFolderId,
+                            name: teamName,
+                            parentFolder: serviceSubscriptionsFolderId,
+                        }),
                         addFile({
                             documentType: "powerhouse/resource-instance",
                             id: resourceInstanceDoc.header.id,
                             name: `${parsedTeamName} Resource Instance`,
-                            parentFolder: operatorParentFolder,
+                            parentFolder: teamFolderId,
                         }),
                         addFile({
                             documentType: "powerhouse/subscription-instance",
                             id: subscriptionInstanceDoc.header.id,
                             name: `${parsedTeamName} Subscription Instance`,
-                            parentFolder: operatorParentFolder,
+                            parentFolder: teamFolderId,
                         }),
                     ]);
                     // populate documents after all files are added to both drives

package/package.json

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