@friggframework/core 2.0.0--canary.396.ed41aed.0 → 2.0.0--canary.396.20d0301.0

package/integrations/integration-base.js

@@ -60,7 +60,7 @@ class IntegrationBase {
             const { definition } =
                 this.constructor.Definition.modules[moduleName];
             if (typeof definition.API === 'function') {
-                this[moduleName] = { api: new definition.API() };
+                this[moduleName] = { api: new definition.API({}) };
             } else {
                 throw new Error(
                     `Module ${moduleName} must be a function that extends IntegrationModule`

package/integrations/integration-repository.js

@@ -2,7 +2,7 @@ const { IntegrationModel } = require('./integration-model');
 
 class IntegrationRepository {
     async findIntegrationsByUserId(userId) {
-        return IntegrationModel.find({ user: userId });
+        return IntegrationModel.find({ user: userId }, '', { lean: true }).populate('entities');
     }
 
     async deleteIntegrationById(integrationId) {

package/integrations/integration-router.js

@@ -136,6 +136,7 @@ function setIntegrationRoutes(router, factory, getUserFromBearerToken, integrati
                 req.headers.authorization
             );
             const userId = user.getId();
+            const integrations = await getIntegrationsForUser.execute(userId);
             const results = {
                 entities: {
                     options: integrationClasses.map((IntegrationClass) =>
@@ -143,7 +144,7 @@ function setIntegrationRoutes(router, factory, getUserFromBearerToken, integrati
                     ),
                     authorized: await getEntitiesForUserUseCase.execute(userId),
                 },
-                integrations: await getIntegrationsForUser.execute(userId),
+                integrations: integrations.map((integration) => integration.toJSON()),
             }
 
             res.json(results);

package/integrations/integration.js

@@ -151,6 +151,26 @@ class Integration {
     hasMethod(methodName) {
         return methodName in this || (this.behavior && methodName in this.behavior);
     }
+
+    /**
+     * Custom JSON serializer to prevent circular references (e.g. Module → Api → delegate)
+     * and to keep API responses lightweight.
+     * Only primitive, serialisable data needed by clients is returned.
+     */
+    toJSON() {
+        return {
+            id: this.id,
+            userId: this.userId,
+            entities: this.entities,
+            config: this.config,
+            status: this.status,
+            version: this.version,
+            messages: this.messages,
+            entityReference: this.entityReference,
+            // Expose userActions if they were loaded/attached elsewhere
+            userActions: this.userActions,
+        };
+    }
 }
 
 module.exports = { Integration }; 

package/integrations/use-cases/create-integration.js

@@ -17,9 +17,9 @@ class CreateIntegration {
         const integrationRecord = await this.integrationRepository.createIntegration(entities, userId, config);
 
         const modules = {};
-        for (const [entityId, key] of Object.entries(integrationRecord.entityReference)) {
+        for (const [key, entity] of Object.entries(integrationRecord.entities)) {
             const moduleInstance = await this.moduleService.getModuleInstance(
-                entityId,
+                entity._id,
                 integrationRecord.user
             );
             modules[key] = moduleInstance;

package/integrations/use-cases/get-integration-for-user.js

@@ -1,3 +1,5 @@
+const { Integration } = require('../integration');
+
 class GetIntegrationForUser {
     constructor({ integrationRepository, integrationClasses, moduleService }) {
 
@@ -25,10 +27,14 @@ class GetIntegrationForUser {
             throw Boom.forbidden('User does not have access to this integration');
         }
 
+        const integrationClass = this.integrationClasses.find(
+            (integrationClass) => integrationClass.Definition.name === integrationRecord.config.type
+        );
+
         const modules = {};
-        for (const [entityId, key] of Object.entries(integrationRecord.entityReference)) {
+        for (const [key, entity] of Object.entries(integrationRecord.entities)) {
             const moduleInstance = await this.moduleService.getModuleInstance(
-                entityId,
+                entity._id,
                 integrationRecord.user
             );
             modules[key] = moduleInstance;
@@ -43,7 +49,7 @@ class GetIntegrationForUser {
             version: integrationRecord.version,
             messages: integrationRecord.messages,
             entityReference: integrationRecord.entityReference,
-            integrationClass: IntegrationClass,
+            integrationClass: integrationClass,
             modules
         });
 

package/integrations/use-cases/get-integration.js

@@ -11,15 +11,8 @@ class GetIntegration {
         this.integrationRepository = integrationRepository;
         this.integrationClasses = integrationClasses;
         this.moduleService = moduleService;
-
-        // Build type mapping for quick lookup
-        this.integrationTypeMap = new Map();
-        this.integrationClasses.forEach((IntegrationClass) => {
-            this.integrationTypeMap.set(IntegrationClass.getName(), IntegrationClass);
-        });
     }
 
-    // todo: check if this is really all we need to instantiate an integration instance
     async execute(integrationId, userId) {
         // 1. Get integration record from repository
         const integrationRecord = await this.integrationRepository.findIntegrationById(integrationId);
@@ -28,10 +21,7 @@ class GetIntegration {
             throw new Error(`No integration found by the ID of ${integrationId}`);
         }
 
-        // 2. Get the correct Integration class by type
-        const IntegrationClass = this.integrationTypeMap.get(integrationRecord.config.type);
-
-        if (!IntegrationClass) {
+        if (!integrationClass) {
             throw new Error(`No integration class found for type: ${integrationRecord.config.type}`);
         }
 
@@ -41,11 +31,17 @@ class GetIntegration {
             );
         }
 
+        // 2. Get the correct Integration class by type
+        const integrationClass = this.integrationClasses.find(
+            (integrationClass) => integrationClass.Definition.name === integrationRecord.config.type
+        );
+
+
         // 3. Load modules based on entity references
         const modules = {};
-        for (const [entityId, key] of Object.entries(integrationRecord.entityReference)) {
+        for (const [key, entity] of Object.entries(integrationRecord.entities)) {
             const moduleInstance = await this.moduleService.getModuleInstance(
-                entityId,
+                entity._id,
                 integrationRecord.user
             );
             modules[key] = moduleInstance;
@@ -61,7 +57,7 @@ class GetIntegration {
             version: integrationRecord.version,
             messages: integrationRecord.messages,
             entityReference: integrationRecord.entityReference,
-            integrationClass: IntegrationClass,
+            integrationClass: integrationClass,
             modules
         });
 

package/integrations/use-cases/get-integrations-for-user.js

@@ -1,3 +1,5 @@
+const { Integration } = require('../integration');
+
 class GetIntegrationsForUser {
     constructor({ integrationRepository, integrationClasses, moduleService }) {
 
@@ -16,19 +18,23 @@ class GetIntegrationsForUser {
     async execute(userId) {
         const integrationRecords = await this.integrationRepository.findIntegrationsByUserId(userId);
 
-
         const integrations = []
 
         for (const integrationRecord of integrationRecords) {
 
+            const integrationClass = this.integrationClasses.find(
+                (integrationClass) => integrationClass.Definition.name === integrationRecord.config.type
+            );
+
             const modules = {};
-            for (const [entityId, key] of Object.entries(integrationRecord.entityReference)) {
+            for (const [key, entity] of Object.entries(integrationRecord.entities)) {
                 const moduleInstance = await this.moduleService.getModuleInstance(
-                    entityId,
+                    entity._id,
                     integrationRecord.user
                 );
                 modules[key] = moduleInstance;
             }
+
             integrations.push(new Integration({
                 id: integrationRecord.id,
                 userId: integrationRecord.user,
@@ -38,7 +44,7 @@ class GetIntegrationsForUser {
                 version: integrationRecord.version,
                 messages: integrationRecord.messages,
                 entityReference: integrationRecord.entityReference,
-                integrationClass: IntegrationClass,
+                integrationClass: integrationClass,
                 modules
             }));
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.396.ed41aed.0",
+  "version": "2.0.0--canary.396.20d0301.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "aws-sdk": "^2.1200.0",
@@ -22,9 +22,9 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.396.ed41aed.0",
-    "@friggframework/prettier-config": "2.0.0--canary.396.ed41aed.0",
-    "@friggframework/test": "2.0.0--canary.396.ed41aed.0",
+    "@friggframework/eslint-config": "2.0.0--canary.396.20d0301.0",
+    "@friggframework/prettier-config": "2.0.0--canary.396.20d0301.0",
+    "@friggframework/test": "2.0.0--canary.396.20d0301.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -53,5 +53,5 @@
   },
   "homepage": "https://github.com/friggframework/frigg#readme",
   "description": "",
-  "gitHead": "ed41aede348ecbdeb5c2a944137bb01fa76e8aac"
+  "gitHead": "20d0301107157627ac80db74ae19d806ac9d7bc2"
 }