refactor(core): Standardize filename casing for controllers and databases (no-changelog) (#10564)

This commit is contained in:
Iván Ovejero
2024-08-27 16:44:32 +02:00
committed by GitHub
parent be52176585
commit fd58a272e1
264 changed files with 566 additions and 565 deletions

View File

@@ -11,7 +11,7 @@ import { SecretsHelper } from '@/secrets-helpers';
import { WebhookService } from '@/webhooks/webhook.service';
import * as WebhookHelpers from '@/webhooks/webhook-helpers';
import * as AdditionalData from '@/workflow-execute-additional-data';
import type { WebhookEntity } from '@db/entities/WebhookEntity';
import type { WebhookEntity } from '@/databases/entities/webhook-entity';
import { NodeTypes } from '@/node-types';
import { ExecutionService } from '@/executions/execution.service';
import { WorkflowService } from '@/workflows/workflow.service';
@@ -21,7 +21,7 @@ import * as testDb from './shared/testDb';
import { createOwner } from './shared/db/users';
import { createWorkflow } from './shared/db/workflows';
import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
mockInstance(ActiveExecutions);
mockInstance(Push);

View File

@@ -3,7 +3,7 @@ import validator from 'validator';
import config from '@/config';
import { AUTH_COOKIE_NAME } from '@/constants';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { UserRepository } from '@db/repositories/user.repository';
import { MfaService } from '@/mfa/mfa.service';

View File

@@ -6,8 +6,8 @@ import { Reset } from '@/commands/ldap/reset';
import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import { getLdapSynchronizations, saveLdapSynchronization } from '@/ldap/helpers.ee';
import { LdapService } from '@/ldap/ldap.service.ee';
import { Push } from '@/push';

View File

@@ -3,10 +3,10 @@ import { Container } from 'typedi';
import { Reset } from '@/commands/user-management/reset';
import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
import { NodeTypes } from '@/node-types';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { CredentialsEntity } from '@db/entities/CredentialsEntity';
import { CredentialsEntity } from '@/databases/entities/credentials-entity';
import { SettingsRepository } from '@db/repositories/settings.repository';
import { UserRepository } from '@db/repositories/user.repository';

View File

@@ -1,7 +1,7 @@
import path from 'path';
import type { InstalledPackages } from '@db/entities/InstalledPackages';
import type { InstalledNodes } from '@db/entities/InstalledNodes';
import type { InstalledPackages } from '@/databases/entities/installed-packages';
import type { InstalledNodes } from '@/databases/entities/installed-nodes';
import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
import { CommunityPackagesService } from '@/services/communityPackages.service';

View File

@@ -24,7 +24,7 @@ import {
import type { User } from '@/databases/entities/User';
import type { UserInvitationResult } from '../../shared/utils/users';
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
describe('InvitationController', () => {
const mailer = mockInstance(UserManagementMailer);

View File

@@ -3,10 +3,10 @@ import { response as Response } from 'express';
import nock from 'nock';
import { parse as parseQs } from 'querystring';
import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
import type { User } from '@db/entities/User';
import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
import type { User } from '@/databases/entities/User';
import { CredentialsHelper } from '@/credentials-helper';
import { OAuth2CredentialController } from '@/controllers/oauth/oAuth2Credential.controller';
import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credential.controller';
import { createOwner } from '@test-integration/db/users';
import { saveCredential } from '@test-integration/db/credentials';

View File

@@ -3,10 +3,10 @@ import { In } from '@n8n/typeorm';
import config from '@/config';
import type { ListQuery } from '@/requests';
import type { User } from '@db/entities/User';
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
import type { User } from '@/databases/entities/User';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import { ProjectRepository } from '@db/repositories/project.repository';
import type { Project } from '@db/entities/Project';
import type { Project } from '@/databases/entities/project';
import { ProjectService } from '@/services/project.service';
import { UserManagementMailer } from '@/user-management/email';

View File

@@ -5,11 +5,11 @@ import { Credentials } from 'n8n-core';
import { randomString } from 'n8n-workflow';
import type { ListQuery } from '@/requests';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { ProjectRepository } from '@db/repositories/project.repository';
import type { Project } from '@db/entities/Project';
import type { Project } from '@/databases/entities/project';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import * as testDb from '../shared/testDb';
import { setupTestServer } from '../shared/utils';

View File

@@ -1,9 +1,9 @@
import type { User } from '@/databases/entities/User';
import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
import { saveCredential, shareCredentialWithUsers } from '../shared/db/credentials';
import { createMember } from '../shared/db/users';
import { randomCredentialPayload } from '../shared/random';
import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import Container from 'typedi';
import { CredentialsService } from '@/credentials/credentials.service';
import * as testDb from '../shared/testDb';

View File

@@ -5,7 +5,7 @@ import { createUser } from './shared/db/users';
import { createManyWorkflows } from './shared/db/workflows';
import type { User } from '@/databases/entities/User';
import { createWorkflowStatisticsItem } from './shared/db/workflowStatistics';
import { StatisticsNames } from '@/databases/entities/WorkflowStatistics';
import { StatisticsNames } from '@/databases/entities/workflow-statistics';
describe('CtaService', () => {
let ctaService: CtaService;

View File

@@ -1,6 +1,6 @@
import Container from 'typedi';
import { ExecutionRepository } from '@db/repositories/execution.repository';
import { ExecutionDataRepository } from '@db/repositories/executionData.repository';
import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository';
import * as testDb from '../../shared/testDb';
import { createWorkflow } from '../../shared/db/workflows';

View File

@@ -4,7 +4,7 @@ import * as testDb from '../../shared/testDb';
import { ProjectRepository } from '@/databases/repositories/project.repository';
import { EntityNotFoundError } from '@n8n/typeorm';
import { createTeamProject } from '../../shared/db/projects';
import { AuthIdentity } from '@/databases/entities/AuthIdentity';
import { AuthIdentity } from '@/databases/entities/auth-identity';
import { UserRepository } from '@/databases/repositories/user.repository';
describe('ProjectRepository', () => {

View File

@@ -1,7 +1,7 @@
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
import { ActiveWorkflowManager } from '@/active-workflow-manager';
import { generateNanoId } from '@/databases/utils/generators';
import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
import { OrchestrationService } from '@/services/orchestration.service';
import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee';

View File

@@ -1,6 +1,6 @@
import { Container } from 'typedi';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import config from '@/config';
import { SourceControlPreferencesService } from '@/environments/source-control/source-control-preferences.service.ee';
import { SourceControlService } from '@/environments/source-control/source-control.service.ee';

View File

@@ -9,7 +9,7 @@ import type { InstanceSettings } from 'n8n-core';
import * as testDb from '../shared/testDb';
import { SourceControlImportService } from '@/environments/source-control/source-control-import.service.ee';
import { createMember, getGlobalOwner } from '../shared/db/users';
import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import { mockInstance } from '../../shared/mocking';
import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file';
import type { ExportableCredential } from '@/environments/source-control/types/exportable-credential';

View File

@@ -13,7 +13,7 @@ import {
defaultMessageEventBusDestinationWebhookOptions,
} from 'n8n-workflow';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
import { EventMessageGeneric } from '@/eventbus/event-message-classes/event-message-generic';
import type { MessageEventBusDestinationSyslog } from '@/eventbus/message-event-bus-destination/message-event-bus-destination-syslog.ee';

View File

@@ -1,4 +1,4 @@
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
import { ExecutionRecoveryService } from '@/executions/execution-recovery.service';

View File

@@ -7,7 +7,7 @@ import { createExecution } from './shared/db/executions';
import * as testDb from './shared/testDb';
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
import type { ExecutionSummaries } from '@/executions/execution.types';
import { ExecutionMetadataRepository } from '@/databases/repositories/executionMetadata.repository';
import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
describe('ExecutionService', () => {
let executionService: ExecutionService;

View File

@@ -1,4 +1,4 @@
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { createSuccessfulExecution, getAllExecutions } from './shared/db/executions';
import { createMember, createOwner } from './shared/db/users';

View File

@@ -6,9 +6,9 @@ import type { INode } from 'n8n-workflow';
import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
import { TagRepository } from '@/databases/repositories/tag.repository';
import { ImportService } from '@/services/import.service';
import { TagEntity } from '@/databases/entities/TagEntity';
import { TagEntity } from '@/databases/entities/tag-entity';
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import * as testDb from './shared/testDb';
import { mockInstance } from '../shared/mocking';
@@ -20,8 +20,8 @@ import {
newWorkflow,
} from './shared/db/workflows';
import type { User } from '@db/entities/User';
import type { Project } from '@/databases/entities/Project';
import type { User } from '@/databases/entities/User';
import type { Project } from '@/databases/entities/project';
import { getPersonalProject } from './shared/db/projects';
describe('ImportService', () => {

View File

@@ -4,9 +4,9 @@ import { Not } from '@n8n/typeorm';
import { Cipher } from 'n8n-core';
import config from '@/config';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { UserRepository } from '@db/repositories/user.repository';
import { AuthProviderSyncHistoryRepository } from '@db/repositories/authProviderSyncHistory.repository';
import { AuthProviderSyncHistoryRepository } from '@/databases/repositories/auth-provider-sync-history.repository';
import { LDAP_DEFAULT_CONFIGURATION } from '@/ldap/constants';
import { LdapService } from '@/ldap/ldap.service.ee';
import { saveLdapSynchronization } from '@/ldap/helpers.ee';

View File

@@ -4,8 +4,8 @@ import * as testDb from './shared/testDb';
import Container from 'typedi';
import { createManyWorkflows } from './shared/db/workflows';
import { createManyCredentials } from './shared/db/credentials';
import { WorkflowStatisticsRepository } from '@/databases/repositories/workflowStatistics.repository';
import { StatisticsNames } from '@/databases/entities/WorkflowStatistics';
import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
import { StatisticsNames } from '@/databases/entities/workflow-statistics';
describe('LicenseMetricsRepository', () => {
let licenseMetricsRepository: LicenseMetricsRepository;

View File

@@ -1,7 +1,7 @@
import nock from 'nock';
import config from '@/config';
import { RESPONSE_ERROR_MESSAGES } from '@/constants';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import type { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces';
import { License } from '@/license';

View File

@@ -2,7 +2,7 @@ import { Container } from 'typedi';
import { IsNull } from '@n8n/typeorm';
import validator from 'validator';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { UserRepository } from '@db/repositories/user.repository';
import { ProjectRepository } from '@db/repositories/project.repository';

View File

@@ -3,8 +3,8 @@ import { randomInt, randomString } from 'n8n-workflow';
import { AuthService } from '@/auth/auth.service';
import config from '@/config';
import type { User } from '@db/entities/User';
import { AuthUserRepository } from '@db/repositories/authUser.repository';
import type { User } from '@/databases/entities/User';
import { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
import { TOTPService } from '@/mfa/totp.service';
import * as testDb from '../shared/testDb';

View File

@@ -2,7 +2,7 @@ import { Container } from 'typedi';
import validator from 'validator';
import config from '@/config';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { UserRepository } from '@db/repositories/user.repository';
import {

View File

@@ -7,7 +7,7 @@ import { randomString } from 'n8n-workflow';
import { AuthService } from '@/auth/auth.service';
import { License } from '@/license';
import config from '@/config';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { setCurrentAuthenticationMethod } from '@/sso/sso-helpers';
import { ExternalHooks } from '@/external-hooks';
import { JwtService } from '@/services/jwt.service';

View File

@@ -2,9 +2,9 @@ import { v4 as uuid } from 'uuid';
import { Container } from 'typedi';
import type { INode, INodeTypeData } from 'n8n-workflow';
import { randomInt } from 'n8n-workflow';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
import { NodeTypes } from '@/node-types';
import { OwnershipService } from '@/services/ownership.service';
@@ -16,10 +16,10 @@ import * as testDb from './shared/testDb';
import type { SaveCredentialFunction } from './shared/types';
import { affixRoleToSaveCredential } from './shared/db/credentials';
import { createOwner, createUser } from './shared/db/users';
import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import { getPersonalProject } from './shared/db/projects';
import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
import type { Project } from '@/databases/entities/Project';
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
import type { Project } from '@/databases/entities/project';
import { ProjectRepository } from '@/databases/repositories/project.repository';
const ownershipService = mockInstance(OwnershipService);

View File

@@ -9,9 +9,9 @@ import {
getProjectRelations,
} from './shared/db/projects';
import Container from 'typedi';
import type { Project } from '@/databases/entities/Project';
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
import type { ProjectRole } from '@/databases/entities/ProjectRelation';
import type { Project } from '@/databases/entities/project';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
import type { ProjectRole } from '@/databases/entities/project-relation';
import { EntityNotFoundError } from '@n8n/typeorm';
import { createWorkflow, shareWorkflowWithProjects } from './shared/db/workflows';
import {
@@ -21,8 +21,8 @@ import {
} from './shared/db/credentials';
import { randomCredentialPayload } from './shared/random';
import { getWorkflowById } from '@/PublicApi/v1/handlers/workflows/workflows.service';
import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/sharedCredentials.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import type { GlobalRole } from '@/databases/entities/User';
import type { Scope } from '@n8n/permissions';
import { CacheService } from '@/services/cache/cache.service';

View File

@@ -1,7 +1,7 @@
import Container from 'typedi';
import { ProjectService } from '@/services/project.service';
import * as testDb from './shared/testDb';
import { SharedWorkflowRepository } from '@/databases/repositories/sharedWorkflow.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { createUser } from './shared/db/users';
import { createWorkflow } from './shared/db/workflows';
import { linkUserToProject, createTeamProject } from './shared/db/projects';

View File

@@ -4,8 +4,8 @@ import type { ExecutionStatus } from 'n8n-workflow';
import Container from 'typedi';
import * as testDb from './shared/testDb';
import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
import type { ExecutionEntity } from '@db/entities/execution-entity';
import type { WorkflowEntity } from '@db/entities/workflow-entity';
import { ExecutionRepository } from '@db/repositories/execution.repository';
import { TIME } from '@/constants';
import { PruningService } from '@/services/pruning.service';

View File

@@ -1,9 +1,9 @@
import { Container } from 'typedi';
import { randomString } from 'n8n-workflow';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import { randomApiKey, randomName } from '../shared/random';
import * as utils from '../shared/utils/';

View File

@@ -1,4 +1,4 @@
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import type { ActiveWorkflowManager } from '@/active-workflow-manager';
import { randomApiKey } from '../shared/random';
@@ -21,7 +21,7 @@ import type { SuperAgentTest } from '../shared/types';
import { mockInstance } from '@test/mocking';
import { Telemetry } from '@/telemetry';
import { createTeamProject } from '@test-integration/db/projects';
import type { ExecutionEntity } from '@/databases/entities/ExecutionEntity';
import type { ExecutionEntity } from '@/databases/entities/execution-entity';
let owner: User;
let user1: User;

View File

@@ -1,5 +1,5 @@
import { Container } from 'typedi';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { TagRepository } from '@db/repositories/tag.repository';
import { randomApiKey } from '../shared/random';

View File

@@ -3,12 +3,12 @@ import type { INode } from 'n8n-workflow';
import config from '@/config';
import { STARTING_NODES } from '@/constants';
import type { TagEntity } from '@db/entities/TagEntity';
import type { User } from '@db/entities/User';
import type { Project } from '@db/entities/Project';
import type { TagEntity } from '@/databases/entities/tag-entity';
import type { User } from '@/databases/entities/User';
import type { Project } from '@/databases/entities/project';
import { ProjectRepository } from '@db/repositories/project.repository';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository';
import { ActiveWorkflowManager } from '@/active-workflow-manager';
import { ExecutionService } from '@/executions/execution.service';

View File

@@ -1,10 +1,10 @@
import { Container } from 'typedi';
import type { Scope } from '@n8n/permissions';
import type { GlobalRole } from '@db/entities/User';
import type { ProjectRole } from '@db/entities/ProjectRelation';
import type { CredentialSharingRole } from '@db/entities/SharedCredentials';
import type { WorkflowSharingRole } from '@db/entities/SharedWorkflow';
import type { GlobalRole } from '@/databases/entities/User';
import type { ProjectRole } from '@/databases/entities/project-relation';
import type { CredentialSharingRole } from '@/databases/entities/shared-credentials';
import type { WorkflowSharingRole } from '@/databases/entities/shared-workflow';
import { RoleService } from '@/services/role.service';
import * as utils from './shared/utils/';

View File

@@ -1,4 +1,4 @@
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { setSamlLoginEnabled } from '@/sso/saml/saml-helpers';
import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/sso-helpers';

View File

@@ -9,7 +9,7 @@ import { WorkflowRepository } from '@db/repositories/workflow.repository';
import Container from 'typedi';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { ExecutionRepository } from '@db/repositories/execution.repository';
import { ExecutionDataRepository } from '@db/repositories/executionData.repository';
import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository';
let securityAuditService: SecurityAuditService;

View File

@@ -3,8 +3,8 @@ import { v4 as uuid } from 'uuid';
import { toReportTitle } from '@/security-audit/utils';
import * as constants from '@/constants';
import type { Risk } from '@/security-audit/types';
import type { InstalledNodes } from '@db/entities/InstalledNodes';
import type { InstalledPackages } from '@db/entities/InstalledPackages';
import type { InstalledNodes } from '@/databases/entities/installed-nodes';
import type { InstalledPackages } from '@/databases/entities/installed-packages';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import Container from 'typedi';
import { GlobalConfig } from '@n8n/config';

View File

@@ -1,6 +1,6 @@
import * as testDb from '../shared/testDb';
import Container from 'typedi';
import { ExecutionMetadataRepository } from '@/databases/repositories/executionMetadata.repository';
import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
import { ExecutionMetadataService } from '@/services/executionMetadata.service';
import { createExecution } from '@test-integration/db/executions';
import { createWorkflow } from '@test-integration/db/workflows';

View File

@@ -3,8 +3,8 @@ import * as testDb from '../shared/testDb';
import Container from 'typedi';
import { createMember } from '../shared/db/users';
import { ProjectRepository } from '@/databases/repositories/project.repository';
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
import type { ProjectRole } from '@/databases/entities/ProjectRelation';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
import type { ProjectRole } from '@/databases/entities/project-relation';
import type { Scope } from '@n8n/permissions';
let projectRepository: ProjectRepository;

View File

@@ -1,13 +1,13 @@
import { Container } from 'typedi';
import { CredentialsEntity } from '@db/entities/CredentialsEntity';
import type { User } from '@db/entities/User';
import { CredentialsEntity } from '@/databases/entities/credentials-entity';
import type { User } from '@/databases/entities/User';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
import type { CredentialSharingRole } from '@db/entities/SharedCredentials';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import type { CredentialSharingRole } from '@/databases/entities/shared-credentials';
import type { ICredentialsDb } from '@/Interfaces';
import type { CredentialPayload } from '../types';
import { ProjectRepository } from '@/databases/repositories/project.repository';
import type { Project } from '@/databases/entities/Project';
import type { Project } from '@/databases/entities/project';
export async function encryptCredentialData(
credential: CredentialsEntity,

View File

@@ -1,10 +1,10 @@
import Container from 'typedi';
import type { ExecutionData } from '@db/entities/ExecutionData';
import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
import type { ExecutionData } from '@/databases/entities/execution-data';
import type { ExecutionEntity } from '@db/entities/execution-entity';
import type { WorkflowEntity } from '@db/entities/workflow-entity';
import { ExecutionRepository } from '@db/repositories/execution.repository';
import { ExecutionDataRepository } from '@db/repositories/executionData.repository';
import { ExecutionMetadataRepository } from '@/databases/repositories/executionMetadata.repository';
import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository';
import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
export async function createManyExecutions(
amount: number,

View File

@@ -2,10 +2,10 @@ import Container from 'typedi';
import { ProjectRepository } from '@/databases/repositories/project.repository';
import { randomName } from '../random';
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
import type { User } from '@/databases/entities/User';
import type { Project } from '@/databases/entities/Project';
import type { ProjectRelation, ProjectRole } from '@/databases/entities/ProjectRelation';
import type { Project } from '@/databases/entities/project';
import type { ProjectRelation, ProjectRole } from '@/databases/entities/project-relation';
export const createTeamProject = async (name?: string, adminUser?: User) => {
const projectRepository = Container.get(ProjectRepository);

View File

@@ -1,8 +1,8 @@
import Container from 'typedi';
import type { TagEntity } from '@db/entities/TagEntity';
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
import type { TagEntity } from '@/databases/entities/tag-entity';
import type { WorkflowEntity } from '@db/entities/workflow-entity';
import { TagRepository } from '@db/repositories/tag.repository';
import { WorkflowTagMappingRepository } from '@db/repositories/workflowTagMapping.repository';
import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
import { generateNanoId } from '@db/utils/generators';
import { randomName } from '../random';

View File

@@ -1,14 +1,14 @@
import Container from 'typedi';
import { hash } from 'bcryptjs';
import { AuthIdentity } from '@db/entities/AuthIdentity';
import { type GlobalRole, type User } from '@db/entities/User';
import { AuthIdentityRepository } from '@db/repositories/authIdentity.repository';
import { AuthIdentity } from '@/databases/entities/auth-identity';
import { type GlobalRole, type User } from '@/databases/entities/User';
import { AuthIdentityRepository } from '@db/repositories/auth-identity.repository';
import { UserRepository } from '@db/repositories/user.repository';
import { TOTPService } from '@/mfa/totp.service';
import { MfaService } from '@/mfa/mfa.service';
import { randomApiKey, randomEmail, randomName, randomValidPassword } from '../random';
import { AuthUserRepository } from '@/databases/repositories/authUser.repository';
import { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
// pre-computed bcrypt hash for the string 'password', using `await hash('password', 10)`
const passwordHash = '$2a$10$njedH7S6V5898mj6p0Jr..IGY9Ms.qNwR7RbSzzX9yubJocKfvGGK';

View File

@@ -1,7 +1,7 @@
import Container from 'typedi';
import { v4 as uuid } from 'uuid';
import type { WorkflowHistory } from '@db/entities/WorkflowHistory';
import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
import type { WorkflowHistory } from '@/databases/entities/workflow-history';
import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository';
export async function createWorkflowHistoryItem(
workflowId: string,

View File

@@ -1,7 +1,7 @@
import Container from 'typedi';
import { StatisticsNames, type WorkflowStatistics } from '@/databases/entities/WorkflowStatistics';
import { StatisticsNames, type WorkflowStatistics } from '@/databases/entities/workflow-statistics';
import type { Workflow } from 'n8n-workflow';
import { WorkflowStatisticsRepository } from '@/databases/repositories/workflowStatistics.repository';
import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
export async function createWorkflowStatisticsItem(
workflowId: Workflow['id'],

View File

@@ -2,13 +2,13 @@ import Container from 'typedi';
import type { DeepPartial } from '@n8n/typeorm';
import { v4 as uuid } from 'uuid';
import { User } from '@db/entities/User';
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { User } from '@/databases/entities/User';
import type { WorkflowEntity } from '@db/entities/workflow-entity';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import type { SharedWorkflow, WorkflowSharingRole } from '@db/entities/SharedWorkflow';
import type { SharedWorkflow, WorkflowSharingRole } from '@/databases/entities/shared-workflow';
import { ProjectRepository } from '@/databases/repositories/project.repository';
import { Project } from '@/databases/entities/Project';
import { Project } from '@/databases/entities/project';
import { NodeConnectionType } from 'n8n-workflow';
export async function createManyWorkflows(

View File

@@ -7,6 +7,7 @@ import { randomString } from 'n8n-workflow';
import * as Db from '@/Db';
import { getOptionOverrides } from '@db/config';
import { kebabCase } from 'lodash';
export const testDbPrefix = 'n8n_test_';
@@ -80,7 +81,7 @@ const repositories = [
export async function truncate(names: Array<(typeof repositories)[number]>) {
for (const name of names) {
const RepositoryClass: Class<Repository<object>> = (
await import(`@db/repositories/${name.charAt(0).toLowerCase() + name.slice(1)}.repository`)
await import(`@db/repositories/${kebabCase(name)}.repository`)
)[`${name}Repository`];
await Container.get(RepositoryClass).delete({});
}

View File

@@ -3,11 +3,11 @@ import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
import type TestAgent from 'supertest/lib/agent';
import type { Server } from 'http';
import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
import type { User } from '@db/entities/User';
import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
import type { User } from '@/databases/entities/User';
import type { BooleanLicenseFeature, ICredentialsDb, NumericLicenseFeature } from '@/Interfaces';
import type { LicenseMocker } from './license';
import type { Project } from '@/databases/entities/Project';
import type { Project } from '@/databases/entities/project';
type EndpointGroup =
| 'me'

View File

@@ -1,10 +1,10 @@
import { NODE_PACKAGE_PREFIX } from '@/constants';
import { InstalledPackages } from '@db/entities/InstalledPackages';
import { InstalledPackages } from '@/databases/entities/installed-packages';
import { randomName } from '../random';
import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '../constants';
import { InstalledNodesRepository } from '@db/repositories/installedNodes.repository';
import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
import { InstalledNodesRepository } from '@/databases/repositories/installed-nodes.repository';
import { InstalledPackagesRepository } from '@/databases/repositories/installed-packages.repository';
import Container from 'typedi';
export const mockPackageName = () => NODE_PACKAGE_PREFIX + randomName();

View File

@@ -10,7 +10,7 @@ import type request from 'supertest';
import { v4 as uuid } from 'uuid';
import config from '@/config';
import { WorkflowEntity } from '@db/entities/WorkflowEntity';
import { WorkflowEntity } from '@db/entities/workflow-entity';
import { SettingsRepository } from '@db/repositories/settings.repository';
import { AUTH_COOKIE_NAME } from '@/constants';
import { ExecutionService } from '@/executions/execution.service';

View File

@@ -7,7 +7,7 @@ import { URL } from 'url';
import config from '@/config';
import { AUTH_COOKIE_NAME } from '@/constants';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { ControllerRegistry } from '@/decorators';
import { rawBodyReader, bodyParser } from '@/middlewares';
import { PostHogClient } from '@/posthog';
@@ -158,7 +158,7 @@ export const setupTestServer = ({
break;
case 'oauth2':
await import('@/controllers/oauth/oAuth2Credential.controller');
await import('@/controllers/oauth/oauth2-credential.controller');
break;
case 'mfa':
@@ -183,7 +183,7 @@ export const setupTestServer = ({
break;
case 'community-packages':
await import('@/controllers/communityPackages.controller');
await import('@/controllers/community-packages.controller');
break;
case 'me':
@@ -191,7 +191,7 @@ export const setupTestServer = ({
break;
case 'passwordReset':
await import('@/controllers/passwordReset.controller');
await import('@/controllers/password-reset.controller');
break;
case 'owner':
@@ -219,7 +219,7 @@ export const setupTestServer = ({
break;
case 'binaryData':
await import('@/controllers/binaryData.controller');
await import('@/controllers/binary-data.controller');
break;
case 'debug':
@@ -235,7 +235,7 @@ export const setupTestServer = ({
break;
case 'dynamic-node-parameters':
await import('@/controllers/dynamicNodeParameters.controller');
await import('@/controllers/dynamic-node-parameters.controller');
break;
}
}

View File

@@ -1,5 +1,5 @@
import type { INode } from 'n8n-workflow';
import { WorkflowEntity } from '@db/entities/WorkflowEntity';
import { WorkflowEntity } from '@db/entities/workflow-entity';
export const FIRST_CREDENTIAL_ID = '1';
export const SECOND_CREDENTIAL_ID = '2';

View File

@@ -3,7 +3,7 @@ import { UserRepository } from '@db/repositories/user.repository';
import { createAdmin, createMember, createOwner } from './shared/db/users';
import * as testDb from './shared/testDb';
import { randomEmail } from './shared/random';
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
describe('UserRepository', () => {
let userRepository: UserRepository;

View File

@@ -3,12 +3,12 @@ import { v4 as uuid } from 'uuid';
import { RESPONSE_ERROR_MESSAGES } from '@/constants';
import { UsersController } from '@/controllers/users.controller';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { ProjectRepository } from '@db/repositories/project.repository';
import { ProjectRelationRepository } from '@db/repositories/projectRelation.repository';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
import { UserRepository } from '@db/repositories/user.repository';
import { SharedCredentialsRepository } from '@db/repositories/sharedCredentials.repository';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { CacheService } from '@/services/cache/cache.service';
import { ExecutionService } from '@/executions/execution.service';

View File

@@ -1,6 +1,6 @@
import { Container } from 'typedi';
import type { Variables } from '@db/entities/Variables';
import type { Variables } from '@/databases/entities/Variables';
import { VariablesRepository } from '@db/repositories/variables.repository';
import { generateNanoId } from '@db/utils/generators';
import { VariablesService } from '@/environments/variables/variables.service.ee';

View File

@@ -6,7 +6,7 @@ import { AbstractServer } from '@/abstract-server';
import { ExternalHooks } from '@/external-hooks';
import { NodeTypes } from '@/node-types';
import { Push } from '@/push';
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
import type { WorkflowEntity } from '@db/entities/workflow-entity';
import { mockInstance } from '../shared/mocking';
import { initActiveWorkflowManager } from './shared/utils';

View File

@@ -1,7 +1,7 @@
import Container from 'typedi';
import * as testDb from './shared/testDb';
import { WorkflowTagMappingRepository } from '@/databases/repositories/workflowTagMapping.repository';
import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
import { createWorkflow } from './shared/db/workflows';
import { TagRepository } from '@/databases/repositories/tag.repository';

View File

@@ -1,4 +1,4 @@
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import * as testDb from './shared/testDb';
import * as utils from './shared/utils/';

View File

@@ -3,7 +3,7 @@ import { In } from '@n8n/typeorm';
import { DateTime } from 'luxon';
import config from '@/config';
import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository';
import { License } from '@/license';
import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee';

View File

@@ -1,8 +1,8 @@
import Container from 'typedi';
import { mock } from 'jest-mock-extended';
import { CredentialsEntity } from '@db/entities/CredentialsEntity';
import { CredentialsEntity } from '@/databases/entities/credentials-entity';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import { Telemetry } from '@/telemetry';
import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee';

View File

@@ -1,7 +1,7 @@
import Container from 'typedi';
import { mock } from 'jest-mock-extended';
import { ActiveWorkflowManager } from '@/active-workflow-manager';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus';
import { Telemetry } from '@/telemetry';

View File

@@ -1,6 +1,6 @@
import Container from 'typedi';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { WorkflowSharingService } from '@/workflows/workflow-sharing.service';
import * as testDb from '../shared/testDb';

View File

@@ -1,4 +1,4 @@
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import * as utils from '../shared/utils/';
import * as testDb from '../shared/testDb';

View File

@@ -3,10 +3,10 @@ import { v4 as uuid } from 'uuid';
import { ApplicationError, WorkflowActivationError, type INode } from 'n8n-workflow';
import config from '@/config';
import type { Project } from '@db/entities/Project';
import type { Project } from '@/databases/entities/project';
import { ProjectRepository } from '@db/repositories/project.repository';
import type { User } from '@db/entities/User';
import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
import type { User } from '@/databases/entities/User';
import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository';
import { ActiveWorkflowManager } from '@/active-workflow-manager';
import { License } from '@/license';
import { UserManagementMailer } from '@/user-management/email';

View File

@@ -3,12 +3,12 @@ import { v4 as uuid } from 'uuid';
import type { INode, IPinData } from 'n8n-workflow';
import type { Scope } from '@n8n/permissions';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
import type { WorkflowEntity } from '@db/entities/workflow-entity';
import type { ListQuery } from '@/requests';
import { WorkflowHistoryRepository } from '@db/repositories/workflowHistory.repository';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { WorkflowHistoryRepository } from '@db/repositories/workflow-history.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { ProjectRepository } from '@db/repositories/project.repository';
import { ProjectService } from '@/services/project.service';
import { ActiveWorkflowManager } from '@/active-workflow-manager';