@friggframework/core 2.0.0--canary.396.55167ab.0 → 2.0.0--canary.396.accf516.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,

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

@@ -23,7 +23,7 @@ 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
@@ -33,7 +33,7 @@ class GetIntegrationsForUser {
             for (const [key, entity] of Object.entries(entities)) {
                 const moduleInstance = await this.moduleService.getModuleInstance(
                     entity.id,
-                    integrationRecord.user
+                    integrationRecord.userId
                 );
                 modules[key] = moduleInstance;
             }

package/module-plugin/module-repository.js

@@ -7,16 +7,30 @@ 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');
+
+        if (entitiesRecords.length !== entitiesIds.length) {
+            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,

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.accf516.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.accf516.0",
+    "@friggframework/prettier-config": "2.0.0--canary.396.accf516.0",
+    "@friggframework/test": "2.0.0--canary.396.accf516.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": "accf516c6aef6b581e2fe68268c28676275efa0d"
 }