@friggframework/core 2.0.0--canary.688.e850868.0 → 2.0.0--canary.688.87a9bf3.0

package/application/commands/entity-commands.js

@@ -1,17 +1,22 @@
 const {
     createModuleRepository,
 } = require('../../modules/repositories/module-repository-factory');
+const { toCredentialId } = require('../../modules/utils/to-credential-id');
 
 const ERROR_CODE_MAP = {
     ENTITY_NOT_FOUND: 404,
     INVALID_ENTITY_DATA: 400,
 };
 
-function toCredentialId(credential) {
-    if (credential && typeof credential === 'object') {
-        return (credential.id ?? credential._id)?.toString() ?? null;
-    }
-    return credential ?? null;
+function toEntityDto(entity) {
+    return {
+        id: entity.id,
+        userId: entity.userId,
+        externalId: entity.externalId,
+        name: entity.name,
+        moduleName: entity.moduleName,
+        credentialId: toCredentialId(entity.credential),
+    };
 }
 
 function mapErrorToResponse(error) {
@@ -73,14 +78,7 @@ function createEntityCommands() {
 
                 const entity = await moduleRepo.createEntity(entityData);
 
-                return {
-                    id: entity.id,
-                    userId: entity.userId,
-                    externalId: entity.externalId,
-                    name: entity.name,
-                    moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
-                };
+                return toEntityDto(entity);
             } catch (error) {
                 return mapErrorToResponse(error);
             }
@@ -114,14 +112,7 @@ function createEntityCommands() {
                     return null;
                 }
 
-                return {
-                    id: entity.id,
-                    userId: entity.userId,
-                    externalId: entity.externalId,
-                    name: entity.name,
-                    moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
-                };
+                return toEntityDto(entity);
             } catch (error) {
                 return mapErrorToResponse(error);
             }
@@ -142,14 +133,7 @@ function createEntityCommands() {
 
                 const entities = await moduleRepo.findEntitiesByUserId(userId);
 
-                return entities.map((entity) => ({
-                    id: entity.id,
-                    userId: entity.userId,
-                    externalId: entity.externalId,
-                    name: entity.name,
-                    moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
-                }));
+                return entities.map((entity) => toEntityDto(entity));
             } catch (error) {
                 if (error.code) {
                     return mapErrorToResponse(error);
@@ -181,14 +165,7 @@ function createEntityCommands() {
                         moduleName
                     );
 
-                return entities.map((entity) => ({
-                    id: entity.id,
-                    userId: entity.userId,
-                    externalId: entity.externalId,
-                    name: entity.name,
-                    moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
-                }));
+                return entities.map((entity) => toEntityDto(entity));
             } catch (error) {
                 if (error.code) {
                     return mapErrorToResponse(error);
@@ -212,14 +189,7 @@ function createEntityCommands() {
 
                 const entity = await moduleRepo.findEntityById(entityId);
 
-                return {
-                    id: entity.id,
-                    userId: entity.userId,
-                    externalId: entity.externalId,
-                    name: entity.name,
-                    moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
-                };
+                return toEntityDto(entity);
             } catch (error) {
                 return mapErrorToResponse(error);
             }
@@ -247,14 +217,7 @@ function createEntityCommands() {
                     throw error;
                 }
 
-                return {
-                    id: entity.id,
-                    userId: entity.userId,
-                    externalId: entity.externalId,
-                    name: entity.name,
-                    moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
-                };
+                return toEntityDto(entity);
             } catch (error) {
                 return mapErrorToResponse(error);
             }

package/modules/utils/map-module-dto.js

@@ -1,3 +1,5 @@
+const { toCredentialId } = require('./to-credential-id');
+
 /**
  * @param {import('../module').Module} moduleInstance
  * Convert a Module domain instance to a plain DTO suitable for JSON responses.
@@ -10,9 +12,9 @@ function mapModuleClassToModuleDTO(moduleInstance) {
         name: moduleInstance.name,
         userId: moduleInstance.userId,
         entity: moduleInstance.entity,
-        credentialId: moduleInstance.credential?._id?.toString(),
-        type: moduleInstance.getName()
+        credentialId: toCredentialId(moduleInstance.credential),
+        type: moduleInstance.getName(),
     };
 }
 
-module.exports = { mapModuleClassToModuleDTO }; 
+module.exports = { mapModuleClassToModuleDTO };

package/modules/utils/to-credential-id.js

@@ -0,0 +1,14 @@
+/**
+ * Resolve the credential id from an entity's or module's `credential`, which
+ * repositories return as the decrypted credential object (or a bare id).
+ * @param {Object|string|number|null|undefined} credential
+ * @returns {string|null}
+ */
+function toCredentialId(credential) {
+    if (credential && typeof credential === 'object') {
+        return credential.id?.toString() ?? null;
+    }
+    return credential?.toString() ?? null;
+}
+
+module.exports = { toCredentialId };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.688.e850868.0",
+    "version": "2.0.0--canary.688.87a9bf3.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -47,9 +47,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.688.e850868.0",
-        "@friggframework/prettier-config": "2.0.0--canary.688.e850868.0",
-        "@friggframework/test": "2.0.0--canary.688.e850868.0",
+        "@friggframework/eslint-config": "2.0.0--canary.688.87a9bf3.0",
+        "@friggframework/prettier-config": "2.0.0--canary.688.87a9bf3.0",
+        "@friggframework/test": "2.0.0--canary.688.87a9bf3.0",
         "@prisma/client": "^6.19.3",
         "@types/lodash": "4.17.15",
         "@typescript-eslint/eslint-plugin": "^8.0.0",
@@ -89,5 +89,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "e850868f19706ee89566fd9724603dee1e03a711"
+    "gitHead": "87a9bf3315fc2daa2b7f38b7b1ddd5bbcb323b20"
 }