@friggframework/core 2.0.0--canary.679.a2bcc2f.0 → 2.0.0--canary.686.87e9875.0

package/integrations/repositories/integration-not-found.js

@@ -0,0 +1,14 @@
+/**
+ * The error `findIntegrationById` throws for an id with no row, and the one
+ * predicate that recognises it. The adapters build the error here and the
+ * use cases match it here, so the message is written once and a missing
+ * integration can be told from any other failure without widening a regex.
+ */
+const MESSAGE = /^Integration with id .+ not found$/;
+
+const integrationNotFoundError = (id) =>
+    new Error(`Integration with id ${id} not found`);
+
+const isIntegrationNotFound = (error) => MESSAGE.test(error?.message || '');
+
+module.exports = { integrationNotFoundError, isIntegrationNotFound };

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

@@ -14,6 +14,7 @@ const {
     IntegrationRepositoryInterface,
 } = require('./integration-repository-interface');
 const { validateConfigPatch } = require('./config-patch-shared');
+const { integrationNotFoundError } = require('./integration-not-found');
 
 class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
     constructor() {
@@ -28,6 +29,28 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
         return records.map((doc) => this._mapIntegration(doc));
     }
 
+    /**
+     * Find integrations matching any of the owner/organization pairs, in one
+     * query. `organizationId: null` matches rows with no organization (a raw
+     * MongoDB `null` also matches a missing field). The caller (a use case)
+     * decides which pairs; this only runs them.
+     *
+     * @param {Array<{userId: string, organizationId: (string|null)}>} clauses
+     * @returns {Promise<Array>}
+     */
+    async findIntegrationsByOwnership(clauses) {
+        if (!Array.isArray(clauses) || clauses.length === 0) return [];
+        // Drained: a list can hold more than the first cursor batch (~101).
+        const records = await findManyDrained(this.prisma, 'Integration', {
+            $or: clauses.map(({ userId, organizationId }) => ({
+                userId: toObjectId(userId),
+                organizationId:
+                    organizationId === null ? null : toObjectId(organizationId),
+            })),
+        });
+        return records.map((doc) => this._mapIntegration(doc));
+    }
+
     async findIntegrations({ type, status } = {}) {
         const filter = {};
         if (type) {
@@ -68,11 +91,11 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
     async findIntegrationById(id) {
         const objectId = toObjectId(id);
         if (!objectId) {
-            throw new Error(`Integration with id ${id} not found`);
+            throw integrationNotFoundError(id);
         }
         const doc = await findOne(this.prisma, 'Integration', { _id: objectId });
         if (!doc) {
-            throw new Error(`Integration with id ${id} not found`);
+            throw integrationNotFoundError(id);
         }
         return this._mapIntegration(doc);
     }
@@ -132,10 +155,18 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
         return true;
     }
 
-    async createIntegration(entities, userId, config) {
+    /**
+     * @param {Array<string>} entities - entity ids
+     * @param {string} userId - owner (the person, or the organization's user)
+     * @param {Object} config - Integration configuration
+     * @param {{organizationId?: (string|null)}} [tenancy] - the organization the
+     *   integration is created in (ADR-056 §3.6)
+     */
+    async createIntegration(entities, userId, config, tenancy = {}) {
         const now = new Date();
         const document = {
             userId: toObjectId(userId) || null,
+            organizationId: toObjectId(tenancy.organizationId) || null,
             config,
             version: '0.0.0',
             status: 'IN_CREATION',
@@ -298,6 +329,7 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
             id: fromObjectId(doc?._id),
             entitiesIds: (doc?.entityIds || []).map((value) => fromObjectId(value)),
             userId: fromObjectId(doc?.userId),
+            organizationId: fromObjectId(doc?.organizationId) ?? null,
             config: doc?.config ?? null,
             version: doc?.version ?? null,
             status: doc?.status ?? null,

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

@@ -10,6 +10,20 @@
  * @abstract
  */
 class IntegrationRepositoryInterface {
+    /**
+     * Find integrations matching any of the owner/organization pairs, in one
+     * query (ADR-056 §3.6). `organizationId: null` matches rows with no
+     * organization. Which pairs is decided by the caller
+     * (modules/entity-scope.js), not here.
+     *
+     * @param {Array<{userId: string|number, organizationId: (string|number|null)}>} clauses
+     * @returns {Promise<Array>} Array of integration objects
+     * @abstract
+     */
+    async findIntegrationsByOwnership(clauses) {
+        throw new Error('Method findIntegrationsByOwnership must be implemented by subclass');
+    }
+
     /**
      * Find all integrations for a user
      *
@@ -123,10 +137,12 @@ class IntegrationRepositoryInterface {
      * @param {Array<string|number>} entities - Array of entity IDs
      * @param {string|number} userId - User ID
      * @param {Object} config - Integration configuration
+     * @param {{organizationId?: (string|number|null)}} [tenancy] - the organization the
+     *   integration is created in (ADR-056 §3.6)
      * @returns {Promise<Object>} Created integration object
      * @abstract
      */
-    async createIntegration(entities, userId, config) {
+    async createIntegration(entities, userId, config, tenancy) {
         throw new Error('Method createIntegration must be implemented by subclass');
     }
 

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

@@ -1,8 +1,10 @@
 const { prisma } = require('../../database/prisma');
+const { organizationWhere } = require('../../database/organization-where');
 const {
     IntegrationRepositoryInterface,
 } = require('./integration-repository-interface');
 const { validateConfigPatch } = require('./config-patch-shared');
+const { integrationNotFoundError } = require('./integration-not-found');
 
 /**
  * MongoDB Integration Repository Adapter
@@ -25,6 +27,25 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
         this.prisma = prisma;
     }
 
+    /**
+     * The one place a integration integration row becomes the record the
+     * application sees (ids of its entities, its organization).
+     * @private
+     */
+    _mapIntegration(integration) {
+        return {
+            id: integration.id,
+            entitiesIds: integration.entities.map((e) => e.id),
+            userId: integration.userId,
+            organizationId: integration.organizationId ?? null,
+            config: integration.config,
+            version: integration.version,
+            status: integration.status,
+            messages: integration.messages,
+            createdAt: integration.createdAt,
+        };
+    }
+
     /**
      * Find all integrations for a user
      * Replaces: IntegrationModel.find({ user: userId }).populate('entities')
@@ -41,16 +62,32 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
         });
 
         // Map to domain objects (maintains same API)
-        return integrations.map((integration) => ({
-            id: integration.id,
-            entitiesIds: integration.entities.map((e) => e.id),
-            userId: integration.userId,
-            config: integration.config,
-            version: integration.version,
-            status: integration.status,
-            messages: integration.messages,
-            createdAt: integration.createdAt,
-        }));
+        return integrations.map((integration) => (this._mapIntegration(integration)));
+    }
+
+    /**
+     * Find integrations matching any of the owner/organization pairs, in one
+     * query. `organizationId: null` matches rows with no organization. The
+     * caller (a use case) decides which pairs; this only runs them.
+     *
+     * @param {Array<{userId: string, organizationId: (string|null)}>} clauses
+     * @returns {Promise<Array>} Array of integration objects
+     */
+    async findIntegrationsByOwnership(clauses) {
+        if (!Array.isArray(clauses) || clauses.length === 0) return [];
+        const integrations = await this.prisma.integration.findMany({
+            where: {
+                OR: clauses.map(({ userId, organizationId }) => ({
+                    userId,
+                    ...organizationWhere(organizationId),
+                })),
+            },
+            include: {
+                entities: true,
+            },
+        });
+
+        return integrations.map((integration) => (this._mapIntegration(integration)));
     }
 
     /**
@@ -77,16 +114,7 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             },
         });
 
-        return integrations.map((integration) => ({
-            id: integration.id,
-            entitiesIds: integration.entities.map((e) => e.id),
-            userId: integration.userId,
-            config: integration.config,
-            version: integration.version,
-            status: integration.status,
-            messages: integration.messages,
-            createdAt: integration.createdAt,
-        }));
+        return integrations.map((integration) => (this._mapIntegration(integration)));
     }
 
     /**
@@ -165,15 +193,7 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             throw new Error(`Integration with name ${name} not found`);
         }
 
-        return {
-            id: integration.id,
-            entitiesIds: integration.entities.map((e) => e.id),
-            userId: integration.userId,
-            config: integration.config,
-            version: integration.version,
-            status: integration.status,
-            messages: integration.messages,
-        };
+        return this._mapIntegration(integration);
     }
 
     /**
@@ -192,18 +212,10 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
         });
 
         if (!integration) {
-            throw new Error(`Integration with id ${id} not found`);
+            throw integrationNotFoundError(id);
         }
 
-        return {
-            id: integration.id,
-            entitiesIds: integration.entities.map((e) => e.id),
-            userId: integration.userId,
-            config: integration.config,
-            version: integration.version,
-            status: integration.status,
-            messages: integration.messages,
-        };
+        return this._mapIntegration(integration);
     }
 
     /**
@@ -290,15 +302,7 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             },
         });
 
-        return integrations.map((integration) => ({
-            id: integration.id,
-            entitiesIds: integration.entities.map((e) => e.id),
-            userId: integration.userId,
-            config: integration.config,
-            version: integration.version,
-            status: integration.status,
-            messages: integration.messages,
-        }));
+        return integrations.map((integration) => (this._mapIntegration(integration)));
     }
 
     /**
@@ -310,13 +314,16 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
      * @param {Array<string>} entities - Array of entity IDs (MongoDB ObjectIds)
      * @param {string} userId - User ID (MongoDB ObjectId)
      * @param {Object} config - Integration configuration
+     * @param {{organizationId?: (string|null)}} [tenancy] - the organization the
+     *   integration is created in (ADR-056 §3.6)
      * @returns {Promise<Object>} Created integration object
      */
-    async createIntegration(entities, userId, config) {
+    async createIntegration(entities, userId, config, tenancy = {}) {
         const data = {
             config,
             version: '0.0.0',
             userId: userId,
+            organizationId: tenancy.organizationId ?? null,
             entityIds: entities,
         };
 
@@ -327,15 +334,7 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             },
         });
 
-        return {
-            id: integration.id,
-            entitiesIds: integration.entities.map((e) => e.id),
-            userId: integration.userId,
-            config: integration.config,
-            version: integration.version,
-            status: integration.status,
-            messages: integration.messages,
-        };
+        return this._mapIntegration(integration);
     }
 
     /**
@@ -357,15 +356,7 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             return null;
         }
 
-        return {
-            id: integration.id,
-            entitiesIds: integration.entities.map((e) => e.id),
-            userId: integration.userId,
-            config: integration.config,
-            version: integration.version,
-            status: integration.status,
-            messages: integration.messages,
-        };
+        return this._mapIntegration(integration);
     }
 
     /**
@@ -389,15 +380,7 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             },
         });
 
-        return {
-            id: integration.id,
-            entitiesIds: integration.entities.map((e) => e.id),
-            userId: integration.userId,
-            config: integration.config,
-            version: integration.version,
-            status: integration.status,
-            messages: integration.messages,
-        };
+        return this._mapIntegration(integration);
     }
 
     /**

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

@@ -3,6 +3,7 @@ const {
     IntegrationRepositoryInterface,
 } = require('./integration-repository-interface');
 const { validateConfigPatch } = require('./config-patch-shared');
+const { integrationNotFoundError } = require('./integration-not-found');
 const { strictIntId } = require('./report-id');
 
 /**
@@ -51,6 +52,7 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
             ...integration,
             id: integration.id?.toString(),
             userId: integration.userId?.toString(),
+            organizationId: integration.organizationId?.toString() ?? null,
             entities: integration.entities?.map(e => ({
                 ...e,
                 id: e.id?.toString(),
@@ -60,6 +62,25 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         };
     }
 
+    /**
+     * The one place a converted integration row becomes the record the
+     * application sees (string ids, ids of its entities, its organization).
+     * @private
+     */
+    _mapIntegration(converted) {
+        return {
+            id: converted.id,
+            entitiesIds: converted.entities.map((e) => e.id),
+            userId: converted.userId,
+            organizationId: converted.organizationId,
+            config: converted.config,
+            version: converted.version,
+            status: converted.status,
+            messages: converted.messages,
+            createdAt: converted.createdAt,
+        };
+    }
+
     /**
      * Find all integrations for a user
      *
@@ -78,16 +99,35 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         // Map to domain objects with string IDs
         return integrations.map((integration) => {
             const converted = this._convertIntegrationIds(integration);
-            return {
-                id: converted.id,
-                entitiesIds: converted.entities.map((e) => e.id),
-                userId: converted.userId,
-                config: converted.config,
-                version: converted.version,
-                status: converted.status,
-                messages: converted.messages,
-                createdAt: converted.createdAt,
-            };
+            return this._mapIntegration(converted);
+        });
+    }
+
+    /**
+     * Find integrations matching any of the owner/organization pairs, in one
+     * query. `organizationId: null` matches rows with no organization. The
+     * caller (a use case) decides which pairs; this only runs them.
+     *
+     * @param {Array<{userId: string, organizationId: (string|null)}>} clauses
+     * @returns {Promise<Array>} Array of integration objects with string IDs
+     */
+    async findIntegrationsByOwnership(clauses) {
+        if (!Array.isArray(clauses) || clauses.length === 0) return [];
+        const integrations = await this.prisma.integration.findMany({
+            where: {
+                OR: clauses.map(({ userId, organizationId }) => ({
+                    userId: this._convertId(userId),
+                    organizationId: this._convertId(organizationId),
+                })),
+            },
+            include: {
+                entities: true,
+            },
+        });
+
+        return integrations.map((integration) => {
+            const converted = this._convertIntegrationIds(integration);
+            return this._mapIntegration(converted);
         });
     }
 
@@ -117,16 +157,7 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
 
         return integrations.map((integration) => {
             const converted = this._convertIntegrationIds(integration);
-            return {
-                id: converted.id,
-                entitiesIds: converted.entities.map((e) => e.id),
-                userId: converted.userId,
-                config: converted.config,
-                version: converted.version,
-                status: converted.status,
-                messages: converted.messages,
-                createdAt: converted.createdAt,
-            };
+            return this._mapIntegration(converted);
         });
     }
 
@@ -209,15 +240,7 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         }
 
         const converted = this._convertIntegrationIds(integration);
-        return {
-            id: converted.id,
-            entitiesIds: converted.entities.map((e) => e.id),
-            userId: converted.userId,
-            config: converted.config,
-            version: converted.version,
-            status: converted.status,
-            messages: converted.messages,
-        };
+        return this._mapIntegration(converted);
     }
 
     /**
@@ -236,19 +259,11 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         });
 
         if (!integration) {
-            throw new Error(`Integration with id ${id} not found`);
+            throw integrationNotFoundError(id);
         }
 
         const converted = this._convertIntegrationIds(integration);
-        return {
-            id: converted.id,
-            entitiesIds: converted.entities.map((e) => e.id),
-            userId: converted.userId,
-            config: converted.config,
-            version: converted.version,
-            status: converted.status,
-            messages: converted.messages,
-        };
+        return this._mapIntegration(converted);
     }
 
     /**
@@ -328,12 +343,15 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
      * @param {Array<string>} entities - Array of entity IDs (strings from application layer)
      * @param {string} userId - User ID (string from application layer)
      * @param {Object} config - Integration configuration
+     * @param {{organizationId?: (string|null)}} [tenancy] - the organization the
+     *   integration is created in (ADR-056 §3.6)
      * @returns {Promise<Object>} Created integration object with string IDs
      */
-    async createIntegration(entities, userId, config) {
+    async createIntegration(entities, userId, config, tenancy = {}) {
         const data = {
             config,
             version: '0.0.0',
+            organizationId: this._convertId(tenancy.organizationId ?? null),
         };
 
         // PostgreSQL: use nested relations with ID conversion
@@ -354,15 +372,7 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         });
 
         const converted = this._convertIntegrationIds(integration);
-        return {
-            id: converted.id,
-            entitiesIds: converted.entities.map((e) => e.id),
-            userId: converted.userId,
-            config: converted.config,
-            version: converted.version,
-            status: converted.status,
-            messages: converted.messages,
-        };
+        return this._mapIntegration(converted);
     }
 
     /**
@@ -385,15 +395,7 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         }
 
         const converted = this._convertIntegrationIds(integration);
-        return {
-            id: converted.id,
-            entitiesIds: converted.entities.map((e) => e.id),
-            userId: converted.userId,
-            config: converted.config,
-            version: converted.version,
-            status: converted.status,
-            messages: converted.messages,
-        };
+        return this._mapIntegration(converted);
     }
 
     /**
@@ -418,15 +420,7 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         });
 
         const converted = this._convertIntegrationIds(integration);
-        return {
-            id: converted.id,
-            entitiesIds: converted.entities.map((e) => e.id),
-            userId: converted.userId,
-            config: converted.config,
-            version: converted.version,
-            status: converted.status,
-            messages: converted.messages,
-        };
+        return this._mapIntegration(converted);
     }
 
     /**
@@ -476,15 +470,7 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
 
         return integrations.map((integration) => {
             const converted = this._convertIntegrationIds(integration);
-            return {
-                id: converted.id,
-                entitiesIds: converted.entities.map((e) => e.id),
-                userId: converted.userId,
-                config: converted.config,
-                version: converted.version,
-                status: converted.status,
-                messages: converted.messages,
-            };
+            return this._mapIntegration(converted);
         });
     }
 }

package/integrations/tests/doubles/test-integration-repository.js

@@ -1,5 +1,6 @@
 const { v4: uuid } = require('uuid');
 const { validateConfigPatch } = require('../../repositories/config-patch-shared');
+const { matchesAnyClause } = require('../../../modules/tests/doubles/ownership-matching');
 
 class TestIntegrationRepository {
     constructor() {
@@ -7,13 +8,14 @@ class TestIntegrationRepository {
         this.operationHistory = [];
     }
 
-    async createIntegration(entities, userId, config) {
+    async createIntegration(entities, userId, config, tenancy = {}) {
         const id = uuid();
         const record = {
             id,
             _id: id,
             entitiesIds: entities,
             userId: userId,
+            organizationId: tenancy.organizationId ?? null,
             config,
             version: '0.0.0',
             status: 'IN_CREATION',
@@ -38,6 +40,15 @@ class TestIntegrationRepository {
         return results;
     }
 
+    // Answers the way a database does for the clauses a use case hands it.
+    async findIntegrationsByOwnership(clauses) {
+        const results = Array.from(this.store.values()).filter((r) =>
+            matchesAnyClause(r, clauses)
+        );
+        this.operationHistory.push({ operation: 'findByOwnership', clauses, count: results.length });
+        return results;
+    }
+
     async findIntegrations(filter = {}) {
         const { type, status } = filter;
         const results = Array.from(this.store.values()).filter((r) => {