@friggframework/core 2.0.0--canary.688.e850868.0 → 2.0.0--canary.689.8c6c948.0

package/application/commands/entity-commands.js

@@ -7,13 +7,6 @@ const ERROR_CODE_MAP = {
     INVALID_ENTITY_DATA: 400,
 };
 
-function toCredentialId(credential) {
-    if (credential && typeof credential === 'object') {
-        return (credential.id ?? credential._id)?.toString() ?? null;
-    }
-    return credential ?? null;
-}
-
 function mapErrorToResponse(error) {
     const status = ERROR_CODE_MAP[error?.code] || 500;
     return {
@@ -79,7 +72,9 @@ function createEntityCommands() {
                     externalId: entity.externalId,
                     name: entity.name,
                     moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
+                    credentialId: entity.credential?._id
+                        ? entity.credential._id.toString()
+                        : entity.credential,
                 };
             } catch (error) {
                 return mapErrorToResponse(error);
@@ -120,7 +115,9 @@ function createEntityCommands() {
                     externalId: entity.externalId,
                     name: entity.name,
                     moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
+                    credentialId: entity.credential?._id
+                        ? entity.credential._id.toString()
+                        : entity.credential,
                 };
             } catch (error) {
                 return mapErrorToResponse(error);
@@ -148,7 +145,9 @@ function createEntityCommands() {
                     externalId: entity.externalId,
                     name: entity.name,
                     moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
+                    credentialId: entity.credential?._id
+                        ? entity.credential._id.toString()
+                        : entity.credential,
                 }));
             } catch (error) {
                 if (error.code) {
@@ -187,7 +186,9 @@ function createEntityCommands() {
                     externalId: entity.externalId,
                     name: entity.name,
                     moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
+                    credentialId: entity.credential?._id
+                        ? entity.credential._id.toString()
+                        : entity.credential,
                 }));
             } catch (error) {
                 if (error.code) {
@@ -218,7 +219,9 @@ function createEntityCommands() {
                     externalId: entity.externalId,
                     name: entity.name,
                     moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
+                    credentialId: entity.credential?._id
+                        ? entity.credential._id.toString()
+                        : entity.credential,
                 };
             } catch (error) {
                 return mapErrorToResponse(error);
@@ -253,7 +256,9 @@ function createEntityCommands() {
                     externalId: entity.externalId,
                     name: entity.name,
                     moduleName: entity.moduleName,
-                    credentialId: toCredentialId(entity.credential),
+                    credentialId: entity.credential?._id
+                        ? entity.credential._id.toString()
+                        : entity.credential,
                 };
             } catch (error) {
                 return mapErrorToResponse(error);

package/application/commands/integration-commands.js

@@ -29,6 +29,10 @@ 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');
@@ -40,6 +44,7 @@ const ERROR_CODE_MAP = {
     EXTERNAL_ID_REQUIRED: 400,
     TYPE_REQUIRED: 400,
     INTEGRATION_RECORD_NOT_FOUND: 404,
+    INVALID_INTEGRATION_DATA: 400,
 };
 
 function mapErrorToResponse(error) {
@@ -163,6 +168,15 @@ function createIntegrationCommands({ integrationClass } = {}) {
         integrationRepository,
     });
 
+    const addEntitiesToIntegrationUseCase = new AddEntitiesToIntegration({
+        integrationRepository,
+    });
+
+    const removeEntitiesFromIntegrationUseCase =
+        new RemoveEntitiesFromIntegration({
+            integrationRepository,
+        });
+
     return {
         findIntegrationById,
         listIntegrations,
@@ -307,6 +321,44 @@ 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,6 +164,42 @@ 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,6 +184,36 @@ 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,6 +338,58 @@ 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,6 +365,64 @@ 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/integrations/use-cases/update-integration-entities.js

@@ -0,0 +1,80 @@
+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 };

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