@friggframework/core 2.0.0--canary.689.8c6c948.0 → 2.0.0--canary.688.87a9bf3.0

package/application/commands/entity-commands.js

@@ -1,12 +1,24 @@
 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 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) {
     const status = ERROR_CODE_MAP[error?.code] || 500;
     return {
@@ -66,16 +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: entity.credential?._id
-                        ? entity.credential._id.toString()
-                        : entity.credential,
-                };
+                return toEntityDto(entity);
             } catch (error) {
                 return mapErrorToResponse(error);
             }
@@ -109,16 +112,7 @@ function createEntityCommands() {
                     return null;
                 }
 
-                return {
-                    id: entity.id,
-                    userId: entity.userId,
-                    externalId: entity.externalId,
-                    name: entity.name,
-                    moduleName: entity.moduleName,
-                    credentialId: entity.credential?._id
-                        ? entity.credential._id.toString()
-                        : entity.credential,
-                };
+                return toEntityDto(entity);
             } catch (error) {
                 return mapErrorToResponse(error);
             }
@@ -139,16 +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: entity.credential?._id
-                        ? entity.credential._id.toString()
-                        : entity.credential,
-                }));
+                return entities.map((entity) => toEntityDto(entity));
             } catch (error) {
                 if (error.code) {
                     return mapErrorToResponse(error);
@@ -180,16 +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: entity.credential?._id
-                        ? entity.credential._id.toString()
-                        : entity.credential,
-                }));
+                return entities.map((entity) => toEntityDto(entity));
             } catch (error) {
                 if (error.code) {
                     return mapErrorToResponse(error);
@@ -213,16 +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: entity.credential?._id
-                        ? entity.credential._id.toString()
-                        : entity.credential,
-                };
+                return toEntityDto(entity);
             } catch (error) {
                 return mapErrorToResponse(error);
             }
@@ -250,16 +217,7 @@ function createEntityCommands() {
                     throw error;
                 }
 
-                return {
-                    id: entity.id,
-                    userId: entity.userId,
-                    externalId: entity.externalId,
-                    name: entity.name,
-                    moduleName: entity.moduleName,
-                    credentialId: entity.credential?._id
-                        ? entity.credential._id.toString()
-                        : entity.credential,
-                };
+                return toEntityDto(entity);
             } catch (error) {
                 return mapErrorToResponse(error);
             }

package/application/commands/integration-commands.js

