@friggframework/core 2.0.0--canary.690.08cd07e.0 → 2.0.0--canary.694.f66a64a.0

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

@@ -1,4 +1,5 @@
 const { prisma } = require('../../database/prisma');
+const { MappingAlreadyExistsError } = require('../../errors');
 const {
     IntegrationMappingRepositoryInterface,
 } = require('./integration-mapping-repository-interface');
@@ -69,6 +70,34 @@ class IntegrationMappingRepository extends IntegrationMappingRepositoryInterface
         });
     }
 
+    /**
+     * Insert a mapping; fails if (integrationId, sourceId) already exists
+     *
+     * @param {string} integrationId - The integration ID
+     * @param {string} sourceId - The source ID
+     * @param {Object} mapping - The mapping data
+     * @returns {Promise<Object>} The created mapping document
+     * @throws {MappingAlreadyExistsError} If the pair already exists
+     */
+    async createMapping(integrationId, sourceId, mapping) {
+        try {
+            return await this.prisma.integrationMapping.create({
+                data: {
+                    integrationId,
+                    sourceId,
+                    mapping,
+                },
+            });
+        } catch (error) {
+            if (error.code === 'P2002') {
+                throw new MappingAlreadyExistsError(integrationId, sourceId, {
+                    cause: error,
+                });
+            }
+            throw error;
+        }
+    }
+
     /**
      * Find all mappings for an integration
      * Replaces: IntegrationMapping.find({ integration: integrationId })

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

@@ -14,7 +14,6 @@ const {
     IntegrationRepositoryInterface,
 } = require('./integration-repository-interface');
 const { validateConfigPatch } = require('./config-patch-shared');
-const { integrationNotFoundError } = require('./integration-not-found');
 
 class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
     constructor() {
@@ -29,29 +28,7 @@ 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 } = {}) {
+    async findIntegrations({ type, status, limit, after } = {}) {
         const filter = {};
         if (type) {
             filter['config.type'] = type;
@@ -59,7 +36,11 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
         if (status) {
             filter.status = status;
         }
-        const records = await findMany(this.prisma, 'Integration', filter);
+        if (limit && after !== undefined && after !== null) {
+            // Extended JSON: $runCommandRaw does not match a BSON ObjectId instance inside an operator.
+            filter._id = { $gt: { $oid: fromObjectId(toObjectId(after)) } };
+        }
+        const records = await findMany(this.prisma, 'Integration', filter, limit ? { sort: { _id: 1 }, limit, batchSize: limit } : {});
         return records.map((doc) => this._mapIntegration(doc));
     }
 
@@ -91,11 +72,11 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
     async findIntegrationById(id) {
         const objectId = toObjectId(id);
         if (!objectId) {
-            throw integrationNotFoundError(id);
+            throw new Error(`Integration with id ${id} not found`);
         }
         const doc = await findOne(this.prisma, 'Integration', { _id: objectId });
         if (!doc) {
-            throw integrationNotFoundError(id);
+            throw new Error(`Integration with id ${id} not found`);
         }
         return this._mapIntegration(doc);
     }
@@ -155,18 +136,10 @@ class IntegrationRepositoryDocumentDB extends IntegrationRepositoryInterface {
         return true;
     }
 
-    /**
-     * @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 = {}) {
+    async createIntegration(entities, userId, config) {
         const now = new Date();
         const document = {
             userId: toObjectId(userId) || null,
-            organizationId: toObjectId(tenancy.organizationId) || null,
             config,
             version: '0.0.0',
             status: 'IN_CREATION',
@@ -329,7 +302,6 @@ 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,20 +10,6 @@
  * @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
      *
@@ -42,6 +28,9 @@ class IntegrationRepositoryInterface {
      * @param {Object} [filter={}]
      * @param {string} [filter.type] - Integration type (config.type)
      * @param {string} [filter.status] - Integration status
+     * @param {number} [filter.limit] - Page size: at most this many rows, in id order
+     * @param {string|number} [filter.after] - With limit: only rows whose id sorts after this one (the last id of the
+     *   previous page), so a caller can page through every row (the trigger tick does, ADR-055)
      * @returns {Promise<Array>} Array of integration objects (possibly empty)
      * @abstract
      */
@@ -137,12 +126,10 @@ 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, tenancy) {
+    async createIntegration(entities, userId, config) {
         throw new Error('Method createIntegration must be implemented by subclass');
     }
 

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

@@ -1,10 +1,8 @@
 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
@@ -27,25 +25,6 @@ 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')
@@ -62,32 +41,16 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
         });
 
         // Map to domain objects (maintains same API)
-        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)));
+        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,
+        }));
     }
 
     /**
@@ -98,23 +61,47 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
      * @param {string} [filter.status] - Integration status
      * @returns {Promise<Array>} Array of integration objects (possibly empty)
      */
