diff --git a/packages/@n8n/db/src/repositories/index.ts b/packages/@n8n/db/src/repositories/index.ts index 1be5191651..0b6fe8ac91 100644 --- a/packages/@n8n/db/src/repositories/index.ts +++ b/packages/@n8n/db/src/repositories/index.ts @@ -31,4 +31,5 @@ export { WorkflowStatisticsRepository } from './workflow-statistics.repository'; export { WorkflowTagMappingRepository } from './workflow-tag-mapping.repository'; export { SharedWorkflowRepository } from './shared-workflow.repository'; export { SharedCredentialsRepository } from './shared-credentials.repository'; +export { WorkflowRepository } from './workflow.repository'; export { WebhookRepository } from './webhook.repository'; diff --git a/packages/cli/src/databases/repositories/workflow.repository.ts b/packages/@n8n/db/src/repositories/workflow.repository.ts similarity index 96% rename from packages/cli/src/databases/repositories/workflow.repository.ts rename to packages/@n8n/db/src/repositories/workflow.repository.ts index 9a1e490519..11227cb4ec 100644 --- a/packages/cli/src/databases/repositories/workflow.repository.ts +++ b/packages/@n8n/db/src/repositories/workflow.repository.ts @@ -1,13 +1,4 @@ import { GlobalConfig } from '@n8n/config'; -import type { ListQueryDb, Folder, FolderWithWorkflowAndSubFolderCount } from '@n8n/db'; -import { - isStringArray, - WebhookEntity, - TagEntity, - WorkflowEntity, - WorkflowTagMapping, - FolderRepository, -} from '@n8n/db'; import { Service } from '@n8n/di'; import { DataSource, Repository, In, Like } from '@n8n/typeorm'; import type { @@ -21,7 +12,15 @@ import type { } from '@n8n/typeorm'; import { PROJECT_ROOT } from 'n8n-workflow'; -import type { ListQuery } from '@/requests'; +import { FolderRepository } from './folder.repository'; +import type { Folder } from '../entities'; +import { WebhookEntity, TagEntity, WorkflowEntity, WorkflowTagMapping } from '../entities'; +import type { + ListQueryDb, + FolderWithWorkflowAndSubFolderCount, + ListQuery, +} from '../entities/types-db'; +import { isStringArray } from '../utils/is-string-array'; type ResourceType = 'folder' | 'workflow'; @@ -192,6 +191,7 @@ export class WorkflowRepository extends Repository { } private buildUnionQuery( + // eslint-disable-next-line @typescript-eslint/no-explicit-any baseQuery: SelectQueryBuilder, options: { sortByColumn: string; @@ -213,7 +213,9 @@ export class WorkflowRepository extends Repository { } private applySortingToUnionQuery( + // eslint-disable-next-line @typescript-eslint/no-explicit-any query: SelectQueryBuilder, + // eslint-disable-next-line @typescript-eslint/no-explicit-any baseQuery: SelectQueryBuilder, options: { sortByColumn: string; sortByDirection: 'ASC' | 'DESC' }, ) { @@ -237,6 +239,7 @@ export class WorkflowRepository extends Repository { } private applyPaginationToUnionQuery( + // eslint-disable-next-line @typescript-eslint/no-explicit-any query: SelectQueryBuilder, pagination: { take?: number; skip: number }, ) { diff --git a/packages/cli/src/__tests__/active-workflow-manager.test.ts b/packages/cli/src/__tests__/active-workflow-manager.test.ts index 6579030bb5..7611ec5fd9 100644 --- a/packages/cli/src/__tests__/active-workflow-manager.test.ts +++ b/packages/cli/src/__tests__/active-workflow-manager.test.ts @@ -1,4 +1,5 @@ import type { WorkflowEntity } from '@n8n/db'; +import type { WorkflowRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { InstanceSettings } from 'n8n-core'; import type { @@ -11,7 +12,6 @@ import type { import { Workflow } from 'n8n-workflow'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { NodeTypes } from '@/node-types'; import { mockLogger } from '@test/mocking'; diff --git a/packages/cli/src/__tests__/external-hooks.test.ts b/packages/cli/src/__tests__/external-hooks.test.ts index 35cad959b2..e0b8d1ca12 100644 --- a/packages/cli/src/__tests__/external-hooks.test.ts +++ b/packages/cli/src/__tests__/external-hooks.test.ts @@ -1,4 +1,5 @@ import type { GlobalConfig } from '@n8n/config'; +import type { WorkflowRepository } from '@n8n/db'; import type { CredentialsRepository, SettingsRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { ErrorReporter, Logger } from 'n8n-core'; @@ -6,7 +7,6 @@ import type { IWorkflowBase } from 'n8n-workflow'; import { UnexpectedError } from 'n8n-workflow'; import type { UserRepository } from '@/databases/repositories/user.repository'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ExternalHooks } from '@/external-hooks'; describe('ExternalHooks', () => { diff --git a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts index ca07066ae1..08d9141201 100644 --- a/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts +++ b/packages/cli/src/__tests__/workflow-execute-additional-data.test.ts @@ -1,6 +1,7 @@ import { GlobalConfig } from '@n8n/config'; import type { WorkflowEntity } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import type { IWorkflowBase } from 'n8n-workflow'; @@ -15,7 +16,6 @@ import type PCancelable from 'p-cancelable'; import { ActiveExecutions } from '@/active-executions'; import { CredentialsHelper } from '@/credentials-helper'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { VariablesService } from '@/environments.ee/variables/variables.service.ee'; import { EventService } from '@/events/event.service'; import { diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts index 92257ad0c7..ad52c57a6e 100644 --- a/packages/cli/src/active-workflow-manager.ts +++ b/packages/cli/src/active-workflow-manager.ts @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ import { WorkflowsConfig } from '@n8n/config'; import type { WorkflowEntity, IWorkflowDb } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { OnLeaderStepdown, OnLeaderTakeover, OnShutdown } from '@n8n/decorators'; import { Service } from '@n8n/di'; import { chunk } from 'lodash'; @@ -43,7 +44,6 @@ import { WORKFLOW_REACTIVATE_INITIAL_TIMEOUT, WORKFLOW_REACTIVATE_MAX_TIMEOUT, } from '@/constants'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { executeErrorWorkflow } from '@/execution-lifecycle/execute-error-workflow'; import { ExecutionService } from '@/executions/execution.service'; import { ExternalHooks } from '@/external-hooks'; diff --git a/packages/cli/src/commands/__tests__/execute-batch.test.ts b/packages/cli/src/commands/__tests__/execute-batch.test.ts index f70e2a2d3f..8c9afcb0b0 100644 --- a/packages/cli/src/commands/__tests__/execute-batch.test.ts +++ b/packages/cli/src/commands/__tests__/execute-batch.test.ts @@ -1,5 +1,6 @@ import { GlobalConfig } from '@n8n/config'; import type { User, WorkflowEntity } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { SelectQueryBuilder } from '@n8n/typeorm'; import type { Config } from '@oclif/core'; @@ -8,7 +9,6 @@ import type { IRun } from 'n8n-workflow'; import { ActiveExecutions } from '@/active-executions'; import { DbConnection } from '@/databases/db-connection'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { DeprecationService } from '@/deprecation/deprecation.service'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay'; diff --git a/packages/cli/src/commands/__tests__/execute.test.ts b/packages/cli/src/commands/__tests__/execute.test.ts index 1a03d42bf4..f5e7e0e356 100644 --- a/packages/cli/src/commands/__tests__/execute.test.ts +++ b/packages/cli/src/commands/__tests__/execute.test.ts @@ -1,5 +1,6 @@ import { GlobalConfig } from '@n8n/config'; import type { User, WorkflowEntity } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { Config } from '@oclif/core'; import { mock } from 'jest-mock-extended'; @@ -7,7 +8,6 @@ import type { IRun } from 'n8n-workflow'; import { ActiveExecutions } from '@/active-executions'; import { DbConnection } from '@/databases/db-connection'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { DeprecationService } from '@/deprecation/deprecation.service'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay'; diff --git a/packages/cli/src/commands/execute-batch.ts b/packages/cli/src/commands/execute-batch.ts index b4a5c31283..bfc8390537 100644 --- a/packages/cli/src/commands/execute-batch.ts +++ b/packages/cli/src/commands/execute-batch.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-loop-func */ import type { User } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Flags } from '@oclif/core'; import fs from 'fs'; @@ -11,7 +12,6 @@ import os from 'os'; import { sep } from 'path'; import { ActiveExecutions } from '@/active-executions'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { OwnershipService } from '@/services/ownership.service'; import { findCliWorkflowStart } from '@/utils'; import { WorkflowRunner } from '@/workflow-runner'; diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts index 70aa15bf82..59fe402a1a 100644 --- a/packages/cli/src/commands/execute.ts +++ b/packages/cli/src/commands/execute.ts @@ -1,10 +1,10 @@ +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Flags } from '@oclif/core'; import type { IWorkflowBase, IWorkflowExecutionDataProcess } from 'n8n-workflow'; import { ExecutionBaseError, UnexpectedError, UserError } from 'n8n-workflow'; import { ActiveExecutions } from '@/active-executions'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { OwnershipService } from '@/services/ownership.service'; import { findCliWorkflowStart, isWorkflowIdValid } from '@/utils'; import { WorkflowRunner } from '@/workflow-runner'; diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts index 15e6bcd2e4..f87cf2500f 100644 --- a/packages/cli/src/commands/export/workflow.ts +++ b/packages/cli/src/commands/export/workflow.ts @@ -1,11 +1,10 @@ +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Flags } from '@oclif/core'; import fs from 'fs'; import { UserError } from 'n8n-workflow'; import path from 'path'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - import { BaseCommand } from '../base-command'; export class ExportWorkflowsCommand extends BaseCommand { diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts index 04af1c0e76..ebfaf52264 100644 --- a/packages/cli/src/commands/import/workflow.ts +++ b/packages/cli/src/commands/import/workflow.ts @@ -1,5 +1,10 @@ import type { WorkflowEntity } from '@n8n/db'; -import { generateNanoId, ProjectRepository, SharedWorkflowRepository } from '@n8n/db'; +import { + generateNanoId, + ProjectRepository, + SharedWorkflowRepository, + WorkflowRepository, +} from '@n8n/db'; import { Container } from '@n8n/di'; import { Flags } from '@oclif/core'; import glob from 'fast-glob'; @@ -9,7 +14,6 @@ import { jsonParse, UserError } from 'n8n-workflow'; import { UM_FIX_INSTRUCTION } from '@/constants'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { IWorkflowToImport } from '@/interfaces'; import { ImportService } from '@/services/import.service'; diff --git a/packages/cli/src/commands/list/workflow.ts b/packages/cli/src/commands/list/workflow.ts index 74f5916b5c..744a2aa5d7 100644 --- a/packages/cli/src/commands/list/workflow.ts +++ b/packages/cli/src/commands/list/workflow.ts @@ -1,8 +1,7 @@ +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Flags } from '@oclif/core'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - import { BaseCommand } from '../base-command'; export class ListWorkflowCommand extends BaseCommand { diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts index 903d6c9405..3f2395bbe1 100644 --- a/packages/cli/src/commands/update/workflow.ts +++ b/packages/cli/src/commands/update/workflow.ts @@ -1,8 +1,7 @@ +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Flags } from '@oclif/core'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - import { BaseCommand } from '../base-command'; export class UpdateWorkflowCommand extends BaseCommand { diff --git a/packages/cli/src/controllers/debug.controller.ts b/packages/cli/src/controllers/debug.controller.ts index 80d4ae7ff7..0614885c5c 100644 --- a/packages/cli/src/controllers/debug.controller.ts +++ b/packages/cli/src/controllers/debug.controller.ts @@ -1,8 +1,8 @@ +import { WorkflowRepository } from '@n8n/db'; import { Get, RestController } from '@n8n/decorators'; import { InstanceSettings } from 'n8n-core'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { MultiMainSetup } from '@/scaling/multi-main-setup.ee'; @RestController('/debug') diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts index 988efd5116..98ec5974a3 100644 --- a/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts +++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts @@ -6,13 +6,12 @@ import type { TagRepository } from '@n8n/db'; import type { WorkflowTagMappingRepository } from '@n8n/db'; import type { SharedCredentialsRepository } from '@n8n/db'; import type { SharedWorkflowRepository } from '@n8n/db'; +import type { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock, captor } from 'jest-mock-extended'; import { Cipher, type InstanceSettings } from 'n8n-core'; import fsp from 'node:fs/promises'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - import type { VariablesService } from '../../variables/variables.service.ee'; import { SourceControlExportService } from '../source-control-export.service.ee'; diff --git a/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts index f82cd05077..fd104865b3 100644 --- a/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts +++ b/packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts @@ -1,12 +1,11 @@ import type { WorkflowEntity } from '@n8n/db'; import type { FolderRepository } from '@n8n/db'; +import type { WorkflowRepository } from '@n8n/db'; import * as fastGlob from 'fast-glob'; import { mock } from 'jest-mock-extended'; import { type InstanceSettings } from 'n8n-core'; import fsp from 'node:fs/promises'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - import { SourceControlImportService } from '../source-control-import.service.ee'; import type { ExportableFolder } from '../types/exportable-folders'; diff --git a/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts index 7610ee3da0..5fca88df37 100644 --- a/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts +++ b/packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts @@ -6,6 +6,7 @@ import { WorkflowTagMappingRepository, SharedCredentialsRepository, SharedWorkflowRepository, + WorkflowRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import @@ -16,7 +17,6 @@ import { UnexpectedError, type ICredentialDataDecryptedObject } from 'n8n-workfl import { writeFile as fsWriteFile, rm as fsRm } from 'node:fs/promises'; import path from 'path'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { formatWorkflow } from '@/workflows/workflow.formatter'; import { diff --git a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts index c74337a678..d858e9be7a 100644 --- a/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts +++ b/packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts @@ -10,6 +10,7 @@ import { WorkflowTagMappingRepository, SharedCredentialsRepository, SharedWorkflowRepository, + WorkflowRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import @@ -23,7 +24,6 @@ import path from 'path'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { CredentialsService } from '@/credentials/credentials.service'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { IWorkflowToImport } from '@/interfaces'; import { isUniqueConstraintError } from '@/response-helper'; import { TagService } from '@/services/tag.service'; diff --git a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts index e710ca656a..92cb23169d 100644 --- a/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts +++ b/packages/cli/src/evaluation.ee/test-runner/__tests__/test-runner.service.ee.test.ts @@ -7,6 +7,7 @@ import type { ExecutionRepository } from '@n8n/db'; import type { TestCaseExecutionRepository } from '@n8n/db'; import type { TestMetricRepository } from '@n8n/db'; import type { TestRunRepository } from '@n8n/db'; +import type { WorkflowRepository } from '@n8n/db'; import type { SelectQueryBuilder } from '@n8n/typeorm'; import { stringify } from 'flatted'; import { readFileSync } from 'fs'; @@ -18,7 +19,6 @@ import path from 'path'; import type { ActiveExecutions } from '@/active-executions'; import config from '@/config'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { NodeTypes } from '@/node-types'; import type { Telemetry } from '@/telemetry'; diff --git a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts index 5ead952cb0..94d88d38f4 100644 --- a/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts +++ b/packages/cli/src/evaluation.ee/test-runner/test-runner.service.ee.ts @@ -4,6 +4,7 @@ import { TestCaseExecutionRepository, TestMetricRepository, TestRunRepository, + WorkflowRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; import { parse } from 'flatted'; @@ -23,7 +24,6 @@ import assert from 'node:assert'; import { ActiveExecutions } from '@/active-executions'; import config from '@/config'; import { EVALUATION_METRICS_NODE } from '@/constants'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { TestCaseExecutionError, TestRunError } from '@/evaluation.ee/test-runner/errors.ee'; import { NodeTypes } from '@/node-types'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts index ac352f5bdf..38ffb37bf6 100644 --- a/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts +++ b/packages/cli/src/eventbus/message-event-bus/message-event-bus.ts @@ -1,5 +1,5 @@ import { GlobalConfig } from '@n8n/config'; -import { EventDestinationsRepository, ExecutionRepository } from '@n8n/db'; +import { EventDestinationsRepository, ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import type { DeleteResult } from '@n8n/typeorm'; @@ -11,7 +11,6 @@ import { Logger } from 'n8n-core'; import type { MessageEventBusDestinationOptions } from 'n8n-workflow'; import config from '@/config'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { License } from '@/license'; import { Publisher } from '@/scaling/pubsub/publisher.service'; diff --git a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts index 1ec418d6ac..bdae9009a4 100644 --- a/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts +++ b/packages/cli/src/events/__tests__/telemetry-event-relay.test.ts @@ -5,13 +5,13 @@ import type { IWorkflowDb } from '@n8n/db'; import type { CredentialsRepository } from '@n8n/db'; import type { ProjectRelationRepository } from '@n8n/db'; import type { SharedWorkflowRepository } from '@n8n/db'; +import type { WorkflowRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import { type BinaryDataConfig, InstanceSettings } from 'n8n-core'; import type { INode, INodesGraphResult } from 'n8n-workflow'; import { NodeApiError, TelemetryHelpers, type IRun, type IWorkflowBase } from 'n8n-workflow'; import { N8N_VERSION } from '@/constants'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { EventService } from '@/events/event.service'; import type { RelayEventMap } from '@/events/maps/relay.event-map'; import { TelemetryEventRelay } from '@/events/relays/telemetry.event-relay'; diff --git a/packages/cli/src/events/relays/telemetry.event-relay.ts b/packages/cli/src/events/relays/telemetry.event-relay.ts index 498d759c3e..8b0fa56a91 100644 --- a/packages/cli/src/events/relays/telemetry.event-relay.ts +++ b/packages/cli/src/events/relays/telemetry.event-relay.ts @@ -3,6 +3,7 @@ import { CredentialsRepository, ProjectRelationRepository, SharedWorkflowRepository, + WorkflowRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; import { snakeCase } from 'change-case'; @@ -14,7 +15,6 @@ import { get as pslGet } from 'psl'; import config from '@/config'; import { N8N_VERSION } from '@/constants'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { EventService } from '@/events/event.service'; import type { RelayEventMap } from '@/events/maps/relay.event-map'; import { determineFinalExecutionStatus } from '@/execution-lifecycle/shared/shared-hook-functions'; diff --git a/packages/cli/src/executions/execution.service.ee.ts b/packages/cli/src/executions/execution.service.ee.ts index 7e05e1699a..da593c5e6f 100644 --- a/packages/cli/src/executions/execution.service.ee.ts +++ b/packages/cli/src/executions/execution.service.ee.ts @@ -1,7 +1,7 @@ import type { WorkflowWithSharingsAndCredentials, IExecutionResponse } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { IExecutionFlattedResponse } from '@/interfaces'; import { ExecutionService } from './execution.service'; diff --git a/packages/cli/src/executions/execution.service.ts b/packages/cli/src/executions/execution.service.ts index f1f5e26385..d8ced210ae 100644 --- a/packages/cli/src/executions/execution.service.ts +++ b/packages/cli/src/executions/execution.service.ts @@ -10,6 +10,7 @@ import { ExecutionAnnotationRepository, ExecutionRepository, AnnotationTagMappingRepository, + WorkflowRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; import { validate as jsonSchemaValidate } from 'jsonschema'; @@ -34,7 +35,6 @@ import { import { ActiveExecutions } from '@/active-executions'; import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service'; import config from '@/config'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { AbortedExecutionRetryError } from '@/errors/aborted-execution-retry.error'; import { MissingExecutionStopError } from '@/errors/missing-execution-stop.error'; import { QueuedExecutionRetryError } from '@/errors/queued-execution-retry.error'; diff --git a/packages/cli/src/external-hooks.ts b/packages/cli/src/external-hooks.ts index 470b61b312..93b386a259 100644 --- a/packages/cli/src/external-hooks.ts +++ b/packages/cli/src/external-hooks.ts @@ -2,7 +2,7 @@ import type { FrontendSettings, UserUpdateRequestDto } from '@n8n/api-types'; import type { ClientOAuth2Options } from '@n8n/client-oauth2'; import { GlobalConfig } from '@n8n/config'; import type { TagEntity, User, ICredentialsDb, PublicUser } from '@n8n/db'; -import { CredentialsRepository, SettingsRepository } from '@n8n/db'; +import { CredentialsRepository, WorkflowRepository, SettingsRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { ErrorReporter, Logger } from 'n8n-core'; import type { IRun, IWorkflowBase, Workflow, WorkflowExecuteMode } from 'n8n-workflow'; @@ -12,7 +12,6 @@ import type clientOAuth1 from 'oauth-1.0a'; import type { AbstractServer } from '@/abstract-server'; import type { Config } from '@/config'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; type Repositories = { User: UserRepository; diff --git a/packages/cli/src/license/__tests__/license.service.test.ts b/packages/cli/src/license/__tests__/license.service.test.ts index 8ffc1dbf3d..df1ae76300 100644 --- a/packages/cli/src/license/__tests__/license.service.test.ts +++ b/packages/cli/src/license/__tests__/license.service.test.ts @@ -1,8 +1,8 @@ +import type { WorkflowRepository } from '@n8n/db'; import type { TEntitlement } from '@n8n_io/license-sdk'; import axios, { AxiosError } from 'axios'; import { mock } from 'jest-mock-extended'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import type { EventService } from '@/events/event.service'; import type { License } from '@/license'; diff --git a/packages/cli/src/license/license.service.ts b/packages/cli/src/license/license.service.ts index e06559f754..40ae9dd55a 100644 --- a/packages/cli/src/license/license.service.ts +++ b/packages/cli/src/license/license.service.ts @@ -1,10 +1,10 @@ import type { User } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import axios, { AxiosError } from 'axios'; import { Logger } from 'n8n-core'; import { ensureError } from 'n8n-workflow'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { EventService } from '@/events/event.service'; import { License } from '@/license'; diff --git a/packages/cli/src/metrics/__tests__/license-metrics.service.test.ts b/packages/cli/src/metrics/__tests__/license-metrics.service.test.ts index 943728ffb4..1c5e54423f 100644 --- a/packages/cli/src/metrics/__tests__/license-metrics.service.test.ts +++ b/packages/cli/src/metrics/__tests__/license-metrics.service.test.ts @@ -1,7 +1,7 @@ import type { LicenseMetricsRepository } from '@n8n/db'; +import type { WorkflowRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { LicenseMetricsService } from '@/metrics/license-metrics.service'; describe('LicenseMetricsService', () => { diff --git a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts index d6f3d22ac2..9e5bfb1d31 100644 --- a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts +++ b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.test.ts @@ -1,4 +1,5 @@ import { GlobalConfig } from '@n8n/config'; +import type { WorkflowRepository } from '@n8n/db'; import type express from 'express'; import promBundle from 'express-prom-bundle'; import { mock } from 'jest-mock-extended'; @@ -6,7 +7,6 @@ import type { InstanceSettings } from 'n8n-core'; import promClient from 'prom-client'; import config from '@/config'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import type { EventService } from '@/events/event.service'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.unmocked.test.ts b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.unmocked.test.ts index 2dde75086d..a000dfc81e 100644 --- a/packages/cli/src/metrics/__tests__/prometheus-metrics.service.unmocked.test.ts +++ b/packages/cli/src/metrics/__tests__/prometheus-metrics.service.unmocked.test.ts @@ -1,10 +1,10 @@ import { GlobalConfig } from '@n8n/config'; +import type { WorkflowRepository } from '@n8n/db'; import type express from 'express'; import { mock } from 'jest-mock-extended'; import type { InstanceSettings } from 'n8n-core'; import promClient from 'prom-client'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { EventMessageWorkflow } from '@/eventbus/event-message-classes/event-message-workflow'; import type { EventService } from '@/events/event.service'; import type { CacheService } from '@/services/cache/cache.service'; diff --git a/packages/cli/src/metrics/license-metrics.service.ts b/packages/cli/src/metrics/license-metrics.service.ts index 4629d1e144..d60cb7638d 100644 --- a/packages/cli/src/metrics/license-metrics.service.ts +++ b/packages/cli/src/metrics/license-metrics.service.ts @@ -1,8 +1,6 @@ -import { LicenseMetricsRepository } from '@n8n/db'; +import { LicenseMetricsRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - @Service() export class LicenseMetricsService { constructor( diff --git a/packages/cli/src/metrics/prometheus-metrics.service.ts b/packages/cli/src/metrics/prometheus-metrics.service.ts index 4c609bacc3..530f37796b 100644 --- a/packages/cli/src/metrics/prometheus-metrics.service.ts +++ b/packages/cli/src/metrics/prometheus-metrics.service.ts @@ -1,4 +1,5 @@ import { GlobalConfig } from '@n8n/config'; +import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import type express from 'express'; import promBundle from 'express-prom-bundle'; @@ -9,7 +10,6 @@ import semverParse from 'semver/functions/parse'; import config from '@/config'; import { N8N_VERSION, Time } from '@/constants'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { EventMessageTypes } from '@/eventbus'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { EventService } from '@/events/event.service'; diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts index 389d82ea56..1763c5ad0f 100644 --- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts +++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts @@ -1,5 +1,5 @@ import { GlobalConfig } from '@n8n/config'; -import { WorkflowEntity, ProjectRepository, TagRepository } from '@n8n/db'; +import { WorkflowEntity, ProjectRepository, TagRepository, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import { In, Like, QueryFailedError } from '@n8n/typeorm'; @@ -10,7 +10,6 @@ import { v4 as uuid } from 'uuid'; import { z } from 'zod'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { EventService } from '@/events/event.service'; import { ExternalHooks } from '@/external-hooks'; import { addNodeIds, replaceInvalidCredentials } from '@/workflow-helpers'; diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts index f4c7894755..7c69710e88 100644 --- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts +++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts @@ -6,12 +6,12 @@ import { SharedWorkflow, TagRepository, SharedWorkflowRepository, + WorkflowRepository, } from '@n8n/db'; import { Container } from '@n8n/di'; import type { Scope, WorkflowSharingRole } from '@n8n/permissions'; import type { WorkflowId } from 'n8n-workflow'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { License } from '@/license'; import { WorkflowSharingService } from '@/workflows/workflow-sharing.service'; diff --git a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts index 3c6d00c02d..11594edcc9 100644 --- a/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts +++ b/packages/cli/src/scaling/__tests__/pubsub-handler.test.ts @@ -1,10 +1,10 @@ import type { WorkerStatus } from '@n8n/api-types'; +import type { WorkflowRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { InstanceSettings } from 'n8n-core'; import type { IWorkflowBase, Workflow } from 'n8n-workflow'; import type { ActiveWorkflowManager } from '@/active-workflow-manager'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { EventService } from '@/events/event.service'; import type { ExternalSecretsManager } from '@/external-secrets.ee/external-secrets-manager.ee'; diff --git a/packages/cli/src/scaling/job-processor.ts b/packages/cli/src/scaling/job-processor.ts index b48b6223fd..9d37659b7e 100644 --- a/packages/cli/src/scaling/job-processor.ts +++ b/packages/cli/src/scaling/job-processor.ts @@ -1,5 +1,5 @@ import type { RunningJobSummary } from '@n8n/api-types'; -import { ExecutionRepository } from '@n8n/db'; +import { ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { WorkflowHasIssuesError, @@ -18,7 +18,6 @@ import { BINARY_ENCODING, Workflow, UnexpectedError } from 'n8n-workflow'; import type PCancelable from 'p-cancelable'; import config from '@/config'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { getLifecycleHooksForScalingWorker } from '@/execution-lifecycle/execution-lifecycle-hooks'; import { ManualExecutionService } from '@/manual-execution.service'; import { NodeTypes } from '@/node-types'; diff --git a/packages/cli/src/scaling/pubsub/pubsub-handler.ts b/packages/cli/src/scaling/pubsub/pubsub-handler.ts index 25b189c141..8a31e85d20 100644 --- a/packages/cli/src/scaling/pubsub/pubsub-handler.ts +++ b/packages/cli/src/scaling/pubsub/pubsub-handler.ts @@ -1,9 +1,9 @@ +import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { InstanceSettings } from 'n8n-core'; import { ensureError } from 'n8n-workflow'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { EventService } from '@/events/event.service'; import type { PubSubEventMap } from '@/events/maps/pub-sub.event-map'; diff --git a/packages/cli/src/security-audit/security-audit.service.ts b/packages/cli/src/security-audit/security-audit.service.ts index b0946b5409..ea91d55c67 100644 --- a/packages/cli/src/security-audit/security-audit.service.ts +++ b/packages/cli/src/security-audit/security-audit.service.ts @@ -1,8 +1,8 @@ import { SecurityConfig } from '@n8n/config'; +import { WorkflowRepository } from '@n8n/db'; import { Container, Service } from '@n8n/di'; import config from '@/config'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { RISK_CATEGORIES } from '@/security-audit/constants'; import type { Risk, RiskReporter } from '@/security-audit/types'; import { toReportTitle } from '@/security-audit/utils'; diff --git a/packages/cli/src/services/__tests__/active-workflows.service.test.ts b/packages/cli/src/services/__tests__/active-workflows.service.test.ts index ca6580e123..c361176e17 100644 --- a/packages/cli/src/services/__tests__/active-workflows.service.test.ts +++ b/packages/cli/src/services/__tests__/active-workflows.service.test.ts @@ -1,10 +1,10 @@ import { WorkflowEntity } from '@n8n/db'; import type { User } from '@n8n/db'; import type { SharedWorkflowRepository } from '@n8n/db'; +import type { WorkflowRepository } from '@n8n/db'; import { mock } from 'jest-mock-extended'; import type { ActivationErrorsService } from '@/activation-errors.service'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { ActiveWorkflowsService } from '@/services/active-workflows.service'; import type { WorkflowFinderService } from '@/workflows/workflow-finder.service'; diff --git a/packages/cli/src/services/__tests__/hooks.service.test.ts b/packages/cli/src/services/__tests__/hooks.service.test.ts index d091486d52..e351609ddb 100644 --- a/packages/cli/src/services/__tests__/hooks.service.test.ts +++ b/packages/cli/src/services/__tests__/hooks.service.test.ts @@ -1,13 +1,13 @@ import type { AuthUser, SettingsRepository } from '@n8n/db'; import type { AuthUserRepository } from '@n8n/db'; import type { CredentialsRepository } from '@n8n/db'; +import type { WorkflowRepository } from '@n8n/db'; import RudderStack from '@rudderstack/rudder-sdk-node'; import type { Response } from 'express'; import { mock } from 'jest-mock-extended'; import type { AuthService } from '@/auth/auth.service'; import type { UserRepository } from '@/databases/repositories/user.repository'; -import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { Invitation } from '@/interfaces'; import type { AuthenticatedRequest } from '@/requests'; import { HooksService } from '@/services/hooks.service'; diff --git a/packages/cli/src/services/__tests__/naming.service.test.ts b/packages/cli/src/services/__tests__/naming.service.test.ts index cd6cf516f6..dae8b04bcf 100644 --- a/packages/cli/src/services/__tests__/naming.service.test.ts +++ b/packages/cli/src/services/__tests__/naming.service.test.ts @@ -1,8 +1,8 @@ import type { CredentialsEntity } from '@n8n/db'; import type { WorkflowEntity } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { NamingService } from '@/services/naming.service'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/src/services/active-workflows.service.ts b/packages/cli/src/services/active-workflows.service.ts index 1bd5f92f15..944e151b90 100644 --- a/packages/cli/src/services/active-workflows.service.ts +++ b/packages/cli/src/services/active-workflows.service.ts @@ -1,11 +1,10 @@ import type { User } from '@n8n/db'; -import { SharedWorkflowRepository } from '@n8n/db'; +import { SharedWorkflowRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { hasGlobalScope } from '@n8n/permissions'; import { Logger } from 'n8n-core'; import { ActivationErrorsService } from '@/activation-errors.service'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { WorkflowFinderService } from '@/workflows/workflow-finder.service'; diff --git a/packages/cli/src/services/folder.service.ts b/packages/cli/src/services/folder.service.ts index f38b0aa363..be409148bc 100644 --- a/packages/cli/src/services/folder.service.ts +++ b/packages/cli/src/services/folder.service.ts @@ -1,11 +1,11 @@ import type { CreateFolderDto, DeleteFolderDto, UpdateFolderDto } from '@n8n/api-types'; -import { Folder, FolderTagMappingRepository, FolderRepository, type User } from '@n8n/db'; +import type { User } from '@n8n/db'; +import { Folder, FolderTagMappingRepository, FolderRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import type { EntityManager } from '@n8n/typeorm'; import { UserError, PROJECT_ROOT } from 'n8n-workflow'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { FolderNotFoundError } from '@/errors/folder-not-found.error'; import type { ListQuery } from '@/requests'; import { WorkflowService } from '@/workflows/workflow.service'; diff --git a/packages/cli/src/services/hooks.service.ts b/packages/cli/src/services/hooks.service.ts index 1fe622d307..c69fe6c51d 100644 --- a/packages/cli/src/services/hooks.service.ts +++ b/packages/cli/src/services/hooks.service.ts @@ -1,5 +1,10 @@ import type { Settings, CredentialsEntity, User, WorkflowEntity, AuthUser } from '@n8n/db'; -import { AuthUserRepository, CredentialsRepository, SettingsRepository } from '@n8n/db'; +import { + AuthUserRepository, + CredentialsRepository, + WorkflowRepository, + SettingsRepository, +} from '@n8n/db'; import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import import type { FindManyOptions, FindOneOptions, FindOptionsWhere } from '@n8n/typeorm'; @@ -9,7 +14,6 @@ import type { NextFunction, Response } from 'express'; import { AuthService } from '@/auth/auth.service'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { Invitation } from '@/interfaces'; import type { AuthenticatedRequest } from '@/requests'; import { UserService } from '@/services/user.service'; diff --git a/packages/cli/src/services/naming.service.ts b/packages/cli/src/services/naming.service.ts index 972252fe8c..67e67178d3 100644 --- a/packages/cli/src/services/naming.service.ts +++ b/packages/cli/src/services/naming.service.ts @@ -1,8 +1,6 @@ -import { CredentialsRepository } from '@n8n/db'; +import { CredentialsRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - @Service() export class NamingService { constructor( diff --git a/packages/cli/src/services/workflow-loader.service.ts b/packages/cli/src/services/workflow-loader.service.ts index fdb91e2cb6..28c1c07998 100644 --- a/packages/cli/src/services/workflow-loader.service.ts +++ b/packages/cli/src/services/workflow-loader.service.ts @@ -1,8 +1,7 @@ +import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { UnexpectedError, type IWorkflowBase, type IWorkflowLoader } from 'n8n-workflow'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - @Service() export class WorkflowLoaderService implements IWorkflowLoader { constructor(private readonly workflowRepository: WorkflowRepository) {} diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts index 012bed9c00..e9b9c32fc1 100644 --- a/packages/cli/src/telemetry/index.ts +++ b/packages/cli/src/telemetry/index.ts @@ -1,5 +1,5 @@ import { GlobalConfig } from '@n8n/config'; -import { ProjectRelationRepository, ProjectRepository } from '@n8n/db'; +import { ProjectRelationRepository, ProjectRepository, WorkflowRepository } from '@n8n/db'; import { OnShutdown } from '@n8n/decorators'; import { Container, Service } from '@n8n/di'; import type RudderStack from '@rudderstack/rudder-sdk-node'; @@ -9,7 +9,6 @@ import type { ITelemetryTrackProperties } from 'n8n-workflow'; import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { IExecutionTrackProperties } from '@/interfaces'; import { License } from '@/license'; import { PostHogClient } from '@/posthog'; diff --git a/packages/cli/src/webhooks/live-webhooks.ts b/packages/cli/src/webhooks/live-webhooks.ts index 440e8254dc..58a574856d 100644 --- a/packages/cli/src/webhooks/live-webhooks.ts +++ b/packages/cli/src/webhooks/live-webhooks.ts @@ -1,10 +1,10 @@ +import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import type { Response } from 'express'; import { Logger } from 'n8n-core'; import { Workflow, CHAT_TRIGGER_NODE_TYPE } from 'n8n-workflow'; import type { INode, IWebhookData, IHttpRequestMethods } from 'n8n-workflow'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { WebhookNotFoundError } from '@/errors/response-errors/webhook-not-found.error'; import { NodeTypes } from '@/node-types'; diff --git a/packages/cli/src/workflow-execute-additional-data.ts b/packages/cli/src/workflow-execute-additional-data.ts index db14fd6be1..dd6143aed1 100644 --- a/packages/cli/src/workflow-execute-additional-data.ts +++ b/packages/cli/src/workflow-execute-additional-data.ts @@ -4,7 +4,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import type { PushMessage, PushType } from '@n8n/api-types'; import { GlobalConfig } from '@n8n/config'; -import { ExecutionRepository } from '@n8n/db'; +import { ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Logger, WorkflowExecute } from 'n8n-core'; import { UnexpectedError, Workflow } from 'n8n-workflow'; @@ -33,7 +33,6 @@ import type { import { ActiveExecutions } from '@/active-executions'; import { CredentialsHelper } from '@/credentials-helper'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { EventService } from '@/events/event.service'; import type { AiEventMap, AiEventPayload } from '@/events/maps/ai.event-map'; import { getLifecycleHooksForSubExecutions } from '@/execution-lifecycle/execution-lifecycle-hooks'; diff --git a/packages/cli/src/workflows/workflow-execution.service.ts b/packages/cli/src/workflows/workflow-execution.service.ts index 6f81c82204..480db86b51 100644 --- a/packages/cli/src/workflows/workflow-execution.service.ts +++ b/packages/cli/src/workflows/workflow-execution.service.ts @@ -1,6 +1,6 @@ import { GlobalConfig } from '@n8n/config'; import type { Project, User, CreateExecutionPayload } from '@n8n/db'; -import { ExecutionRepository } from '@n8n/db'; +import { ExecutionRepository, WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { ErrorReporter, Logger } from 'n8n-core'; import type { @@ -19,7 +19,6 @@ import type { import { SubworkflowOperationError, Workflow } from 'n8n-workflow'; import config from '@/config'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ExecutionDataService } from '@/executions/execution-data.service'; import { SubworkflowPolicyChecker } from '@/executions/pre-execution-checks'; import type { IWorkflowErrorData } from '@/interfaces'; diff --git a/packages/cli/src/workflows/workflow-static-data.service.ts b/packages/cli/src/workflows/workflow-static-data.service.ts index 5ef9a52480..fb59827bdc 100644 --- a/packages/cli/src/workflows/workflow-static-data.service.ts +++ b/packages/cli/src/workflows/workflow-static-data.service.ts @@ -1,9 +1,9 @@ import { GlobalConfig } from '@n8n/config'; +import { WorkflowRepository } from '@n8n/db'; import { Service } from '@n8n/di'; import { ErrorReporter, Logger } from 'n8n-core'; import type { IDataObject, Workflow } from 'n8n-workflow'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { isWorkflowIdValid } from '@/utils'; @Service() diff --git a/packages/cli/src/workflows/workflow.service.ee.ts b/packages/cli/src/workflows/workflow.service.ee.ts index deba21eff4..4728b8ef3b 100644 --- a/packages/cli/src/workflows/workflow.service.ee.ts +++ b/packages/cli/src/workflows/workflow.service.ee.ts @@ -12,6 +12,7 @@ import { CredentialsRepository, FolderRepository, SharedWorkflowRepository, + WorkflowRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import @@ -25,7 +26,6 @@ import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { CredentialsFinderService } from '@/credentials/credentials-finder.service'; import { CredentialsService } from '@/credentials/credentials.service'; import { EnterpriseCredentialsService } from '@/credentials/credentials.service.ee'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { TransferWorkflowError } from '@/errors/response-errors/transfer-workflow.error'; diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts index ba7cc267b2..b4862f4597 100644 --- a/packages/cli/src/workflows/workflow.service.ts +++ b/packages/cli/src/workflows/workflow.service.ts @@ -1,11 +1,12 @@ import { GlobalConfig } from '@n8n/config'; -import type { User, WorkflowEntity, ListQueryDb } from '@n8n/db'; +import type { User, WorkflowEntity, ListQueryDb, WorkflowFolderUnionFull } from '@n8n/db'; import { SharedWorkflow, ExecutionRepository, FolderRepository, WorkflowTagMappingRepository, SharedWorkflowRepository, + WorkflowRepository, } from '@n8n/db'; import { Service } from '@n8n/di'; import type { Scope } from '@n8n/permissions'; @@ -22,8 +23,6 @@ import { v4 as uuid } from 'uuid'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import config from '@/config'; -import type { WorkflowFolderUnionFull } from '@/databases/repositories/workflow.repository'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { FolderNotFoundError } from '@/errors/folder-not-found.error'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { NotFoundError } from '@/errors/response-errors/not-found.error'; diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts index a05a14c090..5a76d249c6 100644 --- a/packages/cli/src/workflows/workflows.controller.ts +++ b/packages/cli/src/workflows/workflows.controller.ts @@ -12,6 +12,7 @@ import { ProjectRepository, TagRepository, SharedWorkflowRepository, + WorkflowRepository, } from '@n8n/db'; import { Body, @@ -34,7 +35,6 @@ import { Logger } from 'n8n-core'; import { UnexpectedError } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { ForbiddenError } from '@/errors/response-errors/forbidden.error'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts index 819ee7ee3c..5e5e27a31a 100644 --- a/packages/cli/test/integration/active-workflow-manager.test.ts +++ b/packages/cli/test/integration/active-workflow-manager.test.ts @@ -1,4 +1,5 @@ import type { WebhookEntity } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { InstanceSettings } from 'n8n-core'; @@ -14,7 +15,6 @@ import type { import { ActiveExecutions } from '@/active-executions'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ExecutionService } from '@/executions/execution.service'; import { ExternalHooks } from '@/external-hooks'; import { NodeTypes } from '@/node-types'; diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts index 549704a860..18919866d4 100644 --- a/packages/cli/test/integration/commands/ldap/reset.test.ts +++ b/packages/cli/test/integration/commands/ldap/reset.test.ts @@ -1,12 +1,12 @@ import { CredentialsRepository } from '@n8n/db'; import { SharedCredentialsRepository } from '@n8n/db'; import { SharedWorkflowRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { EntityNotFoundError } from '@n8n/typeorm'; import { v4 as uuid } from 'uuid'; import { Reset } from '@/commands/ldap/reset'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { getLdapSynchronizations, saveLdapSynchronization } from '@/ldap.ee/helpers.ee'; import { LdapService } from '@/ldap.ee/ldap.service.ee'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts index 65fe46d806..a026a3a029 100644 --- a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts +++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts @@ -1,7 +1,6 @@ +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - import { createWorkflowWithTrigger, createWorkflow, diff --git a/packages/cli/test/integration/debug.controller.test.ts b/packages/cli/test/integration/debug.controller.test.ts index 49aad8b0ec..4c299f4c80 100644 --- a/packages/cli/test/integration/debug.controller.test.ts +++ b/packages/cli/test/integration/debug.controller.test.ts @@ -1,10 +1,10 @@ -import { generateNanoId } from '@n8n/db'; import type { WorkflowEntity } from '@n8n/db'; +import { generateNanoId } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { InstanceSettings } from 'n8n-core'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { MultiMainSetup } from '@/scaling/multi-main-setup.ee'; import { createOwner } from './shared/db/users'; diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts index e00c34eb52..609fb73fc8 100644 --- a/packages/cli/test/integration/execution.service.integration.test.ts +++ b/packages/cli/test/integration/execution.service.integration.test.ts @@ -1,10 +1,10 @@ import type { ExecutionSummaries } from '@n8n/db'; import { ExecutionMetadataRepository } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ExecutionService } from '@/executions/execution.service'; import { createTeamProject } from '@test-integration/db/projects'; diff --git a/packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts b/packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts index f3a3478db7..6b411c796c 100644 --- a/packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts +++ b/packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts @@ -3,12 +3,12 @@ import type { User } from '@n8n/db'; import { ProjectRepository } from '@n8n/db'; import { SharedCredentialsRepository } from '@n8n/db'; import { SharedWorkflowRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { INode, IWorkflowBase } from 'n8n-workflow'; import { randomInt } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { CredentialsPermissionChecker } from '@/executions/pre-execution-checks'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { NodeTypes } from '@/node-types'; diff --git a/packages/cli/test/integration/folder/folder.controller.test.ts b/packages/cli/test/integration/folder/folder.controller.test.ts index a842e11b1e..b8a70cdd7b 100644 --- a/packages/cli/test/integration/folder/folder.controller.test.ts +++ b/packages/cli/test/integration/folder/folder.controller.test.ts @@ -2,12 +2,12 @@ import type { Project, ProjectRole } from '@n8n/db'; import type { User } from '@n8n/db'; import { FolderRepository } from '@n8n/db'; import { ProjectRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { DateTime } from 'luxon'; import { ApplicationError, PROJECT_ROOT } from 'n8n-workflow'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { mockInstance } from '@test/mocking'; import { getCredentialSharings, diff --git a/packages/cli/test/integration/import.service.test.ts b/packages/cli/test/integration/import.service.test.ts index d3aeda5ea4..527d4c73b0 100644 --- a/packages/cli/test/integration/import.service.test.ts +++ b/packages/cli/test/integration/import.service.test.ts @@ -4,12 +4,12 @@ import { TagEntity } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; import { TagRepository } from '@n8n/db'; import { SharedWorkflowRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import type { INode } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { ImportService } from '@/services/import.service'; import { getPersonalProject } from './shared/db/projects'; diff --git a/packages/cli/test/integration/prometheus-metrics.test.ts b/packages/cli/test/integration/prometheus-metrics.test.ts index 792f978bfa..f1bf5f3765 100644 --- a/packages/cli/test/integration/prometheus-metrics.test.ts +++ b/packages/cli/test/integration/prometheus-metrics.test.ts @@ -1,11 +1,11 @@ import { GlobalConfig } from '@n8n/config'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { parse as semverParse } from 'semver'; import request, { type Response } from 'supertest'; import config from '@/config'; import { N8N_VERSION } from '@/constants'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { EventService } from '@/events/event.service'; import { PrometheusMetricsService } from '@/metrics/prometheus-metrics.service'; import { CacheService } from '@/services/cache/cache.service'; diff --git a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts index 9ca073ac91..97e9b52c04 100644 --- a/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts @@ -3,11 +3,11 @@ import { generateNanoId } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; import { ExecutionDataRepository } from '@n8n/db'; import { ExecutionRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { CREDENTIALS_REPORT } from '@/security-audit/constants'; import { SecurityAuditService } from '@/security-audit/security-audit.service'; diff --git a/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts index bbe9b59f53..a3ffeecba3 100644 --- a/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts @@ -1,9 +1,9 @@ import { generateNanoId } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { DATABASE_REPORT, SQL_NODE_TYPES, diff --git a/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts index 6e0e50b4ae..814d65a707 100644 --- a/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts @@ -1,8 +1,8 @@ +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/security-audit/constants'; import { SecurityAuditService } from '@/security-audit/security-audit.service'; diff --git a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts index 3310eff9fd..8328ac5eff 100644 --- a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts @@ -1,11 +1,11 @@ import { GlobalConfig } from '@n8n/config'; import { generateNanoId } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { NodeConnectionTypes } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { INSTANCE_REPORT, WEBHOOK_VALIDATOR_NODE_TYPES } from '@/security-audit/constants'; import { SecurityAuditService } from '@/security-audit/security-audit.service'; import { toReportTitle } from '@/security-audit/utils'; diff --git a/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts index b3e1b5a1ca..e963d7105c 100644 --- a/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts +++ b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts @@ -1,8 +1,8 @@ +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { NodeTypes } from '@/node-types'; import { OFFICIAL_RISKY_NODE_TYPES, NODES_REPORT } from '@/security-audit/constants'; diff --git a/packages/cli/test/integration/security-audit/utils.ts b/packages/cli/test/integration/security-audit/utils.ts index 0c0737b60c..219d7e8408 100644 --- a/packages/cli/test/integration/security-audit/utils.ts +++ b/packages/cli/test/integration/security-audit/utils.ts @@ -1,12 +1,12 @@ import { GlobalConfig } from '@n8n/config'; import type { InstalledNodes } from '@n8n/db'; import type { InstalledPackages } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import nock from 'nock'; import { v4 as uuid } from 'uuid'; import * as constants from '@/constants'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { Risk } from '@/security-audit/types'; import { toReportTitle } from '@/security-audit/utils'; diff --git a/packages/cli/test/integration/services/workflow-static-data.service.test.ts b/packages/cli/test/integration/services/workflow-static-data.service.test.ts index 8cb2cbc1cc..de8c41125e 100644 --- a/packages/cli/test/integration/services/workflow-static-data.service.test.ts +++ b/packages/cli/test/integration/services/workflow-static-data.service.test.ts @@ -1,7 +1,7 @@ +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { Workflow } from 'n8n-workflow'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { NodeTypes } from '@/node-types'; import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/test/integration/shared/db/workflows.ts b/packages/cli/test/integration/shared/db/workflows.ts index afe86e4800..aceb75896e 100644 --- a/packages/cli/test/integration/shared/db/workflows.ts +++ b/packages/cli/test/integration/shared/db/workflows.ts @@ -4,6 +4,7 @@ import { Project } from '@n8n/db'; import { User } from '@n8n/db'; import { ProjectRepository } from '@n8n/db'; import { SharedWorkflowRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { WorkflowSharingRole } from '@n8n/permissions'; import type { DeepPartial } from '@n8n/typeorm'; @@ -11,8 +12,6 @@ import type { IWorkflowBase } from 'n8n-workflow'; import { NodeConnectionTypes } from 'n8n-workflow'; import { v4 as uuid } from 'uuid'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; - export async function createManyWorkflows( amount: number, attributes: Partial = {}, diff --git a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts index 93b75672d8..ab1764530f 100644 --- a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts @@ -1,10 +1,10 @@ import { CredentialsEntity } from '@n8n/db'; import { CredentialsRepository } from '@n8n/db'; import { SharedWorkflowRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { Telemetry } from '@/telemetry'; import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/test/integration/workflows/workflow.service.test.ts b/packages/cli/test/integration/workflows/workflow.service.test.ts index bb4cd54135..1557601b5b 100644 --- a/packages/cli/test/integration/workflows/workflow.service.test.ts +++ b/packages/cli/test/integration/workflows/workflow.service.test.ts @@ -1,9 +1,9 @@ import { SharedWorkflowRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import { mock } from 'jest-mock-extended'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { Telemetry } from '@/telemetry'; import { WorkflowFinderService } from '@/workflows/workflow-finder.service'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts index 7607e79c51..fd97a8b7ca 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts @@ -4,6 +4,7 @@ import type { WorkflowWithSharingsMetaDataAndCredentials } from '@n8n/db'; import { ProjectRepository } from '@n8n/db'; import { WorkflowHistoryRepository } from '@n8n/db'; import { SharedWorkflowRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { ProjectRole } from '@n8n/permissions'; import { ApplicationError, WorkflowActivationError, type INode } from 'n8n-workflow'; @@ -11,7 +12,6 @@ import { v4 as uuid } from 'uuid'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; import config from '@/config'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { UserManagementMailer } from '@/user-management/email'; import { mockInstance } from '@test/mocking'; import { createFolder } from '@test-integration/db/folders'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts index 74df66256f..baadbc6785 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts @@ -1,8 +1,10 @@ import type { User } from '@n8n/db'; import type { ListQueryDb } from '@n8n/db'; +import type { WorkflowFolderUnionFull } from '@n8n/db'; import { ProjectRepository } from '@n8n/db'; import { WorkflowHistoryRepository } from '@n8n/db'; import { SharedWorkflowRepository } from '@n8n/db'; +import { WorkflowRepository } from '@n8n/db'; import { Container } from '@n8n/di'; import type { Scope } from '@n8n/permissions'; import { DateTime } from 'luxon'; @@ -10,8 +12,6 @@ import { PROJECT_ROOT, type INode, type IPinData, type IWorkflowBase } from 'n8n import { v4 as uuid } from 'uuid'; import { ActiveWorkflowManager } from '@/active-workflow-manager'; -import type { WorkflowFolderUnionFull } from '@/databases/repositories/workflow.repository'; -import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { License } from '@/license'; import { ProjectService } from '@/services/project.service.ee'; import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';