refactor(core): Inject dependencies into workflow services (no-changelog) (#8066)

Inject dependencies into workflow services (no-changelog)

Up next:

- ~~Make workflow services injectable~~ #8033
- ~~Inject dependencies into workflow services~~ (current)
- Consolidate workflow controllers into one
- Make workflow controller injectable
- Inject dependencies into workflow controller

packages/cli/test/integration/publicApi/workflows.test.ts

@@ -16,6 +16,8 @@ import { getAllRoles } from '../shared/db/roles';
 import { createUser } from '../shared/db/users';
 import { createWorkflow, createWorkflowWithTrigger } from '../shared/db/workflows';
 import { createTag } from '../shared/db/tags';
+import { mockInstance } from '../../shared/mocking';
+import { Push } from '@/push';
 
 let workflowOwnerRole: Role;
 let owner: User;
@@ -27,6 +29,8 @@ let workflowRunner: ActiveWorkflowRunner;
 const testServer = utils.setupTestServer({ endpointGroups: ['publicApi'] });
 const license = testServer.license;
 
+mockInstance(Push);
+
 beforeAll(async () => {
 	const [globalOwnerRole, globalMemberRole, fetchedWorkflowOwnerRole] = await getAllRoles();
 

packages/cli/test/integration/workflow.service.test.ts

@@ -3,16 +3,38 @@ import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as testDb from './shared/testDb';
 import { WorkflowService } from '@/workflows/workflow.service';
 import { mockInstance } from '../shared/mocking';
-import { Telemetry } from '@/telemetry';
 import { createOwner } from './shared/db/users';
 import { createWorkflow } from './shared/db/workflows';
+import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
+import { mock } from 'jest-mock-extended';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
+import { Telemetry } from '@/telemetry';
 
-mockInstance(Telemetry);
-
-const activeWorkflowRunner = mockInstance(ActiveWorkflowRunner);
+let workflowService: WorkflowService;
+let activeWorkflowRunner: ActiveWorkflowRunner;
 
 beforeAll(async () => {
 	await testDb.init();
+
+	activeWorkflowRunner = mockInstance(ActiveWorkflowRunner);
+	mockInstance(Telemetry);
+
+	workflowService = new WorkflowService(
+		mock(),
+		mock(),
+		Container.get(SharedWorkflowRepository),
+		Container.get(WorkflowRepository),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		mock(),
+		activeWorkflowRunner,
+	);
 });
 
 afterEach(async () => {
@@ -32,7 +54,7 @@ describe('update()', () => {
 		const removeSpy = jest.spyOn(activeWorkflowRunner, 'remove');
 		const addSpy = jest.spyOn(activeWorkflowRunner, 'add');
 
-		await Container.get(WorkflowService).update(owner, workflow, workflow.id);
+		await workflowService.update(owner, workflow, workflow.id);
 
 		expect(removeSpy).toHaveBeenCalledTimes(1);
 		const [removedWorkflowId] = removeSpy.mock.calls[0];
@@ -52,7 +74,7 @@ describe('update()', () => {
 		const addSpy = jest.spyOn(activeWorkflowRunner, 'add');
 
 		workflow.active = false;
-		await Container.get(WorkflowService).update(owner, workflow, workflow.id);
+		await workflowService.update(owner, workflow, workflow.id);
 
 		expect(removeSpy).toHaveBeenCalledTimes(1);
 		const [removedWorkflowId] = removeSpy.mock.calls[0];

packages/cli/test/integration/workflows.controller.ee.test.ts

@@ -20,8 +20,7 @@ import { getCredentialOwnerRole, getGlobalMemberRole, getGlobalOwnerRole } from
 import { createUser } from './shared/db/users';
 import { createWorkflow, getWorkflowSharing, shareWorkflowWithUsers } from './shared/db/workflows';
 import type { Role } from '@/databases/entities/Role';
-import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';
-import { WorkflowService } from '@/workflows/workflow.service';
+import { Push } from '@/push';
 
 let globalMemberRole: Role;
 let owner: User;
@@ -33,6 +32,7 @@ let authAnotherMemberAgent: SuperAgentTest;
 let saveCredential: SaveCredentialFunction;
 
 const activeWorkflowRunnerLike = mockInstance(ActiveWorkflowRunner);
+mockInstance(Push);
 
 const sharingSpy = jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(true);
 const testServer = utils.setupTestServer({
@@ -57,9 +57,6 @@ beforeAll(async () => {
 	saveCredential = affixRoleToSaveCredential(credentialOwnerRole);
 
 	await utils.initNodeTypes();
-
-	Container.set(WorkflowService, new WorkflowService());
-	Container.set(EnterpriseWorkflowService, new EnterpriseWorkflowService());
 });
 
 beforeEach(async () => {

packages/cli/test/integration/workflows.controller.test.ts

@@ -18,17 +18,20 @@ import { saveCredential } from './shared/db/credentials';
 import { createOwner } from './shared/db/users';
 import { createWorkflow } from './shared/db/workflows';
 import { createTag } from './shared/db/tags';
+import { Push } from '@/push';
 
 let owner: User;
 let authOwnerAgent: SuperAgentTest;
 
 jest.spyOn(UserManagementHelpers, 'isSharingEnabled').mockReturnValue(false);
+
 const testServer = utils.setupTestServer({ endpointGroups: ['workflows'] });
 const license = testServer.license;
 
 const { objectContaining, arrayContaining, any } = expect;
 
 const activeWorkflowRunnerLike = mockInstance(ActiveWorkflowRunner);
+mockInstance(Push);
 
 beforeAll(async () => {
 	owner = await createOwner();