@friggframework/core 2.0.0--canary.396.0dd37aa.0 → 2.0.0--canary.397.216d54b.0

package/handlers/backend-utils.js

@@ -1,5 +1,9 @@
 const { Router } = require('express');
 const { Worker } = require('@friggframework/core');
+const { loadAppDefinition } = require('./app-definition-loader');
+const { IntegrationRepository } = require('../integrations/integration-repository');
+const { ModuleService } = require('../module-plugin/module-service');
+const { GetIntegrationInstance } = require('../integrations/use-cases/get-integration-instance');
 
 const loadRouterFromObject = (IntegrationClass, routerObject) => {
     const router = Router();
@@ -23,29 +27,37 @@ const loadRouterFromObject = (IntegrationClass, routerObject) => {
 };
 
 //todo: this should be in a use case class
-const createQueueWorker = (integrationClass, integrationFactory) => {
+const createQueueWorker = (integrationClass) => {
     class QueueWorker extends Worker {
         async _run(params, context) {
             try {
-                let instance;
+                let integrationInstance;
                 if (!params.integrationId) {
-                    instance = new integrationClass();
-                    await instance.loadModules();
-                    // await instance.loadUserActions();
-                    await instance.registerEventHandlers();
+                    integrationInstance = new integrationClass();
+                    await integrationInstance.loadModules();
+                    await integrationInstance.registerEventHandlers();
                     console.log(
                         `${params.event} for ${integrationClass.Definition.name} integration with no integrationId`
                     );
                 } else {
-                    instance =
-                        await integrationFactory.getInstanceFromIntegrationId({
-                            integrationId: params.integrationId,
-                        });
+                    const { integrations: integrationClasses } = loadAppDefinition();
+                    const integrationRepository = new IntegrationRepository();
+                    const moduleService = new ModuleService();
+
+                    const getIntegrationInstance = new GetIntegrationInstance({
+                        integrationRepository,
+                        integrationClasses,
+                        moduleService,
+                    });
+
+                    // todo: are we going to have the userId available here?
+                    integrationInstance = await getIntegrationInstance.execute(params.integrationId, params.userId);
                     console.log(
-                        `${params.event} for ${instance.record.config.type} of integrationId: ${params.integrationId}`
+                        `${params.event} for ${integrationInstance.record.config.type} of integrationId: ${params.integrationId}`
                     );
                 }
-                const res = await instance.send(params.event, {
+
+                const res = await integrationInstance.send(params.event, {
                     data: params.data,
                     context,
                 });

package/handlers/routers/auth.js

@@ -4,11 +4,9 @@ const {
     loadAppDefinition,
 } = require('../app-definition-loader');
 const { UserRepository } = require('../../user/user-repository');
-const { IntegrationFactory } = require('../../integrations/integration-factory');
 const { GetUserFromBearerToken } = require('../../user/use-cases/get-user-from-bearer-token');
 
-const { integrations, userConfig } = loadAppDefinition();
-const integrationFactory = new IntegrationFactory(integrations);
+const { userConfig } = loadAppDefinition();
 const userRepository = new UserRepository({ userConfig });
 const getUserFromBearerToken = new GetUserFromBearerToken({
     userRepository,
@@ -16,10 +14,6 @@ const getUserFromBearerToken = new GetUserFromBearerToken({
 });
 
 const router = createIntegrationRouter({
-    factory: {
-        moduleFactory: integrationFactory.moduleFactory,
-        integrationFactory,
-    },
     getUserFromBearerToken,
 });
 

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

@@ -1,17 +1,15 @@
 const { createAppHandler } = require('./../app-handler-helpers');
 const {
     loadAppDefinition,
-    loadRouterFromObject,
 } = require('../app-definition-loader');
 const { Router } = require('express');
-const { IntegrationFactory } = require('../../integrations/integration-factory');
+const { loadRouterFromObject } = require('../backend-utils');
 
 const handlers = {};
-const { integrations } = loadAppDefinition();
-const integrationFactory = new IntegrationFactory(integrations);
+const { integrations: integrationClasses } = loadAppDefinition();
 
 //todo: this should be in a use case class
-for (const IntegrationClass of integrationFactory.integrationClasses) {
+for (const IntegrationClass of integrationClasses) {
     const router = Router();
     const basePath = `/api/${IntegrationClass.Definition.name}-integration`;
 

package/handlers/workers/integration-defined-workers.js

@@ -1,13 +1,12 @@
 const { createHandler } = require('@friggframework/core');
-const { loadAppDefinition, createQueueWorker } = require('../app-definition-loader');
-const { IntegrationFactory } = require('../../integrations/integration-factory');
+const { loadAppDefinition } = require('../app-definition-loader');
+const { createQueueWorker } = require('../backend-utils');
 
 const handlers = {};
-const { integrations } = loadAppDefinition();
-const integrationFactory = new IntegrationFactory(integrations);
+const { integrations: integrationClasses } = loadAppDefinition();
 
-integrationFactory.integrationClasses.forEach((IntegrationClass) => {
-    const defaultQueueWorker = createQueueWorker(IntegrationClass, integrationFactory);
+integrationClasses.forEach((IntegrationClass) => {
+    const defaultQueueWorker = createQueueWorker(IntegrationClass);
 
     handlers[`${IntegrationClass.Definition.name}`] = {
         queueWorker: createHandler({

package/index.js

@@ -38,7 +38,6 @@ const {
     IntegrationModel,
     Options,
     IntegrationMapping,
-    IntegrationFactory,
     createIntegrationRouter,
     checkRequiredParams,
 } = require('./integrations/index');
@@ -53,7 +52,6 @@ const {
     OAuth2Requester,
     Requester,
     ModuleConstants,
-    ModuleFactory,
 } = require('./module-plugin/index');
 const utils = require('./utils');
 
@@ -105,7 +103,6 @@ module.exports = {
     IntegrationModel,
     Options,
     IntegrationMapping,
-    IntegrationFactory,
     checkRequiredParams,
     createIntegrationRouter,
 
@@ -126,7 +123,6 @@ module.exports = {
     OAuth2Requester,
     Requester,
     ModuleConstants,
-    ModuleFactory,
     // queues
     QueuerUtil,
 

package/integrations/index.js

@@ -2,7 +2,6 @@ const { IntegrationBase } = require('./integration-base');
 const { IntegrationModel } = require('./integration-model');
 const { Options } = require('./options');
 const { IntegrationMapping } = require('./integration-mapping');
-const { IntegrationFactory } = require('./integration-factory');
 const { createIntegrationRouter, checkRequiredParams } = require('./integration-router');
 
 module.exports = {
@@ -10,7 +9,6 @@ module.exports = {
     IntegrationModel,
     Options,
     IntegrationMapping,
-    IntegrationFactory,
     createIntegrationRouter,
     checkRequiredParams,
 };