@friggframework/core 2.0.0--canary.396.6afd30a.0 → 2.0.0--canary.396.5afebde.0

package/integrations/integration-repository.js

@@ -10,7 +10,16 @@ class IntegrationRepository {
     }
 
     async findIntegrationById(id) {
-        return IntegrationModel.findById(id).populate('entities');
+        const integrationRecord = await IntegrationModel.findById(id, '', { lean: true }).populate('entities');
+        return {
+            id: integrationRecord._id,
+            entitiesIds: integrationRecord.entities.map(e => e._id),
+            userId: integrationRecord.user,
+            config: integrationRecord.config,
+            version: integrationRecord.version,
+            status: integrationRecord.status,
+            messages: integrationRecord.messages,
+        }
     }
 
     async createIntegration(entities, userId, config) {

package/integrations/integration-router.js

@@ -60,6 +60,7 @@ function createIntegrationRouter(params) {
         integrationRepository,
         integrationClasses: integrations,
         moduleService,
+        moduleRepository,
     });
     const getCredentialForUser = new GetCredentialForUser({
         credentialRepository,

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

@@ -2,7 +2,7 @@ const { Integration } = require('../integration');
 const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 class GetIntegrationForUser {
-    constructor({ integrationRepository, integrationClasses, moduleService }) {
+    constructor({ integrationRepository, integrationClasses, moduleService, moduleRepository }) {
 
         /**
          * @type {import('../integration-repository').IntegrationRepository}
@@ -10,6 +10,7 @@ class GetIntegrationForUser {
         this.integrationRepository = integrationRepository;
         this.integrationClasses = integrationClasses;
         this.moduleService = moduleService;
+        this.moduleRepository = moduleRepository;
     }
 
     /**
@@ -19,6 +20,7 @@ class GetIntegrationForUser {
      */
     async execute(integrationId, userId) {
         const integrationRecord = await this.integrationRepository.findIntegrationById(integrationId);
+        const entities = await this.moduleRepository.findEntitiesByIds(integrationRecord.entitiesIds);
 
         if (!integrationRecord) {
             throw Boom.notFound(`Integration with id of ${integrationId} does not exist`);
@@ -33,18 +35,18 @@ class GetIntegrationForUser {
         );
 
         const modules = {};
-        for (const [key, entity] of Object.entries(integrationRecord.entities)) {
+        for (const [key, entity] of Object.entries(entities)) {
             const moduleInstance = await this.moduleService.getModuleInstance(
-                entity._id,
+                entity.id,
                 integrationRecord.user
             );
             modules[key] = moduleInstance;
         }
 
         const integrationInstance = new Integration({
-            id: integrationRecord._id.toString(),
+            id: integrationRecord._id,
             userId: integrationRecord.user,
-            entities: integrationRecord.entities.map(e => ({ ...e, id: e._id.toString() })),
+            entities: entities,
             config: integrationRecord.config,
             status: integrationRecord.status,
             version: integrationRecord.version,

package/module-plugin/module-repository.js

@@ -10,6 +10,20 @@ class ModuleRepository {
         return entity;
     }
 
+    async findEntitiesByIds(entitiesIds) {
+        const entitiesRecords = await Entity.find({ _id: { $in: entitiesIds } }, '', { lean: true }).populate('credential');
+        return entitiesRecords.map(e => ({
+            id: e._id,
+            accountId: e.accountId,
+            credential: e.credential,
+            userId: e.user,
+            name: e.name,
+            externalId: e.externalId,
+            type: e.__t,
+            moduleName: e.moduleName,
+        }));
+    }
+
     async findEntitiesByUserId(userId) {
         return Entity.find(
             { user: userId },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.396.6afd30a.0",
+  "version": "2.0.0--canary.396.5afebde.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.6afd30a.0",
-    "@friggframework/prettier-config": "2.0.0--canary.396.6afd30a.0",
-    "@friggframework/test": "2.0.0--canary.396.6afd30a.0",
+    "@friggframework/eslint-config": "2.0.0--canary.396.5afebde.0",
+    "@friggframework/prettier-config": "2.0.0--canary.396.5afebde.0",
+    "@friggframework/test": "2.0.0--canary.396.5afebde.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": "6afd30ab7178ec917c10c2539da48b005cbecb37"
+  "gitHead": "5afebde4f111d7d8a1b547996575b55f03274261"
 }