@@ -29,10 +29,6 @@ const {
 const {
     PatchIntegrationConfig,
 } = require('../../integrations/use-cases/patch-integration-config');
-const {
-    AddEntitiesToIntegration,
-    RemoveEntitiesFromIntegration,
-} = require('../../integrations/use-cases/update-integration-entities');
 const {
     getModulesDefinitionFromIntegrationClasses,
 } = require('../../integrations/utils/map-integration-dto');
@@ -44,7 +40,6 @@ const ERROR_CODE_MAP = {
     EXTERNAL_ID_REQUIRED: 400,
     TYPE_REQUIRED: 400,
     INTEGRATION_RECORD_NOT_FOUND: 404,
-    INVALID_INTEGRATION_DATA: 400,
 };
 
 function mapErrorToResponse(error) {
@@ -168,15 +163,6 @@ function createIntegrationCommands({ integrationClass } = {}) {
         integrationRepository,
     });
 
-    const addEntitiesToIntegrationUseCase = new AddEntitiesToIntegration({
-        integrationRepository,
-    });
-
-    const removeEntitiesFromIntegrationUseCase =
-        new RemoveEntitiesFromIntegration({
-            integrationRepository,
-        });
-
     return {
         findIntegrationById,
         listIntegrations,
@@ -321,44 +307,6 @@ function createIntegrationCommands({ integrationClass } = {}) {
             }
         },
 
-        /**
-         * Attach entities to an existing integration. Entities that are
-         * already attached are left as they are.
-         * @param {Object} params
-         * @param {string} params.integrationId - Integration ID
-         * @param {Array<string>} params.entityIds - Entity IDs to attach
-         * @returns {Promise<Object>} Updated integration
-         */
-        async addEntitiesToIntegration({ integrationId, entityIds }) {
-            try {
-                return await addEntitiesToIntegrationUseCase.execute(
-                    integrationId,
-                    entityIds
-                );
-            } catch (error) {
-                return mapErrorToResponse(error);
-            }
-        },
-
-        /**
-         * Detach entities from an integration. Entities that are not
-         * attached are ignored; detached entities are not deleted.
-         * @param {Object} params
-         * @param {string} params.integrationId - Integration ID
-         * @param {Array<string>} params.entityIds - Entity IDs to detach
-         * @returns {Promise<Object>} Updated integration
-         */
-        async removeEntitiesFromIntegration({ integrationId, entityIds }) {
-            try {
-                return await removeEntitiesFromIntegrationUseCase.execute(
-                    integrationId,
-                    entityIds
-                );
-            } catch (error) {
-                return mapErrorToResponse(error);
-            }
-        },
-
         /**
          * Delete an integration by ID
          * @param {string} integrationId - Integration ID to delete

package/integrations/repositories/integration-repository-documentdb.js

@@ -164,42 +164,6 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
         return this._mapIntegration(created);
     }
 
-    async addEntitiesToIntegration(integrationId, entityIds) {
-        const objectId = toObjectId(integrationId);
-        if (!objectId) return null;
-        const existing = await findOne(this.prisma, 'Integration', { _id: objectId });
-        if (!existing) return null;
-
-        await updateOne(
-            this.prisma,
-            'Integration',
-            { _id: objectId },
-            {
-                $addToSet: { entityIds: { $each: toObjectIdArray(entityIds) } },
-                $set: { updatedAt: new Date() },
-            }
-        );
-        return this.findIntegrationById(integrationId);
-    }
-
-    async removeEntitiesFromIntegration(integrationId, entityIds) {
-        const objectId = toObjectId(integrationId);
-        if (!objectId) return null;
-        const existing = await findOne(this.prisma, 'Integration', { _id: objectId });
-        if (!existing) return null;
-
-        await updateOne(
-            this.prisma,
-            'Integration',
-            { _id: objectId },
-            {
-                $pullAll: { entityIds: toObjectIdArray(entityIds) },
-                $set: { updatedAt: new Date() },
-            }
-        );
-        return this.findIntegrationById(integrationId);
-    }
-
     async findIntegrationByUserId(userId) {
         const objectId = toObjectId(userId);
         if (!objectId) return null;

package/integrations/repositories/integration-repository-interface.js

@@ -184,36 +184,6 @@ class IntegrationRepositoryInterface {
             'Method findIntegrationsByEntityId must be implemented by subclass'
         );
     }
-
-    /**
-     * Attach entities to an existing integration. Entities that are already
-     * attached are left as they are.
-     *
-     * @param {string|number} integrationId - Integration ID
-     * @param {Array<string|number>} entityIds - Entity IDs to attach
-     * @returns {Promise<Object|null>} Updated integration, or null when the integration does not exist
-     * @abstract
-     */
-    async addEntitiesToIntegration(integrationId, entityIds) {
-        throw new Error(
-            'Method addEntitiesToIntegration must be implemented by subclass'
-        );
-    }
-
-    /**
-     * Detach entities from an integration. Entities that are not attached
-     * are ignored; the entities themselves are not deleted.
-     *
-     * @param {string|number} integrationId - Integration ID
-     * @param {Array<string|number>} entityIds - Entity IDs to detach
-     * @returns {Promise<Object|null>} Updated integration, or null when the integration does not exist
-     * @abstract
-     */
-    async removeEntitiesFromIntegration(integrationId, entityIds) {
-        throw new Error(
-            'Method removeEntitiesFromIntegration must be implemented by subclass'
-        );
-    }
 }
 
 module.exports = { IntegrationRepositoryInterface };

package/integrations/repositories/integration-repository-mongo.js

@@ -338,58 +338,6 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
         };
     }
 