-    async findIntegrations({ type, status } = {}) {
+    async findIntegrations({ type, status, limit, after } = {}) {
         const where = {};
-        if (type) {
-            where.config = { path: ['type'], equals: type };
-        }
         if (status) {
             where.status = status;
         }
+        if (limit && after !== undefined && after !== null) {
+            where.id = { gt: after };
+        }
+        if (type) {
+            // Prisma's MongoDB connector has no JSON path filter (`config: { path }` is refused), so the ids of the
+            // matching rows come from a raw find on config.type, then the rows load as usual.
+            const filter = { 'config.type': type };
+            if (status) filter.status = status;
+            if (where.id) filter._id = { $gt: { $oid: String(after) } };
+            const found = await this.prisma.integration.findRaw({
+                filter,
+                options: { projection: { _id: 1 }, sort: { _id: 1 }, ...(limit ? { limit } : {}) },
+            });
+            const ids = found.map((doc) => doc._id?.$oid ?? String(doc._id));
+            if (!ids.length) return [];
+            where.id = { in: ids };
+        }
 
         const integrations = await this.prisma.integration.findMany({
             where,
             include: {
                 entities: true,
             },
+            ...(limit ? { orderBy: { id: 'asc' }, take: limit } : {}),
         });
 
-        return integrations.map((integration) => (this._mapIntegration(integration)));
+        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,
+        }));
     }
 
     /**
@@ -193,7 +180,15 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             throw new Error(`Integration with name ${name} not found`);
         }
 
-        return this._mapIntegration(integration);
+        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,
+        };
     }
 
     /**
@@ -212,10 +207,18 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
         });
 
         if (!integration) {
-            throw integrationNotFoundError(id);
+            throw new Error(`Integration with id ${id} not found`);
         }
 
-        return this._mapIntegration(integration);
+        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,
+        };
     }
 
     /**
@@ -302,7 +305,15 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             },
         });
 
-        return integrations.map((integration) => (this._mapIntegration(integration)));
+        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,
+        }));
     }
 
     /**
@@ -314,16 +325,13 @@ 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, tenancy = {}) {
+    async createIntegration(entities, userId, config) {
         const data = {
             config,
             version: '0.0.0',
             userId: userId,
-            organizationId: tenancy.organizationId ?? null,
             entityIds: entities,
         };
 
@@ -334,7 +342,15 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             },
         });
 
-        return this._mapIntegration(integration);
+        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,
+        };
     }
 
     /**
@@ -356,7 +372,15 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             return null;
         }
 
-        return this._mapIntegration(integration);
+        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,
+        };
     }
 
     /**
@@ -380,7 +404,15 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
             },
         });
 
-        return this._mapIntegration(integration);
+        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,
+        };
     }
 
     /**
@@ -402,7 +434,7 @@ class IntegrationRepositoryMongo extends IntegrationRepositoryInterface {
         for (const [key, value] of Object.entries(patch)) {
             $set[`config.${key}`] = value;
         }
-        $set.updatedAt = new Date();
+        $set.updatedAt = { $date: new Date().toISOString() };
 
         const result = await this.prisma.$runCommandRaw({
             findAndModify: 'Integration',

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

@@ -3,7 +3,6 @@ const {
     IntegrationRepositoryInterface,
 } = require('./integration-repository-interface');
 const { validateConfigPatch } = require('./config-patch-shared');
-const { integrationNotFoundError } = require('./integration-not-found');
 const { strictIntId } = require('./report-id');
 
 /**
@@ -52,7 +51,6 @@ 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(),
@@ -62,25 +60,6 @@ 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
      *
@@ -99,35 +78,16 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         // Map to domain objects with string IDs
         return integrations.map((integration) => {
             const converted = this._convertIntegrationIds(integration);
-            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);
+            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,
+            };
         });
     }
 
@@ -139,7 +99,7 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
      * @param {string} [filter.status] - Integration status
      * @returns {Promise<Array>} Array of integration objects (possibly empty)
      */
-    async findIntegrations({ type, status } = {}) {
+    async findIntegrations({ type, status, limit, after } = {}) {
         const where = {};
         if (type) {
             where.config = { path: ['type'], equals: type };
@@ -147,17 +107,30 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         if (status) {
             where.status = status;
         }
+        if (limit && after !== undefined && after !== null) {
+            where.id = { gt: this._convertId(after) };
+        }
 
         const integrations = await this.prisma.integration.findMany({
             where,
             include: {
                 entities: true,
             },
+            ...(limit ? { orderBy: { id: 'asc' }, take: limit } : {}),
         });
 
         return integrations.map((integration) => {
             const converted = this._convertIntegrationIds(integration);
-            return this._mapIntegration(converted);
+            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,
+            };
         });
     }
 
@@ -240,7 +213,15 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         }
 
         const converted = this._convertIntegrationIds(integration);
-        return this._mapIntegration(converted);
+        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,
+        };
     }
 
     /**
@@ -259,11 +240,19 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         });
 
         if (!integration) {
-            throw integrationNotFoundError(id);
+            throw new Error(`Integration with id ${id} not found`);
         }
 
         const converted = this._convertIntegrationIds(integration);
-        return this._mapIntegration(converted);
+        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,
+        };
     }
 
     /**
@@ -343,15 +332,12 @@ 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, tenancy = {}) {
+    async createIntegration(entities, userId, config) {
         const data = {
             config,
             version: '0.0.0',
-            organizationId: this._convertId(tenancy.organizationId ?? null),
         };
 
         // PostgreSQL: use nested relations with ID conversion
@@ -372,7 +358,15 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         });
 
         const converted = this._convertIntegrationIds(integration);
-        return this._mapIntegration(converted);
+        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,
+        };
     }
 
     /**
@@ -395,7 +389,15 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         }
 
         const converted = this._convertIntegrationIds(integration);
-        return this._mapIntegration(converted);
+        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,
+        };
     }
 
     /**
@@ -420,7 +422,15 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
         });
 
         const converted = this._convertIntegrationIds(integration);
-        return this._mapIntegration(converted);
+        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,
+        };
     }
 
     /**
@@ -470,7 +480,15 @@ class IntegrationRepositoryPostgres extends IntegrationRepositoryInterface {
 
         return integrations.map((integration) => {
             const converted = this._convertIntegrationIds(integration);
-            return this._mapIntegration(converted);
+            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,
+            };
         });
     }
 }