@friggframework/core 2.0.0--canary.704.79d9a63.0 → 2.0.0--canary.686.e94de4d.0

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,73 +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,
-        };
-    }
-
-    /**
-     * 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);
-
-        try {
-            await this.prisma.integration.update({
-                where: { id: intId },
-                data: {
-                    entities: {
-                        connect: entityIds.map((id) => ({
-                            id: this._convertId(id),
-                        })),
-                    },
-                },
-            });
-        } catch (error) {
-            if (error.code === 'P2025') return null;
-            throw error;
-        }
-        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);
-
-        try {
-            await this.prisma.integration.update({
-                where: { id: intId },
-                data: {
-                    entities: {
-                        disconnect: entityIds.map((id) => ({
-                            id: this._convertId(id),
-                        })),
-                    },
-                },
-            });
-        } catch (error) {
-            if (error.code === 'P2025') return null;
-            throw error;
-        }
-        return this.findIntegrationById(integrationId);
+        return this._mapIntegration(converted);
     }
 
     /**
@@ -443,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);
     }
 
     /**
@@ -476,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);
     }
 
     /**
@@ -534,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/repositories/process-repository-mongo.js

@@ -120,7 +120,7 @@ class ProcessRepositoryMongo extends ProcessRepositoryInterface {
         if (normalized.newState !== null) {
             $set.state = normalized.newState;
         }
-        $set.updatedAt = { $date: new Date().toISOString() };
+        $set.updatedAt = new Date();
         update.$set = $set;
 
         if (Object.keys(normalized.pushSlice).length > 0) {

package/integrations/schedule-config.js

@@ -0,0 +1,80 @@
+/**
+ * An integration's schedule configuration (`static Definition.schedule`),
+ * read by hosts that tick ONGOING_SYNC from a cron (provider-netlify's
+ * scheduled-sync function).
+ *
+ *   schedule: {
+ *       // 'class' (default): one ONGOING_SYNC per integration class per tick,
+ *       //   with no integration id: the worker runs it on an unhydrated
+ *       //   instance, so the handler finds its own installations.
+ *       // 'installation': one ONGOING_SYNC per ENABLED integration record of
+ *       //   the class, carrying `data.integrationId`, so the worker hydrates
+ *       //   that installation before the handler runs.
+ *       scope: 'installation',
+ *       // Optional, 'installation' only: (integration, { now }) => boolean |
+ *       // Promise<boolean>. Return false to skip that installation this tick.
+ *       // Without it every installation is dispatched on every tick.
+ *       isDue: (integration, { now }) => true,
+ *   }
+ *
+ * Validated at load (loadAppDefinition) so a mistyped scope stops the app
+ * rather than silently falling back to 'class'.
+ */
+
+const SCHEDULE_SCOPES = Object.freeze({
+    CLASS: 'class',
+    INSTALLATION: 'installation',
+});
+
+const DEFAULT_SCHEDULE_SCOPE = SCHEDULE_SCOPES.CLASS;
+
+class ScheduleConfigError extends Error {
+    constructor(message) {
+        super(message);
+        this.name = 'ScheduleConfigError';
+        this.code = 'SCHEDULE_CONFIG_INVALID';
+    }
+}
+
+/**
+ * @param {Object} [definition] - an integration's static Definition
+ * @returns {{ scope: 'class'|'installation', isDue: Function|null }}
+ * @throws {ScheduleConfigError} when `schedule` is malformed
+ */
+function resolveScheduleConfig(definition) {
+    const name = definition?.name || 'integration';
+    const schedule = definition?.schedule;
+    if (schedule === undefined || schedule === null) {
+        return { scope: DEFAULT_SCHEDULE_SCOPE, isDue: null };
+    }
+    if (typeof schedule !== 'object' || Array.isArray(schedule)) {
+        throw new ScheduleConfigError(`${name}: Definition.schedule must be an object`);
+    }
+
+    const scopes = Object.values(SCHEDULE_SCOPES);
+    const scope = schedule.scope === undefined ? DEFAULT_SCHEDULE_SCOPE : schedule.scope;
+    if (!scopes.includes(scope)) {
+        throw new ScheduleConfigError(
+            `${name}: Definition.schedule.scope must be one of ${scopes.map((s) => `'${s}'`).join(', ')} (got ${JSON.stringify(schedule.scope)})`
+        );
+    }
+
+    const isDue = schedule.isDue === undefined ? null : schedule.isDue;
+    if (isDue !== null && typeof isDue !== 'function') {
+        throw new ScheduleConfigError(`${name}: Definition.schedule.isDue must be a function`);
+    }
+    if (isDue && scope !== SCHEDULE_SCOPES.INSTALLATION) {
+        throw new ScheduleConfigError(
+            `${name}: Definition.schedule.isDue applies to scope 'installation' only`
+        );
+    }
+
+    return { scope, isDue };
+}
+
+module.exports = {
+    SCHEDULE_SCOPES,
+    DEFAULT_SCHEDULE_SCOPE,
+    ScheduleConfigError,
+    resolveScheduleConfig,
+};

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) => {

package/integrations/use-cases/create-integration.js

@@ -27,13 +27,19 @@ class CreateIntegration {
      * and entity set, instead of creating a duplicate.
      * @async
      * @param {string[]} entities - Array of entity IDs to associate with the integration.
-     * @param {string} userId - ID of the user creating the integration.
+     * @param {string} userId - ID of the OWNER of the integration (ADR-056 §3):
+     *   the person or the organization's user, as ResolveIntegrationOwnership decided.
      * @param {Object} config - Configuration object for the integration.
      * @param {string} config.type - Type of integration to create.
+     * @param {{organizationId?: (string|null), adoptUnscoped?: boolean}} [tenancy]
+     *   the organization it is created in (§3.6). A duplicate is only reused in
+     *   the same organization, so one person's integration in organization A is
+     *   not handed back as the one they asked for in B. `adoptUnscoped` also
+     *   accepts a duplicate written before scoping (no organization).
      * @returns {Promise<Object>} The created or reused integration DTO.
      * @throws {Error} When integration class is not found for the specified type.
      */
-    async execute(entities, userId, config) {
+    async execute(entities, userId, config, tenancy = {}) {
         console.log(
             `[Frigg] Creating ${config?.type} integration for user ${userId} with entities [${entities}]`
         );
@@ -41,7 +47,8 @@ class CreateIntegration {
         const existing = await this._findDuplicate(
             userId,
             config?.type,
-            entities
+            entities,
+            tenancy
         );
         if (existing) {
             console.log(
@@ -50,11 +57,18 @@ class CreateIntegration {
             return this._reuseExisting(existing, config);
         }
 
+        // Everything that can be refused is refused before a row is written: an
+        // unknown type, or an entity the owner cannot load, would otherwise
+        // leave an IN_CREATION integration behind that nothing moves on.
+        const integrationClass = this._requireClass(config?.type);
+        const modules = await this._loadModules(entities, userId);
+
         const integrationRecord =
             await this.integrationRepository.createIntegration(
                 entities,
                 userId,
-                config
+                config,
+                { organizationId: tenancy.organizationId ?? null }
             );
         console.log(
             `[Frigg] Created integration ${integrationRecord.id} for user ${userId}`
@@ -62,10 +76,11 @@ class CreateIntegration {
 
         // A concurrent request may have created a matching row between the
         // lookup above and this insert; re-check before any side effects run.
-        const survivor = await this._findSurvivor(
+        const survivor = await this._findDuplicate(
             userId,
             config?.type,
-            entities
+            entities,
+            tenancy
         );
         if (survivor && String(survivor.id) !== String(integrationRecord.id)) {
             console.log(
@@ -78,7 +93,8 @@ class CreateIntegration {
         }
 
         const integrationInstance = await this._buildInstance(
-            integrationRecord
+            integrationRecord,
+            { integrationClass, modules }
         );
         console.log(
             `[Frigg] Sending ON_CREATE for integration ${integrationRecord.id}`
@@ -135,69 +151,41 @@ class CreateIntegration {
         return mapIntegrationClassToIntegrationDTO(integrationInstance);
     }
 
-    async _findMatches(userId, type, entityIds) {
+    async _findDuplicate(userId, type, entityIds, tenancy = {}) {
         const candidates =
             await this.integrationRepository.findIntegrationsByUserId(userId);
-        const target = new Set((entityIds ?? []).map(String));
-
-        const live = candidates.filter(
-            (integration) =>
-                // An IN_DELETION row is either mid-teardown or a zombie left
-                // behind by a failed deleteIntegrationById call — never a live
-                // integration. Treating it as a duplicate would hand a
-                // reinstall attempt a row nothing will ever move out of
-                // IN_DELETION, silently discarded by the queue worker forever.
-                // Let a fresh create proceed instead; the zombie is cleaned up
-                // out-of-band, matching how teardown failures are already
-                // handled here.
-                integration.status !== 'IN_DELETION' &&
-                integration.config?.type === type
-        );
-        const entitySet = (integration) =>
-            new Set((integration.entitiesIds ?? []).map(String));
-
-        const exact = live.filter((integration) => {
-            const current = entitySet(integration);
+        const target = [...(entityIds ?? [])].map(String).sort();
+
+        const matches = candidates.filter((integration) => {
+            // An IN_DELETION row is either mid-teardown or a zombie left
+            // behind by a failed deleteIntegrationById call — never a live
+            // integration. Treating it as a duplicate would hand a reinstall
+            // attempt a row nothing will ever move out of IN_DELETION,
+            // silently discarded by the queue worker forever. Let a fresh
+            // create proceed instead; the zombie is cleaned up out-of-band,
+            // matching how teardown failures are already handled here.
+            if (integration.status === 'IN_DELETION') return false;
+            if (integration.config?.type !== type) return false;
+            if (!this._sameOrganization(integration, tenancy)) return false;
+            const current = [...(integration.entitiesIds ?? [])]
+                .map(String)
+                .sort();
             return (
-                current.size === target.size &&
-                [...target].every((id) => current.has(id))
+                current.length === target.length &&
+                current.every((id, index) => id === target[index])
             );
         });
 
-        // Entities may have been attached after create (addEntitiesToIntegration),
-        // so a reconnect that sends the original entities must still find the
-        // integration that now holds them, instead of creating a second one
-        // that would share those entities.
-        const supersets = live.filter((integration) => {
-            const current = entitySet(integration);
-            return [...target].every((id) => current.has(id));
-        });
-        return { exact, supersets: target.size ? supersets : [] };
-    }
-
-    async _findDuplicate(userId, type, entityIds) {
-        const { exact, supersets } = await this._findMatches(
-            userId,
-            type,
-            entityIds
-        );
-        if (exact.length) return this._pickOldest(exact);
-        return supersets.length ? this._pickOldest(supersets) : null;
+        return matches.length ? this._pickOldest(matches) : null;
     }
 
-    // After an insert the new row is itself an exact match, so the survivor
-    // is the oldest of every exact or superset match (the new row included):
-    // an older integration that already holds these entities always wins.
-    async _findSurvivor(userId, type, entityIds) {
-        const { exact, supersets } = await this._findMatches(
-            userId,
-            type,
-            entityIds
-        );
-        // supersets includes the exact matches; it is empty only for an
-        // empty entity set, where exact matching alone applies.
-        const matches = supersets.length ? supersets : exact;
-        return matches.length ? this._pickOldest(matches) : null;
+    /** Same organization, or a row from before scoping that belongs here. */
+    _sameOrganization(integration, tenancy) {
+        const wanted = tenancy.organizationId ?? null;
+        const has = integration.organizationId ?? null;
+        if (wanted === null && has === null) return true;
+        if (wanted !== null && has !== null) return String(wanted) === String(has);
+        return has === null && tenancy.adoptUnscoped === true;
     }
 
     _pickOldest(records) {
@@ -211,27 +199,36 @@ class CreateIntegration {
         })[0];
     }
 
-    async _buildInstance(integrationRecord) {
+    _requireClass(type) {
         const integrationClass = this.integrationClasses.find(
-            (integrationClass) =>
-                integrationClass.Definition.name ===
-                integrationRecord.config.type
+            (integrationClass) => integrationClass.Definition.name === type
         );
-
         if (!integrationClass) {
-            throw new Error(
-                `No integration class found for type: ${integrationRecord.config.type}`
-            );
+            throw new Error(`No integration class found for type: ${type}`);
         }
+        return integrationClass;
+    }
 
+    async _loadModules(entityIds, userId) {
         const modules = [];
-        for (const entityId of integrationRecord.entitiesIds) {
-            const moduleInstance = await this.moduleFactory.getModuleInstance(
-                entityId,
-                integrationRecord.userId
+        for (const entityId of entityIds) {
+            modules.push(
+                await this.moduleFactory.getModuleInstance(entityId, userId)
             );
-            modules.push(moduleInstance);
         }
+        return modules;
+    }
+
+    async _buildInstance(integrationRecord, preloaded) {
+        const integrationClass =
+            preloaded?.integrationClass ??
+            this._requireClass(integrationRecord.config.type);
+        const modules =
+            preloaded?.modules ??
+            (await this._loadModules(
+                integrationRecord.entitiesIds,
+                integrationRecord.userId
+            ));
 
         const integrationInstance = new integrationClass({
             id: integrationRecord.id,