refactor(core): Use @/databases/ instead of @db/ (no-changelog) (#…

…10573)

packages/cli/src/Db.ts

@@ -7,8 +7,8 @@ import { ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 
 import { inTest } from '@/constants';
 import { wrapMigration } from '@/databases/utils/migration-helpers';
-import type { Migration } from '@db/types';
-import { getConnectionOptions } from '@db/config';
+import type { Migration } from '@/databases/types';
+import { getConnectionOptions } from '@/databases/config';
 
 let connection: Connection;
 

packages/cli/src/Interfaces.ts

@@ -35,10 +35,10 @@ import type { AuthProviderType } from '@/databases/entities/auth-identity';
 import type { SharedCredentials } from '@/databases/entities/shared-credentials';
 import type { TagEntity } from '@/databases/entities/tag-entity';
 import type { AssignableRole, GlobalRole, User } from '@/databases/entities/User';
-import type { CredentialsRepository } from '@db/repositories/credentials.repository';
-import type { SettingsRepository } from '@db/repositories/settings.repository';
-import type { UserRepository } from '@db/repositories/user.repository';
-import type { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import type { SettingsRepository } from '@/databases/repositories/settings.repository';
+import type { UserRepository } from '@/databases/repositories/user.repository';
+import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { ExternalHooks } from './external-hooks';
 import type { LICENSE_FEATURES, LICENSE_QUOTAS } from './constants';
 import type { WorkflowWithSharingsAndCredentials } from './workflows/workflows.types';

packages/cli/src/PublicApi/index.ts

@@ -11,7 +11,7 @@ import type { OpenAPIV3 } from 'openapi-types';
 import type { JsonObject } from 'swagger-ui-express';
 
 import { License } from '@/license';
-import { UserRepository } from '@db/repositories/user.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { UrlService } from '@/services/url.service';
 import type { AuthenticatedRequest } from '@/requests';
 import { GlobalConfig } from '@n8n/config';

packages/cli/src/PublicApi/types.ts

@@ -1,6 +1,6 @@
 import type { ExecutionStatus, ICredentialDataDecryptedObject } from 'n8n-workflow';
 
-import type { WorkflowEntity } from '@db/entities/workflow-entity';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import type { TagEntity } from '@/databases/entities/tag-entity';
 import type { Risk } from '@/security-audit/types';
 import type { AuthlessRequest, AuthenticatedRequest } from '@/requests';

packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts

@@ -14,7 +14,7 @@ import { ExternalHooks } from '@/external-hooks';
 import type { IDependency, IJsonSchema } from '../../../types';
 import type { CredentialRequest } from '@/requests';
 import { Container } from 'typedi';
-import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { EventService } from '@/events/event.service';

packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts

@@ -8,7 +8,7 @@ import type { ExecutionRequest } from '../../../types';
 import { getSharedWorkflowIds } from '../workflows/workflows.service';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
 import { EventService } from '@/events/event.service';
-import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
 
 export = {

packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts

@@ -8,7 +8,7 @@ import { encodeNextCursor } from '../../shared/services/pagination.service';
 import { Container } from 'typedi';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { FindManyOptions } from '@n8n/typeorm';
-import { TagRepository } from '@db/repositories/tag.repository';
+import { TagRepository } from '@/databases/repositories/tag.repository';
 import { TagService } from '@/services/tag.service';
 
 export = {

packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts

@@ -1,5 +1,5 @@
 import { Container } from 'typedi';
-import { UserRepository } from '@db/repositories/user.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import type { User } from '@/databases/entities/User';
 import pick from 'lodash/pick';
 import { validate as uuidValidate } from 'uuid';

packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts

@@ -9,7 +9,7 @@ import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import config from '@/config';
-import { WorkflowEntity } from '@db/entities/workflow-entity';
+import { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ExternalHooks } from '@/external-hooks';
 import { addNodeIds, replaceInvalidCredentials } from '@/workflow-helpers';
 import type { WorkflowRequest } from '../../../types';

packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts

@@ -1,13 +1,13 @@
 import { Container } from 'typedi';
 import * as Db from '@/Db';
 import type { User } from '@/databases/entities/User';
-import { WorkflowEntity } from '@db/entities/workflow-entity';
+import { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { WorkflowTagMapping } from '@/databases/entities/workflow-tag-mapping';
 import { SharedWorkflow, type WorkflowSharingRole } from '@/databases/entities/shared-workflow';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import type { Project } from '@/databases/entities/project';
-import { TagRepository } from '@db/repositories/tag.repository';
+import { TagRepository } from '@/databases/repositories/tag.repository';
 import { License } from '@/license';
 import { WorkflowSharingService } from '@/workflows/workflow-sharing.service';
 import type { Scope } from '@n8n/permissions';

packages/cli/src/__tests__/active-executions.test.ts

@@ -4,7 +4,7 @@ import { v4 as uuid } from 'uuid';
 import type { IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
 import { createDeferredPromise } from 'n8n-workflow';
 import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
-import type { ExecutionRepository } from '@db/repositories/execution.repository';
+import type { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { mock } from 'jest-mock-extended';
 import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
 import { mockInstance } from '@test/mocking';

packages/cli/src/__tests__/credentials-helper.test.ts

@@ -12,7 +12,7 @@ import { Workflow } from 'n8n-workflow';
 import { CredentialsHelper } from '@/credentials-helper';
 import { NodeTypes } from '@/node-types';
 import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
-import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { mockInstance } from '@test/mocking';
 

packages/cli/src/active-executions.ts

@@ -22,7 +22,7 @@ import type {
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
 import { isWorkflowIdValid } from '@/utils';
-import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { Logger } from '@/logger';
 import { ConcurrencyControlService } from './concurrency/concurrency-control.service';
 import config from './config';

packages/cli/src/active-workflow-manager.ts

@@ -30,7 +30,7 @@ import type { IWorkflowDb } from '@/Interfaces';
 import * as WebhookHelpers from '@/webhooks/webhook-helpers';
 import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
 
-import type { WorkflowEntity } from '@db/entities/workflow-entity';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
 import { ActiveExecutions } from '@/active-executions';
 import { ExecutionService } from './executions/execution.service';
 import {
@@ -42,7 +42,7 @@ import { NodeTypes } from '@/node-types';
 import { ExternalHooks } from '@/external-hooks';
 import { WebhookService } from '@/webhooks/webhook.service';
 import { Logger } from './logger';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { OrchestrationService } from '@/services/orchestration.service';
 import { ActivationErrorsService } from '@/activation-errors.service';
 import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';

packages/cli/src/auth/__tests__/auth.service.test.ts

@@ -7,7 +7,7 @@ import config from '@/config';
 import { AUTH_COOKIE_NAME, Time } from '@/constants';
 import type { User } from '@/databases/entities/User';
 import type { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
-import type { UserRepository } from '@db/repositories/user.repository';
+import type { UserRepository } from '@/databases/repositories/user.repository';
 import { JwtService } from '@/services/jwt.service';
 import type { UrlService } from '@/services/url.service';
 import type { AuthenticatedRequest } from '@/requests';

packages/cli/src/auth/auth.service.ts

@@ -7,7 +7,7 @@ import config from '@/config';
 import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants';
 import type { User } from '@/databases/entities/User';
 import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
-import { UserRepository } from '@db/repositories/user.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import { License } from '@/license';

packages/cli/src/auth/methods/email.ts

@@ -2,7 +2,7 @@ import type { User } from '@/databases/entities/User';
 import { PasswordUtility } from '@/services/password.utility';
 import { Container } from 'typedi';
 import { isLdapLoginEnabled } from '@/ldap/helpers.ee';
-import { UserRepository } from '@db/repositories/user.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { EventService } from '@/events/event.service';
 

packages/cli/src/commands/base-command.ts

@@ -19,7 +19,7 @@ import { PostHogClient } from '@/posthog';
 import { License } from '@/license';
 import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee';
 import { initExpressionEvaluator } from '@/expression-evaluator';
-import { generateHostInstanceId } from '@db/utils/generators';
+import { generateHostInstanceId } from '@/databases/utils/generators';
 import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee';
 import { ShutdownService } from '@/shutdown/shutdown.service';
 import { TelemetryEventRelay } from '@/events/telemetry-event-relay';

packages/cli/src/commands/db/revert.ts

@@ -5,8 +5,8 @@ import type { DataSourceOptions as ConnectionOptions } from '@n8n/typeorm';
 import { MigrationExecutor, DataSource as Connection } from '@n8n/typeorm';
 import { Container } from 'typedi';
 import { Logger } from '@/logger';
-import { getConnectionOptions } from '@db/config';
-import type { Migration } from '@db/types';
+import { getConnectionOptions } from '@/databases/config';
+import type { Migration } from '@/databases/types';
 import { wrapMigration } from '@/databases/utils/migration-helpers';
 
 // This function is extracted to make it easier to unit test it.

packages/cli/src/commands/execute.ts

@@ -9,7 +9,7 @@ import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { findCliWorkflowStart, isWorkflowIdValid } from '@/utils';
 import { BaseCommand } from './base-command';
 
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { OwnershipService } from '@/services/ownership.service';
 
 export class Execute extends BaseCommand {

packages/cli/src/commands/executeBatch.ts

@@ -13,7 +13,7 @@ import { ActiveExecutions } from '@/active-executions';
 import { WorkflowRunner } from '@/workflow-runner';
 import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import type { User } from '@/databases/entities/User';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { OwnershipService } from '@/services/ownership.service';
 import { findCliWorkflowStart } from '@/utils';
 

packages/cli/src/commands/export/credentials.ts

@@ -4,7 +4,7 @@ import path from 'path';
 import { Credentials } from 'n8n-core';
 import type { ICredentialsDb, ICredentialsDecryptedDb } from '@/Interfaces';
 import { BaseCommand } from '../base-command';
-import { CredentialsRepository } from '@db/repositories/credentials.repository';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
 import Container from 'typedi';
 import { ApplicationError } from 'n8n-workflow';
 

packages/cli/src/commands/export/workflow.ts

@@ -2,7 +2,7 @@ import { Flags } from '@oclif/core';
 import fs from 'fs';
 import path from 'path';
 import { BaseCommand } from '../base-command';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import Container from 'typedi';
 import { ApplicationError } from 'n8n-workflow';
 

packages/cli/src/commands/import/workflow.ts

@@ -5,10 +5,10 @@ import fs from 'fs';
 import glob from 'fast-glob';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
-import type { WorkflowEntity } from '@db/entities/workflow-entity';
-import { generateNanoId } from '@db/utils/generators';
-import { UserRepository } from '@db/repositories/user.repository';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
+import { generateNanoId } from '@/databases/utils/generators';
+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';
 import { BaseCommand } from '../base-command';

packages/cli/src/commands/ldap/reset.ts

@@ -1,9 +1,9 @@
 import Container from 'typedi';
 import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/ldap/constants';
-import { AuthIdentityRepository } from '@db/repositories/auth-identity.repository';
+import { AuthIdentityRepository } from '@/databases/repositories/auth-identity.repository';
 import { AuthProviderSyncHistoryRepository } from '@/databases/repositories/auth-provider-sync-history.repository';
-import { SettingsRepository } from '@db/repositories/settings.repository';
-import { UserRepository } from '@db/repositories/user.repository';
+import { SettingsRepository } from '@/databases/repositories/settings.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { BaseCommand } from '../base-command';
 import { Flags } from '@oclif/core';
 import { ApplicationError } from 'n8n-workflow';

packages/cli/src/commands/license/clear.ts

@@ -1,7 +1,7 @@
 import { Container } from 'typedi';
 import { SETTINGS_LICENSE_CERT_KEY } from '@/constants';
 import { BaseCommand } from '../base-command';
-import { SettingsRepository } from '@db/repositories/settings.repository';
+import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { License } from '@/license';
 
 export class ClearLicenseCommand extends BaseCommand {

packages/cli/src/commands/list/workflow.ts

@@ -1,6 +1,6 @@
 import Container from 'typedi';
 import { Flags } from '@oclif/core';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { BaseCommand } from '../base-command';
 
 export class ListWorkflowCommand extends BaseCommand {

packages/cli/src/commands/start.ts

@@ -21,8 +21,8 @@ import { OrchestrationService } from '@/services/orchestration.service';
 import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service';
 import { PruningService } from '@/services/pruning.service';
 import { UrlService } from '@/services/url.service';
-import { SettingsRepository } from '@db/repositories/settings.repository';
-import { ExecutionRepository } from '@db/repositories/execution.repository';
+import { SettingsRepository } from '@/databases/repositories/settings.repository';
+import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import { WaitTracker } from '@/wait-tracker';
 import { BaseCommand } from './base-command';

packages/cli/src/commands/update/workflow.ts

@@ -1,6 +1,6 @@
 import { Container } from 'typedi';
 import { Flags } from '@oclif/core';
-import { WorkflowRepository } from '@db/repositories/workflow.repository';
+import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { BaseCommand } from '../base-command';
 
 export class UpdateWorkflowCommand extends BaseCommand {

packages/cli/src/commands/user-management/reset.ts

@@ -1,11 +1,11 @@
 import { Container } from 'typedi';
 import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
 import { User } from '@/databases/entities/User';
-import { CredentialsRepository } from '@db/repositories/credentials.repository';
-import { SettingsRepository } from '@db/repositories/settings.repository';
+import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
+import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
-import { UserRepository } from '@db/repositories/user.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { BaseCommand } from '../base-command';
 import { ProjectRepository } from '@/databases/repositories/project.repository';
 

packages/cli/src/controllers/__tests__/me.controller.test.ts

@@ -17,7 +17,7 @@ import { badPasswords } from '@test/testData';
 import { mockInstance } from '@test/mocking';
 import { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
 import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
-import { UserRepository } from '@db/repositories/user.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { MfaService } from '@/mfa/mfa.service';
 import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';
 

packages/cli/src/controllers/__tests__/owner.controller.test.ts

@@ -7,8 +7,8 @@ import type { AuthService } from '@/auth/auth.service';
 import config from '@/config';
 import { OwnerController } from '@/controllers/owner.controller';
 import type { User } from '@/databases/entities/User';
-import type { SettingsRepository } from '@db/repositories/settings.repository';
-import type { UserRepository } from '@db/repositories/user.repository';
+import type { SettingsRepository } from '@/databases/repositories/settings.repository';
+import type { UserRepository } from '@/databases/repositories/user.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { License } from '@/license';
 import type { OwnerRequest } from '@/requests';

packages/cli/src/controllers/e2e.controller.ts

@@ -1,8 +1,8 @@
 import { Request } from 'express';
 import { v4 as uuid } from 'uuid';
 import config from '@/config';
-import { SettingsRepository } from '@db/repositories/settings.repository';
-import { UserRepository } from '@db/repositories/user.repository';
+import { SettingsRepository } from '@/databases/repositories/settings.repository';
+import { UserRepository } from '@/databases/repositories/user.repository';
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
 import { License } from '@/license';