mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/src/services/__tests__/ExecutionMetadataService.test.ts
View File

@@ -1,5 +1,5 @@
import { Container } from 'typedi';
import { ExecutionMetadataRepository } from '@db/repositories/executionMetadata.repository';
import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
import { ExecutionMetadataService } from '@/services/executionMetadata.service';
import { mockInstance } from '@test/mocking';

6
packages/cli/src/services/__tests__/activeWorkflows.service.test.ts
View File

@@ -1,11 +1,11 @@
import type { ActivationErrorsService } from '@/activation-errors.service';
import type { User } from '@db/entities/User';
import type { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import type { User } from '@/databases/entities/User';
import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import type { WorkflowRepository } from '@db/repositories/workflow.repository';
import { ActiveWorkflowsService } from '@/services/activeWorkflows.service';
import { mock } from 'jest-mock-extended';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
import { WorkflowEntity } from '@/databases/entities/workflow-entity';
describe('ActiveWorkflowsService', () => {
const user = mock<User>();

8
packages/cli/src/services/__tests__/communityPackages.service.test.ts
View File

@@ -13,12 +13,12 @@ import {
NPM_PACKAGE_STATUS_GOOD,
RESPONSE_ERROR_MESSAGES,
} from '@/constants';
import { InstalledPackages } from '@db/entities/InstalledPackages';
import { InstalledPackages } from '@/databases/entities/installed-packages';
import type { CommunityPackages } from '@/Interfaces';
import { CommunityPackagesService } from '@/services/communityPackages.service';
import { InstalledNodesRepository } from '@db/repositories/installedNodes.repository';
import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
import { InstalledNodes } from '@db/entities/InstalledNodes';
import { InstalledNodesRepository } from '@/databases/repositories/installed-nodes.repository';
import { InstalledPackagesRepository } from '@/databases/repositories/installed-packages.repository';
import { InstalledNodes } from '@/databases/entities/installed-nodes';
import type { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
import type { License } from '@/license';

4
packages/cli/src/services/__tests__/hooks.service.test.ts
View File

@@ -1,7 +1,7 @@
import type { Response } from 'express';
import { mock } from 'jest-mock-extended';
import type { AuthUser } from '@db/entities/AuthUser';
import type { AuthUser } from '@/databases/entities/auth-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';
@@ -11,7 +11,7 @@ import type { UserService } from '@/services/user.service';
import { HooksService } from '@/services/hooks.service';
import type { Invitation } from '@/Interfaces';
import type { AuthenticatedRequest } from '@/requests';
import type { AuthUserRepository } from '@/databases/repositories/authUser.repository';
import type { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
import RudderStack from '@rudderstack/rudder-sdk-node';
jest.mock('@rudderstack/rudder-sdk-node');

4
packages/cli/src/services/__tests__/naming.service.test.ts
View File

@@ -2,8 +2,8 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository
import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
import { mockInstance } from '@test/mocking';
import { NamingService } from '@/services/naming.service';
import type { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
describe('NamingService', () => {
const workflowRepository = mockInstance(WorkflowRepository);

16
packages/cli/src/services/__tests__/ownership.service.test.ts
View File

@@ -1,15 +1,15 @@
import { OwnershipService } from '@/services/ownership.service';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedWorkflow } from '@db/entities/SharedWorkflow';
import { User } from '@db/entities/User';
import type { SharedCredentials } from '@db/entities/SharedCredentials';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { SharedWorkflow } from '@/databases/entities/shared-workflow';
import { User } from '@/databases/entities/User';
import type { SharedCredentials } from '@/databases/entities/shared-credentials';
import { mockInstance } from '@test/mocking';
import { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
import { WorkflowEntity } from '@/databases/entities/workflow-entity';
import { UserRepository } from '@/databases/repositories/user.repository';
import { mock } from 'jest-mock-extended';
import { Project } from '@/databases/entities/Project';
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
import { ProjectRelation } from '@/databases/entities/ProjectRelation';
import { Project } from '@/databases/entities/project';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
import { ProjectRelation } from '@/databases/entities/project-relation';
import { mockCredential, mockProject } from '@test/mockObjects';
describe('OwnershipService', () => {

2
packages/cli/src/services/__tests__/user.service.test.ts
View File

@@ -1,7 +1,7 @@
import { mock } from 'jest-mock-extended';
import { v4 as uuid } from 'uuid';
import { User } from '@db/entities/User';
import { User } from '@/databases/entities/User';
import { UserService } from '@/services/user.service';
import { UrlService } from '@/services/url.service';
import { mockInstance } from '@test/mocking';

8
packages/cli/src/services/__tests__/workflow-statistics.service.test.ts
View File

@@ -11,14 +11,14 @@ import { mocked } from 'jest-mock';
import { mock } from 'jest-mock-extended';
import config from '@/config';
import type { User } from '@db/entities/User';
import type { WorkflowStatistics } from '@db/entities/WorkflowStatistics';
import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
import type { User } from '@/databases/entities/User';
import type { WorkflowStatistics } from '@/databases/entities/workflow-statistics';
import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
import { WorkflowStatisticsService } from '@/services/workflow-statistics.service';
import { UserService } from '@/services/user.service';
import { OwnershipService } from '@/services/ownership.service';
import { mockInstance } from '@test/mocking';
import type { Project } from '@/databases/entities/Project';
import type { Project } from '@/databases/entities/project';
import type { EventService } from '@/events/event.service';
describe('WorkflowStatisticsService', () => {

4
packages/cli/src/services/activeWorkflows.service.ts
View File

@@ -1,7 +1,7 @@
import { Service } from 'typedi';
import type { User } from '@db/entities/User';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import type { User } from '@/databases/entities/User';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import { ActivationErrorsService } from '@/activation-errors.service';
import { BadRequestError } from '@/errors/response-errors/bad-request.error';

4
packages/cli/src/services/communityPackages.service.ts
View File

@@ -11,8 +11,8 @@ import { InstanceSettings } from 'n8n-core';
import type { PackageDirectoryLoader } from 'n8n-core';
import { toError } from '@/utils';
import { InstalledPackagesRepository } from '@db/repositories/installedPackages.repository';
import type { InstalledPackages } from '@db/entities/InstalledPackages';
import { InstalledPackagesRepository } from '@/databases/repositories/installed-packages.repository';
import type { InstalledPackages } from '@/databases/entities/installed-packages';
import {
LICENSE_FEATURES,
NODE_PACKAGE_PREFIX,

2
packages/cli/src/services/credentials-tester.service.ts
View File

@@ -35,7 +35,7 @@ import {
} from 'n8n-workflow';
import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
import type { User } from '@db/entities/User';
import type { User } from '@/databases/entities/User';
import { NodeTypes } from '@/node-types';
import { CredentialTypes } from '@/credential-types';
import { RESPONSE_ERROR_MESSAGES } from '../constants';

2
packages/cli/src/services/cta.service.ts
View File

@@ -1,5 +1,5 @@
import { Service } from 'typedi';
import { WorkflowStatisticsRepository } from '@/databases/repositories/workflowStatistics.repository';
import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
import type { User } from '@/databases/entities/User';
@Service()

4
packages/cli/src/services/executionMetadata.service.ts
View File

@@ -1,6 +1,6 @@
import { Service } from 'typedi';
import { ExecutionMetadataRepository } from '@db/repositories/executionMetadata.repository';
import type { ExecutionMetadata } from '@db/entities/ExecutionMetadata';
import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
import type { ExecutionMetadata } from '@/databases/entities/execution-metadata';
@Service()
export class ExecutionMetadataService {

12
packages/cli/src/services/hooks.service.ts
View File

@@ -5,16 +5,16 @@ import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPar
import type { FindManyOptions, FindOneOptions, FindOptionsWhere } from '@n8n/typeorm';
import { AuthService } from '@/auth/auth.service';
import type { AuthUser } from '@db/entities/AuthUser';
import type { User } from '@db/entities/User';
import type { AuthUser } from '@/databases/entities/auth-user';
import type { User } from '@/databases/entities/User';
import { UserRepository } from '@db/repositories/user.repository';
import { SettingsRepository } from '@db/repositories/settings.repository';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
import { AuthUserRepository } from '@db/repositories/authUser.repository';
import type { Settings } from '@db/entities/Settings';
import type { WorkflowEntity } from '@db/entities/workflow-entity';
import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
import { AuthUserRepository } from '@/databases/repositories/auth-user.repository';
import type { Settings } from '@/databases/entities/settings';
import { UserService } from '@/services/user.service';
import type { AuthenticatedRequest } from '@/requests';
import type { Invitation } from '@/Interfaces';

10
packages/cli/src/services/import.service.ts
View File

@@ -6,12 +6,12 @@ import { Logger } from '@/logger';
import * as Db from '@/Db';
import { CredentialsRepository } from '@db/repositories/credentials.repository';
import { TagRepository } from '@db/repositories/tag.repository';
import { SharedWorkflow } from '@db/entities/SharedWorkflow';
import { SharedWorkflow } from '@/databases/entities/shared-workflow';
import { replaceInvalidCredentials } from '@/workflow-helpers';
import { Project } from '@db/entities/Project';
import { WorkflowEntity } from '@db/entities/WorkflowEntity';
import { WorkflowTagMapping } from '@db/entities/WorkflowTagMapping';
import type { TagEntity } from '@db/entities/TagEntity';
import { Project } from '@/databases/entities/project';
import { WorkflowEntity } from '@db/entities/workflow-entity';
import { WorkflowTagMapping } from '@/databases/entities/workflow-tag-mapping';
import type { TagEntity } from '@/databases/entities/tag-entity';
import type { ICredentialsDb } from '@/Interfaces';
@Service()

6
packages/cli/src/services/ownership.service.ts
View File

@@ -1,12 +1,12 @@
import { Service } from 'typedi';
import { CacheService } from '@/services/cache/cache.service';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { UserRepository } from '@db/repositories/user.repository';
import type { ListQuery } from '@/requests';
import type { Project } from '@/databases/entities/Project';
import type { Project } from '@/databases/entities/project';
import { ProjectRepository } from '@/databases/repositories/project.repository';
import type { User } from '@/databases/entities/User';
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
@Service()
export class OwnershipService {

12
packages/cli/src/services/project.service.ts
View File

@@ -1,9 +1,9 @@
import { Project, type ProjectType } from '@/databases/entities/Project';
import { ProjectRelation } from '@/databases/entities/ProjectRelation';
import type { ProjectRole } from '@/databases/entities/ProjectRelation';
import { Project, type ProjectType } from '@/databases/entities/project';
import { ProjectRelation } from '@/databases/entities/project-relation';
import type { ProjectRole } from '@/databases/entities/project-relation';
import type { User } from '@/databases/entities/User';
import { ProjectRepository } from '@/databases/repositories/project.repository';
import { ProjectRelationRepository } from '@/databases/repositories/projectRelation.repository';
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
import type { FindOptionsWhere, EntityManager } from '@n8n/typeorm';
import Container, { Service } from 'typedi';
@@ -13,8 +13,8 @@ import { In, Not } from '@n8n/typeorm';
import { RoleService } from './role.service';
import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
import { NotFoundError } from '@/errors/response-errors/not-found.error';
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 { BadRequestError } from '@/errors/response-errors/bad-request.error';
import { CacheService } from './cache/cache.service';
import { License } from '@/license';

8
packages/cli/src/services/role.service.ts
View File

@@ -1,9 +1,9 @@
import type { ProjectRelation, ProjectRole } from '@/databases/entities/ProjectRelation';
import type { ProjectRelation, ProjectRole } from '@/databases/entities/project-relation';
import type {
CredentialSharingRole,
SharedCredentials,
} from '@/databases/entities/SharedCredentials';
import type { SharedWorkflow, WorkflowSharingRole } from '@/databases/entities/SharedWorkflow';
} from '@/databases/entities/shared-credentials';
import type { SharedWorkflow, WorkflowSharingRole } from '@/databases/entities/shared-workflow';
import type { GlobalRole, User } from '@/databases/entities/User';
import {
GLOBAL_ADMIN_SCOPES,
@@ -27,7 +27,7 @@ import { combineScopes, type Resource, type Scope } from '@n8n/permissions';
import { Service } from 'typedi';
import { ApplicationError } from 'n8n-workflow';
import { License } from '@/license';
import type { CredentialsEntity } from '@/databases/entities/CredentialsEntity';
import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
export type RoleNamespace = 'global' | 'project' | 'credential' | 'workflow';

2
packages/cli/src/services/tag.service.ts
View File

@@ -2,7 +2,7 @@ import { TagRepository } from '@db/repositories/tag.repository';
import { Service } from 'typedi';
import { validateEntity } from '@/generic-helpers';
import type { ITagWithCountDb } from '@/Interfaces';
import type { TagEntity } from '@db/entities/TagEntity';
import type { TagEntity } from '@/databases/entities/tag-entity';
import { ExternalHooks } from '@/external-hooks';
type GetAllResult<T> = T extends { withUsageCount: true } ? ITagWithCountDb[] : TagEntity[];

2
packages/cli/src/services/user.service.ts
View File

@@ -2,7 +2,7 @@ import { Service } from 'typedi';
import type { IUserSettings } from 'n8n-workflow';
import { ApplicationError, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
import type { User, AssignableRole } from '@db/entities/User';
import type { User, AssignableRole } from '@/databases/entities/User';
import { UserRepository } from '@db/repositories/user.repository';
import type { Invitation, PublicUser } from '@/Interfaces';
import type { PostHogClient } from '@/posthog';

4
packages/cli/src/services/userOnboarding.service.ts
View File

@@ -2,8 +2,8 @@ import { Service } from 'typedi';
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
import { In } from '@n8n/typeorm';
import type { User } from '@db/entities/User';
import { SharedWorkflowRepository } from '@db/repositories/sharedWorkflow.repository';
import type { User } from '@/databases/entities/User';
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
import { WorkflowRepository } from '@db/repositories/workflow.repository';
import { UserService } from '@/services/user.service';

4
packages/cli/src/services/workflow-statistics.service.ts
View File

@@ -1,7 +1,7 @@
import { Service } from 'typedi';
import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
import { StatisticsNames } from '@db/entities/WorkflowStatistics';
import { WorkflowStatisticsRepository } from '@db/repositories/workflowStatistics.repository';
import { StatisticsNames } from '@/databases/entities/workflow-statistics';
import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
import { UserService } from '@/services/user.service';
import { Logger } from '@/logger';
import { OwnershipService } from './ownership.service';