@friggframework/core 2.0.0--canary.689.dadb9f7.0 → 2.0.0--canary.689.e2b05a4.0

package/integrations/use-cases/add-entities-to-integration.js

@@ -1,6 +1,7 @@
 const {
     assertEntityIdsInput,
     integrationNotFound,
+    loadIntegration,
 } = require('../utils/assert-entity-ids-input');
 
 /**
@@ -30,10 +31,10 @@ class AddEntitiesToIntegration {
     async execute(integrationId, entityIds) {
         assertEntityIdsInput(integrationId, entityIds);
 
-        const integration = await this.integrationRepository
-            .findIntegrationById(integrationId)
-            .catch(() => null);
-        if (!integration) throw integrationNotFound(integrationId);
+        const integration = await loadIntegration(
+            this.integrationRepository,
+            integrationId
+        );
 
         const entities = await this.moduleRepository.findEntitiesByIds(
             entityIds

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

@@ -62,7 +62,7 @@ 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._findDuplicate(
+        const survivor = await this._findSurvivor(
             userId,
             config?.type,
             entities
@@ -135,7 +135,7 @@ class CreateIntegration {
         return mapIntegrationClassToIntegrationDTO(integrationInstance);
     }
 
-    async _findDuplicate(userId, type, entityIds) {
+    async _findMatches(userId, type, entityIds) {
         const candidates =
             await this.integrationRepository.findIntegrationsByUserId(userId);
         const target = new Set((entityIds ?? []).map(String));
@@ -163,7 +163,6 @@ class CreateIntegration {
                 [...target].every((id) => current.has(id))
             );
         });
-        if (exact.length) return this._pickOldest(exact);
 
         // Entities may have been attached after create (addEntitiesToIntegration),
         // so a reconnect that sends the original entities must still find the
@@ -173,9 +172,32 @@ class CreateIntegration {
             const current = entitySet(integration);
             return [...target].every((id) => current.has(id));
         });
-        return target.size && supersets.length
-            ? this._pickOldest(supersets)
-            : null;
+        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;
+    }
+
+    // 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;
     }
 
     _pickOldest(records) {

package/integrations/use-cases/remove-entities-from-integration.js

@@ -1,6 +1,7 @@
 const {
     assertEntityIdsInput,
     integrationNotFound,
+    loadIntegration,
 } = require('../utils/assert-entity-ids-input');
 
 /**
@@ -29,10 +30,10 @@ class RemoveEntitiesFromIntegration {
     async execute(integrationId, entityIds) {
         assertEntityIdsInput(integrationId, entityIds);
 
-        const integration = await this.integrationRepository
-            .findIntegrationById(integrationId)
-            .catch(() => null);
-        if (!integration) throw integrationNotFound(integrationId);
+        const integration = await loadIntegration(
+            this.integrationRepository,
+            integrationId
+        );
 
         const removing = new Set(entityIds.map(String));
         const attached = await this.moduleRepository.findEntitiesByIds(

package/integrations/utils/assert-entity-ids-input.js

@@ -20,4 +20,23 @@ function integrationNotFound(integrationId) {
     return error;
 }
 
-module.exports = { assertEntityIdsInput, integrationNotFound };
+/**
+ * Loads an integration, mapping the repositories' "not found" error to
+ * INTEGRATION_NOT_FOUND. Any other failure (connection, invalid id) is
+ * rethrown unchanged.
+ * @param {Object} integrationRepository
+ * @param {string} integrationId
+ * @returns {Promise<Object>} The integration record.
+ */
+async function loadIntegration(integrationRepository, integrationId) {
+    try {
+        return await integrationRepository.findIntegrationById(integrationId);
+    } catch (error) {
+        if (/^Integration with id .* not found$/.test(error?.message)) {
+            throw integrationNotFound(integrationId);
+        }
+        throw error;
+    }
+}
+
+module.exports = { assertEntityIdsInput, integrationNotFound, loadIntegration };

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@friggframework/core",
     "prettier": "@friggframework/prettier-config",
-    "version": "2.0.0--canary.689.dadb9f7.0",
+    "version": "2.0.0--canary.689.e2b05a4.0",
     "dependencies": {
         "@aws-sdk/client-apigatewaymanagementapi": "^3.588.0",
         "@aws-sdk/client-kms": "^3.588.0",
@@ -47,9 +47,9 @@
         }
     },
     "devDependencies": {
-        "@friggframework/eslint-config": "2.0.0--canary.689.dadb9f7.0",
-        "@friggframework/prettier-config": "2.0.0--canary.689.dadb9f7.0",
-        "@friggframework/test": "2.0.0--canary.689.dadb9f7.0",
+        "@friggframework/eslint-config": "2.0.0--canary.689.e2b05a4.0",
+        "@friggframework/prettier-config": "2.0.0--canary.689.e2b05a4.0",
+        "@friggframework/test": "2.0.0--canary.689.e2b05a4.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": "dadb9f7e6217f7530852d5b0ad2d6e1e7d0bb2d7"
+    "gitHead": "e2b05a436ac65f9c98cada9c325ff8ec633fcd8f"
 }