@friggframework/core 2.0.0--canary.396.5afebde.0 → 2.0.0--canary.396.55167ab.0

package/integrations/integration-repository.js

@@ -2,7 +2,16 @@ const { IntegrationModel } = require('./integration-model');
 
 class IntegrationRepository {
     async findIntegrationsByUserId(userId) {
-        return IntegrationModel.find({ user: userId }, '', { lean: true }).populate('entities');
+        const integrationRecords = await IntegrationModel.find({ user: userId }, '', { lean: true }).populate('entities');
+        return integrationRecords.map(integrationRecord => ({
+            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 deleteIntegrationById(integrationId) {

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

@@ -2,7 +2,7 @@ const { Integration } = require('../integration');
 const { mapIntegrationClassToIntegrationDTO } = require('../utils/map-integration-dto');
 
 class GetIntegrationsForUser {
-    constructor({ integrationRepository, integrationClasses, moduleService }) {
+    constructor({ integrationRepository, integrationClasses, moduleService, moduleRepository }) {
 
         /**
          * @type {import('../integration-repository').IntegrationRepository}
@@ -10,6 +10,7 @@ class GetIntegrationsForUser {
         this.integrationRepository = integrationRepository;
         this.integrationClasses = integrationClasses;
         this.moduleService = moduleService;
+        this.moduleRepository = moduleRepository;
     }
 
     /**
@@ -22,24 +23,25 @@ class GetIntegrationsForUser {
         const integrations = []
 
         for (const integrationRecord of integrationRecords) {
+            const entities = await this.moduleRepository.findEntitiesByIds(integrationRecords.entitiesIds);
 
             const integrationClass = this.integrationClasses.find(
                 (integrationClass) => integrationClass.Definition.name === integrationRecord.config.type
             );
 
             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,
+                entities: entities,
                 config: integrationRecord.config,
                 status: integrationRecord.status,
                 version: integrationRecord.version,

package/package.json

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