@friggframework/core 2.0.0--canary.463.e30794c.0 → 2.0.0--canary.464.f9d3fc0.0

package/handlers/backend-utils.js

@@ -19,7 +19,6 @@ const {
 const {
     getModulesDefinitionFromIntegrationClasses,
 } = require('../integrations/utils/map-integration-dto');
-const { loadAppDefinition } = require('./app-definition-loader');
 
 const loadRouterFromObject = (IntegrationClass, routerObject) => {
     const router = Router();
@@ -51,29 +50,37 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
 };
 
 const initializeRepositories = () => {
-    return {
-        processRepository: createProcessRepository(),
-        integrationRepository: createIntegrationRepository(),
-        moduleRepository: createModuleRepository(),
-    };
+    const processRepository = createProcessRepository();
+    const integrationRepository = createIntegrationRepository();
+    const moduleRepository = createModuleRepository();
+
+    return { processRepository, integrationRepository, moduleRepository };
+};
+
+const createModuleFactoryWithDefinitions = (
+    moduleRepository,
+    integrationClasses
+) => {
+    const moduleDefinitions =
+        getModulesDefinitionFromIntegrationClasses(integrationClasses);
+
+    return new ModuleFactory({
+        moduleRepository,
+        moduleDefinitions,
+    });
 };
 
-/**
- * Load hydrated integration instance for webhook events WITH integrationId.
- * Must load app definition to find all integration classes, then match
- * against the integration record's type.
- */
 const loadIntegrationForWebhook = async (integrationId) => {
+    const { loadAppDefinition } = require('./app-definition-loader');
     const { integrations: integrationClasses } = loadAppDefinition();
-    const { integrationRepository, moduleRepository } = initializeRepositories();
 
-    const moduleDefinitions = getModulesDefinitionFromIntegrationClasses(
+    const { integrationRepository, moduleRepository } =
+        initializeRepositories();
+
+    const moduleFactory = createModuleFactoryWithDefinitions(
+        moduleRepository,
         integrationClasses
     );
-    const moduleFactory = new ModuleFactory({
-        moduleRepository,
-        moduleDefinitions,
-    });
 
     const getIntegrationInstance = new GetIntegrationInstance({
         integrationRepository,
@@ -85,42 +92,19 @@ const loadIntegrationForWebhook = async (integrationId) => {
         integrationId
     );
 
-    if (!integrationRecord) {
-        throw new Error(
-            `No integration found by the ID of ${integrationId}`
-        );
-    }
-
     return await getIntegrationInstance.execute(
         integrationId,
         integrationRecord.userId
     );
 };
 
-/**
- * Load hydrated integration instance for process-based events.
- * Integration class is already known from queue worker context,
- * so we receive it as a parameter rather than loading all classes.
- */
 const loadIntegrationForProcess = async (processId, integrationClass) => {
-    if (!integrationClass) {
-        throw new Error('integrationClass parameter is required');
-    }
-
-    if (!processId) {
-        throw new Error('processId is required in queue message data');
-    }
-
     const { processRepository, integrationRepository, moduleRepository } =
         initializeRepositories();
 
-    const moduleDefinitions = getModulesDefinitionFromIntegrationClasses([
+    const moduleFactory = createModuleFactoryWithDefinitions(moduleRepository, [
         integrationClass,
     ]);
-    const moduleFactory = new ModuleFactory({
-        moduleRepository,
-        moduleDefinitions,
-    });
 
     const getIntegrationInstance = new GetIntegrationInstance({
         integrationRepository,
@@ -128,6 +112,10 @@ const loadIntegrationForProcess = async (processId, integrationClass) => {
         moduleFactory,
     });
 
+    if (!processId) {
+        throw new Error('processId is required in queue message data');
+    }
+
     const process = await processRepository.findById(processId);
 
     if (!process) {

package/handlers/routers/integration-webhook-routers.js

@@ -20,7 +20,7 @@ for (const IntegrationClass of integrationClasses) {
     console.log(`\n│ Configuring webhook routes for ${IntegrationClass.Definition.name}:`);
 
     // General webhook route (no integration ID)
-    router.post('/', async (req, res, next) => {
+    router.post(basePath, async (req, res, next) => {
         try {
             const integrationInstance = new IntegrationClass();
             const dispatcher = new IntegrationEventDispatcher(integrationInstance);
@@ -37,7 +37,7 @@ for (const IntegrationClass of integrationClasses) {
     console.log(`│ POST ${basePath}`);
 
     // Integration-specific webhook route (with integration ID)
-    router.post('/:integrationId', async (req, res, next) => {
+    router.post(`${basePath}/:integrationId`, async (req, res, next) => {
         try {
             const integrationInstance = new IntegrationClass();
             const dispatcher = new IntegrationEventDispatcher(integrationInstance);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@friggframework/core",
   "prettier": "@friggframework/prettier-config",
-  "version": "2.0.0--canary.463.e30794c.0",
+  "version": "2.0.0--canary.464.f9d3fc0.0",
   "dependencies": {
     "@hapi/boom": "^10.0.1",
     "@prisma/client": "^6.16.3",
@@ -23,9 +23,9 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@friggframework/eslint-config": "2.0.0--canary.463.e30794c.0",
-    "@friggframework/prettier-config": "2.0.0--canary.463.e30794c.0",
-    "@friggframework/test": "2.0.0--canary.463.e30794c.0",
+    "@friggframework/eslint-config": "2.0.0--canary.464.f9d3fc0.0",
+    "@friggframework/prettier-config": "2.0.0--canary.464.f9d3fc0.0",
+    "@friggframework/test": "2.0.0--canary.464.f9d3fc0.0",
     "@types/lodash": "4.17.15",
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "chai": "^4.3.6",
@@ -64,5 +64,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e30794cb481bbedf7cf57ef3356ae276e2988320"
+  "gitHead": "f9d3fc0e7c7135c87a6b6b1befc7d7912966f86a"
 }