refactor(core): Standardize filename casing for controllers and databases (no-changelog) (#10564)
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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'],
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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({});
|
||||
}
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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';
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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';
|
||||
|
||||
Reference in New Issue
Block a user