-    /**
-     * Attach entities to an existing integration. Entities already attached
-     * are left as they are.
-     *
-     * @param {string} integrationId - Integration ID
-     * @param {Array<string>} entityIds - Entity IDs to attach
-     * @returns {Promise<Object|null>} Updated integration, or null when the integration does not exist
-     */
-    async addEntitiesToIntegration(integrationId, entityIds) {
-        const existing = await this.prisma.integration.findUnique({
-            where: { id: integrationId },
-            select: { id: true },
-        });
-        if (!existing) return null;
-
-        await this.prisma.integration.update({
-            where: { id: integrationId },
-            data: {
-                entities: {
-                    connect: entityIds.map((id) => ({ id })),
-                },
-            },
-        });
-        return this.findIntegrationById(integrationId);
-    }
-
-    /**
-     * Detach entities from an integration. Entities that are not attached
-     * are ignored. The entities themselves are not deleted.
-     *
-     * @param {string} integrationId - Integration ID
-     * @param {Array<string>} entityIds - Entity IDs to detach
-     * @returns {Promise<Object|null>} Updated integration, or null when the integration does not exist
-     */
-    async removeEntitiesFromIntegration(integrationId, entityIds) {
-        const existing = await this.prisma.integration.findUnique({
-            where: { id: integrationId },
-            select: { id: true },
-        });
-        if (!existing) return null;
-
-        await this.prisma.integration.update({
-            where: { id: integrationId },
-            data: {
-                entities: {
-                    disconnect: entityIds.map((id) => ({ id })),
-                },
-            },
-        });
-        return this.findIntegrationById(integrationId);
-    }
-
     /**
      * Find integration by user ID (returns single integration)
      * Replaces: IntegrationModel.findOne({ user: userId }).populate('entities')

package/integrations/repositories/integration-repository-postgres.js

@@ -365,64 +365,6 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         };
     }
 
-    /**
-     * Attach entities to an existing integration. Entities already attached
-     * are left as they are.
-     *
-     * @param {string} integrationId - Integration ID (string from application layer)
-     * @param {Array<string>} entityIds - Entity IDs to attach
-     * @returns {Promise<Object|null>} Updated integration, or null when the integration does not exist
-     */
-    async addEntitiesToIntegration(integrationId, entityIds) {
-        const intId = this._convertId(integrationId);
-        const existing = await this.prisma.integration.findUnique({
-            where: { id: intId },
-            select: { id: true },
-        });
-        if (!existing) return null;
-
-        await this.prisma.integration.update({
-            where: { id: intId },
-            data: {
-                entities: {
-                    connect: entityIds.map((id) => ({
-                        id: this._convertId(id),
-                    })),
-                },
-            },
-        });
-        return this.findIntegrationById(integrationId);
-    }
-
-    /**
-     * Detach entities from an integration. Entities that are not attached
-     * are ignored. The entities themselves are not deleted.
-     *
-     * @param {string} integrationId - Integration ID (string from application layer)
-     * @param {Array<string>} entityIds - Entity IDs to detach
-     * @returns {Promise<Object|null>} Updated integration, or null when the integration does not exist
-     */
-    async removeEntitiesFromIntegration(integrationId, entityIds) {
-        const intId = this._convertId(integrationId);
-        const existing = await this.prisma.integration.findUnique({
-            where: { id: intId },
-            select: { id: true },
-        });
-        if (!existing) return null;
-
-        await this.prisma.integration.update({
-            where: { id: intId },
-            data: {
-                entities: {
-                    disconnect: entityIds.map((id) => ({
-                        id: this._convertId(id),
-                    })),
-                },
-            },
-        });
-        return this.findIntegrationById(integrationId);
-    }
-
     /**
      * Find integration by user ID (returns single integration)
      *

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.689.8c6c948.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.689.8c6c948.0",
-        "@friggframework/prettier-config": "2.0.0--canary.689.8c6c948.0",
-        "@friggframework/test": "2.0.0--canary.689.8c6c948.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": "8c6c948c740134af02e7dc17da7bc41c43d0bea3"
+    "gitHead": "87a9bf3315fc2daa2b7f38b7b1ddd5bbcb323b20"
 }

package/integrations/use-cases/update-integration-entities.js

@@ -1,80 +0,0 @@
-function validate(integrationId, entityIds) {
-    if (!integrationId || !Array.isArray(entityIds) || entityIds.length === 0) {
-        const error = new Error(
-            'integrationId and a non-empty entityIds array are required'
-        );
-        error.code = 'INVALID_INTEGRATION_DATA';
-        throw error;
-    }
-}
-
-function notFound(integrationId) {
-    const error = new Error(`Integration ${integrationId} not found`);
-    error.code = 'INTEGRATION_NOT_FOUND';
-    return error;
-}
-
-/**
- * Attaches entities to an existing integration, e.g. when a user grants
- * access to more accounts after the integration was created. Entities that
- * are already attached are left as they are.
- * @class AddEntitiesToIntegration
- */
-class AddEntitiesToIntegration {
-    /**
-     * @param {Object} params
-     * @param {import('../repositories/integration-repository-interface').IntegrationRepositoryInterface} params.integrationRepository
-     */
-    constructor({ integrationRepository }) {
-        this.integrationRepository = integrationRepository;
-    }
-
-    /**
-     * @param {string} integrationId
-     * @param {string[]} entityIds
-     * @returns {Promise<Object>} The updated integration record.
-     */
-    async execute(integrationId, entityIds) {
-        validate(integrationId, entityIds);
-        const integration =
-            await this.integrationRepository.addEntitiesToIntegration(
-                integrationId,
-                entityIds
-            );
-        if (!integration) throw notFound(integrationId);
-        return integration;
-    }
-}
-
-/**
- * Detaches entities from an integration. Entities that are not attached are
- * ignored, and detached entities are not deleted.
- * @class RemoveEntitiesFromIntegration
- */
-class RemoveEntitiesFromIntegration {
-    /**
-     * @param {Object} params
-     * @param {import('../repositories/integration-repository-interface').IntegrationRepositoryInterface} params.integrationRepository
-     */
-    constructor({ integrationRepository }) {
-        this.integrationRepository = integrationRepository;
-    }
-
-    /**
-     * @param {string} integrationId
-     * @param {string[]} entityIds
-     * @returns {Promise<Object>} The updated integration record.
-     */
-    async execute(integrationId, entityIds) {
-        validate(integrationId, entityIds);
-        const integration =
-            await this.integrationRepository.removeEntitiesFromIntegration(
-                integrationId,
-                entityIds
-            );
-        if (!integration) throw notFound(integrationId);
-        return integration;
-    }
-}
-
-module.exports = { AddEntitiesToIntegration, RemoveEntitiesFromIntegration };