@friggframework/core 2.0.0--canary.396.55167ab.0 → 2.0.0--canary.396.0dd37aa.0

package/integrations/integration-repository.js

@@ -6,7 +6,7 @@ class IntegrationRepository {
         return integrationRecords.map(integrationRecord => ({
             id: integrationRecord._id,
             entitiesIds: integrationRecord.entities.map(e => e._id),
-            userId: integrationRecord.user,
+            userId: integrationRecord.user.toString(),
             config: integrationRecord.config,
             version: integrationRecord.version,
             status: integrationRecord.status,
@@ -23,7 +23,7 @@ class IntegrationRepository {
         return {
             id: integrationRecord._id,
             entitiesIds: integrationRecord.entities.map(e => e._id),
-            userId: integrationRecord.user,
+            userId: integrationRecord.user.toString(),
             config: integrationRecord.config,
             version: integrationRecord.version,
             status: integrationRecord.status,

package/integrations/integration-router.js

@@ -15,6 +15,7 @@ const { GetEntitiesForUser } = require('../module-plugin/use-cases/get-entities-
 const {
     loadAppDefinition,
 } = require('../handlers/app-definition-loader');
+const { GetIntegration } = require('./use-cases/get-integration');
 
 // todo: dont send moduleFactory and integrationFactory as a factory object, instead send them as separate params.
 // todo: this could be a use case class
@@ -76,6 +77,12 @@ function createIntegrationRouter(params) {
         moduleDefinitions: getModules(),
     });
 
+    const getIntegration = new GetIntegration({
+        integrationRepository,
+        integrationClasses: integrations,
+        moduleService,
+    });
+
     const router = get(params, 'router', express());
     const factory = get(params, 'factory');
     const getUserFromBearerToken = get(params, 'getUserFromBearerToken');
@@ -86,6 +93,7 @@ function createIntegrationRouter(params) {
         deleteIntegrationForUser,
         getIntegrationsForUser,
         getEntitiesForUserUseCase,
+        getIntegration,
     });
     setEntityRoutes(router, factory, getUserFromBearerToken, {
         getCredentialForUser,
@@ -130,6 +138,7 @@ function setIntegrationRoutes(router, factory, getUserFromBearerToken, integrati
         deleteIntegrationForUser,
         getIntegrationsForUser,
         getEntitiesForUserUseCase,
+        getIntegration,
     } = useCases;
     router.route('/api/integrations').get(
         catchAsyncError(async (req, res) => {
@@ -280,11 +289,7 @@ function setIntegrationRoutes(router, factory, getUserFromBearerToken, integrati
                 req.headers.authorization
             );
             const params = checkRequiredParams(req.params, ['integrationId']);
-            const integration =
-                await integrationFactory.getInstanceFromIntegrationId({
-                    integrationId: params.integrationId,
-                    userId: user.getId(),
-                });
+            const integration = await getIntegration.execute(params.integrationId, user.getId());
             res.json(await integration.send('GET_USER_ACTIONS', req.body));
         })
     );

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

@@ -34,13 +34,13 @@ class GetIntegrationForUser {
             (integrationClass) => integrationClass.Definition.name === integrationRecord.config.type
         );
 
-        const modules = {};
-        for (const [key, entity] of Object.entries(entities)) {
+        const modules = [];
+        for (const entity of entities) {
             const moduleInstance = await this.moduleService.getModuleInstance(
-                entity.id,
+                entity._id,
                 integrationRecord.user
             );
-            modules[key] = moduleInstance;
+            modules.push(moduleInstance);
         }
 
         const integrationInstance = new Integration({

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

@@ -4,6 +4,15 @@ const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integratio
 
 // todo: remove this use case
 class GetIntegration {
+
+    /**
+     * @class GetIntegration
+     * @description Use case for retrieving a single integration by ID and user.
+     * @param {Object} params
+     * @param {import('../integration-repository').IntegrationRepository} params.integrationRepository - Repository for integration data access
+     * @param {Array<import('../integration').Integration>} params.integrationClasses - Array of available integration classes
+     * @param {import('../module-plugin/module-service').ModuleService} params.moduleService - Service for module instantiation and management
+     */
     constructor({
         integrationRepository,
         integrationClasses,
@@ -26,7 +35,7 @@ class GetIntegration {
             throw new Error(`No integration class found for type: ${integrationRecord.config.type}`);
         }
 
-        if (!integrationRecord.user.equals(userId)) {
+        if (integrationRecord.userId !== userId) {
             throw new Error(
                 `Integration ${integrationId} does not belong to User ${userId}`
             );
@@ -39,20 +48,20 @@ class GetIntegration {
 
 
         // 3. Load modules based on entity references
-        const modules = {};
-        for (const [key, entity] of Object.entries(integrationRecord.entities)) {
+        const modules = [];
+        for (const entityId of integrationRecord.entitiesIds) {
             const moduleInstance = await this.moduleService.getModuleInstance(
-                entity._id,
-                integrationRecord.user
+                entityId,
+                integrationRecord.userId
             );
-            modules[key] = moduleInstance;
+            modules.push(moduleInstance);
         }
 
         // 4. Create the Integration domain entity with modules
         const integrationInstance = new Integration({
             id: integrationRecord._id.toString(),
-            userId: integrationRecord.user,
-            entities: integrationRecord.entities,
+            userId: integrationRecord.userId,
+            entities: integrationRecord.entitiesIds,
             config: integrationRecord.config,
             status: integrationRecord.status,
             version: integrationRecord.version,

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

@@ -23,19 +23,19 @@ class GetIntegrationsForUser {
         const integrations = []
 
         for (const integrationRecord of integrationRecords) {
-            const entities = await this.moduleRepository.findEntitiesByIds(integrationRecords.entitiesIds);
+            const entities = await this.moduleRepository.findEntitiesByIds(integrationRecord.entitiesIds);
 
             const integrationClass = this.integrationClasses.find(
                 (integrationClass) => integrationClass.Definition.name === integrationRecord.config.type
             );
 
-            const modules = {};
-            for (const [key, entity] of Object.entries(entities)) {
+            const modules = [];
+            for (const entity of entities) {
                 const moduleInstance = await this.moduleService.getModuleInstance(
-                    entity.id,
-                    integrationRecord.user
+                    entity._id,
+                    integrationRecord.userId
                 );
-                modules[key] = moduleInstance;
+                modules.push(moduleInstance);
             }
 
             const integrationInstance = new Integration({

package/module-plugin/module-repository.js

@@ -7,16 +7,31 @@ class ModuleRepository {
             throw new Error(`Entity ${entityId} not found`);
         }
 
-        return entity;
+        return {
+            id: entity._id,
+            accountId: entity.accountId,
+            credential: entity.credential,
+            userId: entity.user.toString(),
+            name: entity.name,
+            externalId: entity.externalId,
+            type: entity.__t,
+            moduleName: entity.moduleName,
+        };
     }
 
     async findEntitiesByIds(entitiesIds) {
         const entitiesRecords = await Entity.find({ _id: { $in: entitiesIds } }, '', { lean: true }).populate('credential');
+
+        // todo: this is a workaround needed while we create an integration with the same entity twice
+        if (entitiesRecords.length !== entitiesIds.length && entitiesIds[0] !== entitiesIds[1]) {
+            throw new Error(`Some entities not found`);
+        }
+
         return entitiesRecords.map(e => ({
             id: e._id,
             accountId: e.accountId,
             credential: e.credential,
-            userId: e.user,
+            userId: e.user.toString(),
             name: e.name,
             externalId: e.externalId,
             type: e.__t,
@@ -31,6 +46,14 @@ class ModuleRepository {
             { lean: true }
         );
     }
+
+    async findEntitiesByIds(entityIds) {
+        return Entity.find(
+            { _id: { $in: entityIds } },
+            '-dateCreated -dateUpdated -user -credentials -credential -__t -__v',
+            { lean: true }
+        );
+    }
 }
 
 module.exports = { ModuleRepository }; 

package/module-plugin/module-service.js

@@ -21,13 +21,13 @@ class ModuleService {
             throw new Error(`Entity ${entityId} not found`);
         }
 
-        if (entity.user.toString() !== userId.toString()) {
+        if (entity.userId !== userId) {
             throw new Error(
                 `Entity ${entityId} does not belong to user ${userId}`
             );
         }
 
-        const entityType = entity.__t;
+        const entityType = entity.type;
         const moduleDefinition = this.moduleDefinitions.find((def) => {
             const modelName = Module.getEntityModelFromDefinition(def).modelName;
             return entityType === modelName;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.396.55167ab.0",
+  "version": "2.0.0--canary.396.0dd37aa.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.55167ab.0",
-    "@friggframework/prettier-config": "2.0.0--canary.396.55167ab.0",
-    "@friggframework/test": "2.0.0--canary.396.55167ab.0",
+    "@friggframework/eslint-config": "2.0.0--canary.396.0dd37aa.0",
+    "@friggframework/prettier-config": "2.0.0--canary.396.0dd37aa.0",
+    "@friggframework/test": "2.0.0--canary.396.0dd37aa.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": "55167ab7bbeabe9d61924cb7ba8b62edaa2e1dd4"
+  "gitHead": "0dd37aa78998c9291f90e3fdeb0e07096e2e140a"
 }