refactor(core): Move second batch of repositories to @n8n/db (#15137)

packages/@n8n/db/src/repositories/folder-tag-mapping.repository.ts

@@ -1,7 +1,8 @@
-import { FolderTagMapping } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
 
+import { FolderTagMapping } from '../entities/folder-tag-mapping';
+
 @Service()
 export class FolderTagMappingRepository extends Repository<FolderTagMapping> {
 	constructor(dataSource: DataSource) {

packages/@n8n/db/src/repositories/folder.repository.ts

@@ -1,11 +1,10 @@
-import type { FolderWithWorkflowAndSubFolderCount } from '@n8n/db';
-import { Folder, FolderTagMapping, TagEntity } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { EntityManager, SelectQueryBuilder } from '@n8n/typeorm';
 import { DataSource, Repository } from '@n8n/typeorm';
 import { PROJECT_ROOT } from 'n8n-workflow';
 
-import type { ListQuery } from '@/requests';
+import { Folder, FolderTagMapping, TagEntity } from '../entities';
+import type { FolderWithWorkflowAndSubFolderCount, ListQuery } from '../entities/types-db';
 
 @Service()
 export class FolderRepository extends Repository<FolderWithWorkflowAndSubFolderCount> {

packages/@n8n/db/src/repositories/index.ts

@@ -10,3 +10,12 @@ export { ExecutionDataRepository } from './execution-data.repository';
 export { ExecutionMetadataRepository } from './execution-metadata.repository';
 export { ExecutionRepository } from './execution.repository';
 export { EventDestinationsRepository } from './event-destinations.repository';
+export { FolderRepository } from './folder.repository';
+export { FolderTagMappingRepository } from './folder-tag-mapping.repository';
+export { InstalledNodesRepository } from './installed-nodes.repository';
+export { InstalledPackagesRepository } from './installed-packages.repository';
+export { InvalidAuthTokenRepository } from './invalid-auth-token.repository';
+export { LicenseMetricsRepository } from './license-metrics.repository';
+export { ProjectRelationRepository } from './project-relation.repository';
+export { ProjectRepository } from './project.repository';
+export { ProcessedDataRepository } from './processed-data.repository';

packages/@n8n/db/src/repositories/installed-nodes.repository.ts

@@ -1,7 +1,8 @@
-import { InstalledNodes } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
 
+import { InstalledNodes } from '../entities';
+
 @Service()
 export class InstalledNodesRepository extends Repository<InstalledNodes> {
 	constructor(dataSource: DataSource) {

packages/@n8n/db/src/repositories/installed-packages.repository.ts

@@ -1,9 +1,9 @@
-import { InstalledPackages } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
 import type { PackageDirectoryLoader } from 'n8n-core';
 
 import { InstalledNodesRepository } from './installed-nodes.repository';
+import { InstalledPackages } from '../entities';
 
 @Service()
 export class InstalledPackagesRepository extends Repository<InstalledPackages> {

packages/@n8n/db/src/repositories/invalid-auth-token.repository.ts

@@ -1,7 +1,8 @@
-import { InvalidAuthToken } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
 
+import { InvalidAuthToken } from '../entities';
+
 @Service()
 export class InvalidAuthTokenRepository extends Repository<InvalidAuthToken> {
 	constructor(dataSource: DataSource) {

packages/@n8n/db/src/repositories/processed-data.repository.ts

@@ -1,7 +1,8 @@
-import { ProcessedData } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
 
+import { ProcessedData } from '../entities';
+
 @Service()
 export class ProcessedDataRepository extends Repository<ProcessedData> {
 	constructor(dataSource: DataSource) {

packages/@n8n/db/src/repositories/project-relation.repository.ts

@@ -1,8 +1,9 @@
-import { ProjectRelation } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { ProjectRole } from '@n8n/permissions';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 
+import { ProjectRelation } from '../entities';
+
 @Service()
 export class ProjectRelationRepository extends Repository<ProjectRelation> {
 	constructor(dataSource: DataSource) {

packages/@n8n/db/src/repositories/project.repository.ts

@@ -1,8 +1,9 @@
-import { Project } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
 import { DataSource, Repository } from '@n8n/typeorm';
 
+import { Project } from '../entities';
+
 @Service()
 export class ProjectRepository extends Repository<Project> {
 	constructor(dataSource: DataSource) {

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

@@ -1,5 +1,6 @@
 import type { GlobalConfig } from '@n8n/config';
 import type { User } from '@n8n/db';
+import type { InvalidAuthTokenRepository } from '@n8n/db';
 import type { NextFunction, Response } from 'express';
 import { mock } from 'jest-mock-extended';
 import jwt from 'jsonwebtoken';
@@ -7,7 +8,6 @@ import jwt from 'jsonwebtoken';
 import { AuthService } from '@/auth/auth.service';
 import config from '@/config';
 import { AUTH_COOKIE_NAME, Time } from '@/constants';
-import type { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
 import type { UserRepository } from '@/databases/repositories/user.repository';
 import type { AuthenticatedRequest } from '@/requests';
 import { JwtService } from '@/services/jwt.service';

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

@@ -1,5 +1,6 @@
 import { GlobalConfig } from '@n8n/config';
 import type { User } from '@n8n/db';
+import { InvalidAuthTokenRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { createHash } from 'crypto';
 import type { NextFunction, Response } from 'express';
@@ -8,7 +9,6 @@ import { Logger } from 'n8n-core';
 
 import config from '@/config';
 import { AUTH_COOKIE_NAME, RESPONSE_ERROR_MESSAGES, Time } from '@/constants';
-import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { AuthError } from '@/errors/response-errors/auth.error';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';

packages/cli/src/commands/community-node.ts

@@ -1,10 +1,9 @@
 import { type InstalledNodes, type InstalledPackages, type User } from '@n8n/db';
-import { CredentialsRepository } from '@n8n/db';
+import { CredentialsRepository, InstalledNodesRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 
 import { CredentialsService } from '@/credentials/credentials.service';
-import { InstalledNodesRepository } from '@/databases/repositories/installed-nodes.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { CommunityPackagesService } from '@/services/community-packages.service';
 

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

@@ -1,4 +1,4 @@
-import { CredentialsEntity, Project, User, SharedCredentials } from '@n8n/db';
+import { CredentialsEntity, Project, User, SharedCredentials, ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { EntityManager } from '@n8n/typeorm';
@@ -10,7 +10,6 @@ import type { ICredentialsEncrypted } from 'n8n-workflow';
 import { jsonParse, UserError } from 'n8n-workflow';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import * as Db from '@/db';
 
 import { BaseCommand } from '../base-command';

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

@@ -1,5 +1,5 @@
-import { generateNanoId } from '@n8n/db';
 import type { WorkflowEntity } from '@n8n/db';
+import { generateNanoId, ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { Flags } from '@oclif/core';
 import glob from 'fast-glob';
@@ -8,7 +8,6 @@ import type { IWorkflowBase, WorkflowId } from 'n8n-workflow';
 import { jsonParse, UserError } from 'n8n-workflow';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';

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

@@ -1,4 +1,9 @@
-import { AuthIdentityRepository, AuthProviderSyncHistoryRepository } from '@n8n/db';
+import {
+	AuthIdentityRepository,
+	AuthProviderSyncHistoryRepository,
+	ProjectRelationRepository,
+	ProjectRepository,
+} from '@n8n/db';
 import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
@@ -7,8 +12,6 @@ import { UserError } from 'n8n-workflow';
 
 import { UM_FIX_INSTRUCTION } from '@/constants';
 import { CredentialsService } from '@/credentials/credentials.service';
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';

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

@@ -1,8 +1,7 @@
 import type { CredentialsEntity } from '@n8n/db';
-import { User, CredentialsRepository } from '@n8n/db';
+import { User, CredentialsRepository, ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SettingsRepository } from '@/databases/repositories/settings.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';

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

@@ -2,6 +2,7 @@ import { UserUpdateRequestDto } from '@n8n/api-types';
 import type { User } from '@n8n/db';
 import type { PublicUser } from '@n8n/db';
 import { AuthUserRepository } from '@n8n/db';
+import { InvalidAuthTokenRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { Response } from 'express';
 import { mock, anyObject } from 'jest-mock-extended';
@@ -9,7 +10,6 @@ import jwt from 'jsonwebtoken';
 
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { MeController } from '@/controllers/me.controller';
-import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error';

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

@@ -1,5 +1,6 @@
 import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto } from '@n8n/api-types';
 import type { Project } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import {
 	Get,
 	Post,
@@ -19,7 +20,6 @@ import type { Scope } from '@n8n/permissions';
 import { In, Not } from '@n8n/typeorm';
 import { Response } from 'express';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
 import { EventService } from '@/events/event.service';

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

@@ -1,6 +1,6 @@
 import { RoleChangeRequestDto, SettingsUpdateRequestDto } from '@n8n/api-types';
 import type { PublicUser } from '@n8n/db';
-import { Project, User, AuthIdentity } from '@n8n/db';
+import { Project, User, AuthIdentity, ProjectRepository } from '@n8n/db';
 import {
 	GlobalScope,
 	Delete,
@@ -16,7 +16,6 @@ import { Logger } from 'n8n-core';
 
 import { AuthService } from '@/auth/auth.service';
 import { CredentialsService } from '@/credentials/credentials.service';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';

packages/cli/src/credentials/credentials.controller.ts

@@ -5,7 +5,7 @@ import {
 	GenerateCredentialNameRequestQuery,
 } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
-import { SharedCredentials } from '@n8n/db';
+import { SharedCredentials, ProjectRelationRepository } from '@n8n/db';
 import {
 	Delete,
 	Get,
@@ -26,7 +26,6 @@ import { deepCopy } from 'n8n-workflow';
 import type { ICredentialDataDecryptedObject } from 'n8n-workflow';
 import { z } from 'zod';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import * as Db from '@/db';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';

packages/cli/src/credentials/credentials.service.ts

@@ -1,6 +1,11 @@
 import type { CreateCredentialDto } from '@n8n/api-types';
 import type { Project, User, ICredentialsDb, ScopesField } from '@n8n/db';
-import { CredentialsEntity, SharedCredentials, CredentialsRepository } from '@n8n/db';
+import {
+	CredentialsEntity,
+	SharedCredentials,
+	CredentialsRepository,
+	ProjectRepository,
+} from '@n8n/db';
 import { Service } from '@n8n/di';
 import { hasGlobalScope, type Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
@@ -22,7 +27,6 @@ import { CREDENTIAL_EMPTY_VALUE, deepCopy, NodeHelpers, UnexpectedError } from '
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { CredentialTypes } from '@/credential-types';
 import { createCredentialsFromCredentialsEntity } from '@/credentials-helper';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import * as Db from '@/db';

packages/cli/src/databases/repositories/__tests__/folder.repository.test.ts

@@ -1,6 +1,7 @@
 import type { Project } from '@n8n/db';
 import type { User } from '@n8n/db';
 import type { Folder } from '@n8n/db';
+import { FolderRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { DateTime } from 'luxon';
 
@@ -11,7 +12,6 @@ import { createMember, createOwner } from '@test-integration/db/users';
 import { createWorkflow } from '@test-integration/db/workflows';
 
 import * as testDb from '../../../../test/integration/shared/test-db';
-import { FolderRepository } from '../folder.repository';
 
 describe('FolderRepository', () => {
 	let folderRepository: FolderRepository;

packages/cli/src/databases/repositories/workflow.repository.ts

@@ -6,6 +6,7 @@ import {
 	TagEntity,
 	WorkflowEntity,
 	WorkflowTagMapping,
+	FolderRepository,
 } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { DataSource, Repository, In, Like } from '@n8n/typeorm';
@@ -22,8 +23,6 @@ import { PROJECT_ROOT } from 'n8n-workflow';
 
 import type { ListQuery } from '@/requests';
 
-import { FolderRepository } from './folder.repository';
-
 type ResourceType = 'folder' | 'workflow';
 
 type WorkflowFolderUnionRow = {

packages/cli/src/deduplication/deduplication-helper.ts

@@ -1,4 +1,5 @@
 import type { ProcessedData } from '@n8n/db';
+import { ProcessedDataRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { createHash } from 'crypto';
 import { tryToParseDateTime } from 'n8n-workflow';
@@ -15,7 +16,6 @@ import type {
 } from 'n8n-workflow';
 import * as assert from 'node:assert/strict';
 
-import { ProcessedDataRepository } from '@/databases/repositories/processed-data.repository';
 import { DeduplicationError } from '@/errors/deduplication.error';
 
 export class DeduplicationHelper implements IDataDeduplicator {

packages/cli/src/environments.ee/source-control/__tests__/source-control-export.service.test.ts

@@ -1,12 +1,12 @@
 import type { SourceControlledFile } from '@n8n/api-types';
 import type { SharedCredentials } from '@n8n/db';
 import type { SharedWorkflow } from '@n8n/db';
+import type { FolderRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { mock, captor } from 'jest-mock-extended';
 import { Cipher, type InstanceSettings } from 'n8n-core';
 import fsp from 'node:fs/promises';
 
-import type { FolderRepository } from '@/databases/repositories/folder.repository';
 import type { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import type { TagRepository } from '@/databases/repositories/tag.repository';

packages/cli/src/environments.ee/source-control/__tests__/source-control-import.service.ee.test.ts

@@ -1,10 +1,10 @@
 import type { WorkflowEntity } from '@n8n/db';
+import type { FolderRepository } from '@n8n/db';
 import * as fastGlob from 'fast-glob';
 import { mock } from 'jest-mock-extended';
 import { type InstanceSettings } from 'n8n-core';
 import fsp from 'node:fs/promises';
 
-import type { FolderRepository } from '@/databases/repositories/folder.repository';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
 import { SourceControlImportService } from '../source-control-import.service.ee';

packages/cli/src/environments.ee/source-control/__tests__/source-control.service.test.ts

@@ -3,11 +3,11 @@ import type { Variables } from '@n8n/db';
 import type { FolderWithWorkflowAndSubFolderCount } from '@n8n/db';
 import type { TagEntity } from '@n8n/db';
 import type { User } from '@n8n/db';
+import type { FolderRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { InstanceSettings } from 'n8n-core';
 
-import type { FolderRepository } from '@/databases/repositories/folder.repository';
 import type { TagRepository } from '@/databases/repositories/tag.repository';
 import { SourceControlPreferencesService } from '@/environments.ee/source-control/source-control-preferences.service.ee';
 import { SourceControlService } from '@/environments.ee/source-control/source-control.service.ee';

packages/cli/src/environments.ee/source-control/source-control-export.service.ee.ts

@@ -1,5 +1,6 @@
 import type { SourceControlledFile } from '@n8n/api-types';
 import type { IWorkflowDb } from '@n8n/db';
+import { FolderRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
@@ -9,7 +10,6 @@ import { UnexpectedError, type ICredentialDataDecryptedObject } from 'n8n-workfl
 import { writeFile as fsWriteFile, rm as fsRm } from 'node:fs/promises';
 import path from 'path';
 
-import { FolderRepository } from '@/databases/repositories/folder.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { TagRepository } from '@/databases/repositories/tag.repository';

packages/cli/src/environments.ee/source-control/source-control-import.service.ee.ts

@@ -1,6 +1,11 @@
 import type { SourceControlledFile } from '@n8n/api-types';
 import type { Variables, Project, TagEntity, User, WorkflowTagMapping } from '@n8n/db';
-import { SharedCredentials, CredentialsRepository } from '@n8n/db';
+import {
+	SharedCredentials,
+	CredentialsRepository,
+	FolderRepository,
+	ProjectRepository,
+} from '@n8n/db';
 import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
@@ -12,8 +17,6 @@ import path from 'path';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { CredentialsService } from '@/credentials/credentials.service';
-import { FolderRepository } from '@/databases/repositories/folder.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { TagRepository } from '@/databases/repositories/tag.repository';

packages/cli/src/environments.ee/source-control/source-control.service.ee.ts

@@ -4,6 +4,7 @@ import type {
 	SourceControlledFile,
 } from '@n8n/api-types';
 import type { Variables, TagEntity, User } from '@n8n/db';
+import { FolderRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { writeFileSync } from 'fs';
 import { Logger } from 'n8n-core';
@@ -11,7 +12,6 @@ import { UnexpectedError, UserError } from 'n8n-workflow';
 import path from 'path';
 import type { PushResult } from 'simple-git';
 
-import { FolderRepository } from '@/databases/repositories/folder.repository';
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { EventService } from '@/events/event.service';

packages/cli/src/events/__tests__/telemetry-event-relay.test.ts

@@ -3,13 +3,13 @@ import type { CredentialsEntity } from '@n8n/db';
 import type { WorkflowEntity } from '@n8n/db';
 import type { IWorkflowDb } from '@n8n/db';
 import type { CredentialsRepository } from '@n8n/db';
+import type { ProjectRelationRepository } from '@n8n/db';
 import { mock } from 'jest-mock-extended';
 import { type BinaryDataConfig, InstanceSettings } from 'n8n-core';
 import type { INode, INodesGraphResult } from 'n8n-workflow';
 import { NodeApiError, TelemetryHelpers, type IRun, type IWorkflowBase } from 'n8n-workflow';
 
 import { N8N_VERSION } from '@/constants';
-import type { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { EventService } from '@/events/event.service';

packages/cli/src/events/relays/telemetry.event-relay.ts

@@ -1,5 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
-import { CredentialsRepository } from '@n8n/db';
+import { CredentialsRepository, ProjectRelationRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { snakeCase } from 'change-case';
 import { BinaryDataConfig, InstanceSettings } from 'n8n-core';
@@ -10,7 +10,6 @@ import { get as pslGet } from 'psl';
 
 import config from '@/config';
 import { N8N_VERSION } from '@/constants';
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { EventService } from '@/events/event.service';

packages/cli/src/metrics/__tests__/license-metrics.service.test.ts

@@ -1,6 +1,6 @@
+import type { LicenseMetricsRepository } from '@n8n/db';
 import { mock } from 'jest-mock-extended';
 
-import type { LicenseMetricsRepository } from '@/databases/repositories/license-metrics.repository';
 import type { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { LicenseMetricsService } from '@/metrics/license-metrics.service';
 

packages/cli/src/metrics/license-metrics.service.ts

@@ -1,6 +1,6 @@
+import { LicenseMetricsRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 
-import { LicenseMetricsRepository } from '@/databases/repositories/license-metrics.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 
 @Service()

packages/cli/src/permissions.ee/check-access.ts

@@ -1,11 +1,11 @@
 import type { User } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { hasGlobalScope, rolesWithScope, type Scope } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import { UnexpectedError } from 'n8n-workflow';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 

packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts

@@ -1,5 +1,10 @@
 import type { User, ICredentialsDb } from '@n8n/db';
-import { CredentialsEntity, SharedCredentials, CredentialsRepository } from '@n8n/db';
+import {
+	CredentialsEntity,
+	SharedCredentials,
+	CredentialsRepository,
+	ProjectRepository,
+} from '@n8n/db';
 import { Container } from '@n8n/di';
 import { Credentials } from 'n8n-core';
 import type {
@@ -9,7 +14,6 @@ import type {
 	INodePropertyOptions,
 } from 'n8n-workflow';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import * as Db from '@/db';
 import { EventService } from '@/events/event.service';

packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts

@@ -1,9 +1,9 @@
 import { CreateProjectDto, DeleteProjectDto, UpdateProjectDto } from '@n8n/api-types';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { Response } from 'express';
 
 import { ProjectController } from '@/controllers/project.controller';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import type { PaginatedRequest } from '@/public-api/types';
 import type { AuthenticatedRequest } from '@/requests';
 

packages/cli/src/public-api/v1/handlers/users/users.handler.ee.ts

@@ -1,11 +1,11 @@
 import { InviteUsersRequestDto, RoleChangeRequestDto } from '@n8n/api-types';
+import { ProjectRelationRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type express from 'express';
 import type { Response } from 'express';
 
 import { InvitationController } from '@/controllers/invitation.controller';
 import { UsersController } from '@/controllers/users.controller';
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { EventService } from '@/events/event.service';
 import type { AuthenticatedRequest, UserRequest } from '@/requests';
 

packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts

@@ -1,5 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
-import { WorkflowEntity } from '@n8n/db';
+import { WorkflowEntity, ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In, Like, QueryFailedError } from '@n8n/typeorm';
@@ -10,7 +10,6 @@ import { v4 as uuid } from 'uuid';
 import { z } from 'zod';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { EventService } from '@/events/event.service';

packages/cli/src/services/__tests__/community-packages.service.test.ts

@@ -1,6 +1,8 @@
 import type { GlobalConfig } from '@n8n/config';
 import { InstalledNodes } from '@n8n/db';
 import { InstalledPackages } from '@n8n/db';
+import { InstalledNodesRepository } from '@n8n/db';
+import { InstalledPackagesRepository } from '@n8n/db';
 import axios from 'axios';
 import { exec } from 'child_process';
 import { mkdir as fsMkdir } from 'fs/promises';
@@ -15,8 +17,6 @@ import {
 	NPM_PACKAGE_STATUS_GOOD,
 	RESPONSE_ERROR_MESSAGES,
 } from '@/constants';
-import { InstalledNodesRepository } from '@/databases/repositories/installed-nodes.repository';
-import { InstalledPackagesRepository } from '@/databases/repositories/installed-packages.repository';
 import type { CommunityPackages } from '@/interfaces';
 import type { License } from '@/license';
 import type { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';

packages/cli/src/services/__tests__/ownership.service.test.ts

@@ -1,9 +1,9 @@
 import type { SharedCredentials } from '@n8n/db';
 import { Project, SharedWorkflow, User, WorkflowEntity, ProjectRelation } from '@n8n/db';
+import { ProjectRelationRepository } from '@n8n/db';
 import { mock } from 'jest-mock-extended';
 import { v4 as uuid } from 'uuid';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { OwnershipService } from '@/services/ownership.service';

packages/cli/src/services/community-packages.service.ts

@@ -1,6 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
 import { LICENSE_FEATURES } from '@n8n/constants';
 import type { InstalledPackages } from '@n8n/db';
+import { InstalledPackagesRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 import axios from 'axios';
 import { exec } from 'child_process';
@@ -17,7 +18,6 @@ import {
 	RESPONSE_ERROR_MESSAGES,
 	UNKNOWN_FAILURE_REASON,
 } from '@/constants';
-import { InstalledPackagesRepository } from '@/databases/repositories/installed-packages.repository';
 import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error';
 import type { CommunityPackages } from '@/interfaces';
 import { License } from '@/license';

packages/cli/src/services/folder.service.ts

@@ -1,12 +1,10 @@
 import type { CreateFolderDto, DeleteFolderDto, UpdateFolderDto } from '@n8n/api-types';
-import { Folder } from '@n8n/db';
+import { Folder, FolderTagMappingRepository, FolderRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import type { EntityManager } from '@n8n/typeorm';
 import { UserError, PROJECT_ROOT } from 'n8n-workflow';
 
-import { FolderTagMappingRepository } from '@/databases/repositories/folder-tag-mapping.repository';
-import { FolderRepository } from '@/databases/repositories/folder.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { FolderNotFoundError } from '@/errors/folder-not-found.error';
 import type { ListQuery } from '@/requests';

packages/cli/src/services/ownership.service.ts

@@ -1,8 +1,7 @@
 import type { Project, User, ListQueryDb } from '@n8n/db';
+import { ProjectRelationRepository, ProjectRepository } from '@n8n/db';
 import { Service } from '@n8n/di';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { CacheService } from '@/services/cache/cache.service';

packages/cli/src/services/project.service.ee.ts

@@ -1,7 +1,7 @@
 import type { CreateProjectDto, ProjectType, UpdateProjectDto } from '@n8n/api-types';
 import { UNLIMITED_LICENSE_QUOTA } from '@n8n/constants';
 import type { User } from '@n8n/db';
-import { Project, ProjectRelation } from '@n8n/db';
+import { Project, ProjectRelation, ProjectRelationRepository, ProjectRepository } from '@n8n/db';
 import { Container, Service } from '@n8n/di';
 import { hasGlobalScope, rolesWithScope, type Scope, type ProjectRole } from '@n8n/permissions';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
@@ -10,8 +10,6 @@ import type { FindOptionsWhere, EntityManager } from '@n8n/typeorm';
 import { In, Not } from '@n8n/typeorm';
 import { UserError } from 'n8n-workflow';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';

packages/cli/src/telemetry/index.ts

@@ -1,4 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
+import { ProjectRelationRepository, ProjectRepository } from '@n8n/db';
 import { OnShutdown } from '@n8n/decorators';
 import { Container, Service } from '@n8n/di';
 import type RudderStack from '@rudderstack/rudder-sdk-node';
@@ -7,8 +8,6 @@ import { InstanceSettings, Logger } from 'n8n-core';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
 
 import { LOWEST_SHUTDOWN_PRIORITY, N8N_VERSION } from '@/constants';
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import type { IExecutionTrackProperties } from '@/interfaces';

packages/cli/src/workflows/workflow-sharing.service.ts

@@ -1,3 +1,4 @@
+import { ProjectRelationRepository } from '@n8n/db';
 import type { User } from '@n8n/db';
 import { Service } from '@n8n/di';
 import {
@@ -10,7 +11,6 @@ import {
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { RoleService } from '@/services/role.service';
 

packages/cli/src/workflows/workflows.controller.ts

@@ -5,7 +5,12 @@ import {
 } from '@n8n/api-types';
 import { GlobalConfig } from '@n8n/config';
 import type { Project } from '@n8n/db';
-import { SharedWorkflow, WorkflowEntity } from '@n8n/db';
+import {
+	SharedWorkflow,
+	WorkflowEntity,
+	ProjectRelationRepository,
+	ProjectRepository,
+} from '@n8n/db';
 import {
 	Body,
 	Delete,
@@ -27,8 +32,6 @@ import { Logger } from 'n8n-core';
 import { UnexpectedError } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { TagRepository } from '@/databases/repositories/tag.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';

packages/cli/test/integration/ai/ai.api.test.ts

@@ -1,13 +1,13 @@
 import type { Project } from '@n8n/db';
 import type { User } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { randomUUID } from 'crypto';
 import { mock } from 'jest-mock-extended';
 import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
 
 import { FREE_AI_CREDITS_CREDENTIAL_NAME } from '@/constants';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { AiService } from '@/services/ai.service';

packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts

@@ -1,8 +1,8 @@
 import type { User } from '@n8n/db';
+import { ProjectRelationRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { Not } from '@n8n/typeorm';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';

packages/cli/test/integration/credentials/credentials.api.ee.test.ts

@@ -1,13 +1,13 @@
 import type { Project } from '@n8n/db';
 import type { User } from '@n8n/db';
 import type { ListQueryDb } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { ProjectRole } from '@n8n/permissions';
 import { In } from '@n8n/typeorm';
 
 import config from '@/config';
 import { CredentialsService } from '@/credentials/credentials.service';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { ProjectService } from '@/services/project.service.ee';
 import { UserManagementMailer } from '@/user-management/email';

packages/cli/test/integration/credentials/credentials.api.test.ts

@@ -3,6 +3,7 @@ import type { Project } from '@n8n/db';
 import type { User } from '@n8n/db';
 import type { ListQueryDb } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { Scope } from '@sentry/node';
 import * as a from 'assert';
@@ -13,7 +14,6 @@ import { randomString } from 'n8n-workflow';
 
 import { CREDENTIAL_BLANKING_VALUE } from '@/constants';
 import { CredentialsService } from '@/credentials/credentials.service';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { CredentialsTester } from '@/services/credentials-tester.service';
 

packages/cli/test/integration/database/repositories/project.repository.test.ts

@@ -1,8 +1,8 @@
 import { AuthIdentity } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { EntityNotFoundError } from '@n8n/typeorm';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 
 import { createTeamProject } from '../../shared/db/projects';

packages/cli/test/integration/environments/source-control-import.service.test.ts

@@ -1,5 +1,7 @@
 import type { SourceControlledFile } from '@n8n/api-types';
 import { CredentialsRepository } from '@n8n/db';
+import { FolderRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import { Cipher } from 'n8n-core';
@@ -8,8 +10,6 @@ import * as utils from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 import fsp from 'node:fs/promises';
 
-import { FolderRepository } from '@/databases/repositories/folder.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { SourceControlImportService } from '@/environments.ee/source-control/source-control-import.service.ee';

packages/cli/test/integration/evaluation/test-runs.api.test.ts

@@ -1,10 +1,10 @@
 import type { User } from '@n8n/db';
 import type { TestDefinition } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { mockInstance } from 'n8n-core/test/utils';
 import type { IWorkflowBase } from 'n8n-workflow';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { TestDefinitionRepository } from '@/databases/repositories/test-definition.repository.ee';
 import { TestRunRepository } from '@/databases/repositories/test-run.repository.ee';
 import { TestRunnerService } from '@/evaluation.ee/test-runner/test-runner.service.ee';

packages/cli/test/integration/executions/pre-execution-checks/credentials-permission-checker.test.ts

@@ -1,11 +1,11 @@
 import type { Project } from '@n8n/db';
 import type { User } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { INode, IWorkflowBase } from 'n8n-workflow';
 import { randomInt } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';

packages/cli/test/integration/folder/folder.controller.test.ts

@@ -1,11 +1,11 @@
 import type { Project } from '@n8n/db';
 import type { User } from '@n8n/db';
+import { FolderRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { DateTime } from 'luxon';
 import { PROJECT_ROOT } from 'n8n-workflow';
 
-import { FolderRepository } from '@/databases/repositories/folder.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 import { createFolder } from '@test-integration/db/folders';
 import { createTag } from '@test-integration/db/tags';

packages/cli/test/integration/license-metrics.repository.test.ts

@@ -1,7 +1,7 @@
 import { StatisticsNames } from '@n8n/db';
+import { LicenseMetricsRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 
-import { LicenseMetricsRepository } from '@/databases/repositories/license-metrics.repository';
 import { WorkflowStatisticsRepository } from '@/databases/repositories/workflow-statistics.repository';
 
 import { createManyCredentials } from './shared/db/credentials';

packages/cli/test/integration/me.api.test.ts

@@ -1,10 +1,10 @@
 import { GlobalConfig } from '@n8n/config';
 import type { User } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { IPersonalizationSurveyAnswersV4 } from 'n8n-workflow';
 import validator from 'validator';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 import { mockInstance } from '@test/mocking';
 

packages/cli/test/integration/project.api.test.ts

@@ -1,12 +1,12 @@
 import type { Project } from '@n8n/db';
+import { FolderRepository } from '@n8n/db';
+import { ProjectRelationRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { getRoleScopes, type GlobalRole, type ProjectRole, type Scope } from '@n8n/permissions';
 import { EntityNotFoundError } from '@n8n/typeorm';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import { FolderRepository } from '@/databases/repositories/folder.repository';
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { getWorkflowById } from '@/public-api/v1/handlers/workflows/workflows.service';

packages/cli/test/integration/public-api/endpoints-with-scopes-enabled.test.ts

@@ -1,11 +1,11 @@
 import type { TagEntity } from '@n8n/db';
 import { ApiKeyRepository } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { randomString } from 'n8n-workflow';
 import validator from 'validator';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { TagRepository } from '@/databases/repositories/tag.repository';

packages/cli/test/integration/public-api/workflows.test.ts

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

packages/cli/test/integration/services/project.service.test.ts

@@ -1,8 +1,8 @@
+import { ProjectRelationRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { ProjectRole, Scope } from '@n8n/permissions';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { ProjectService } from '@/services/project.service.ee';
 
 import { createMember } from '../shared/db/users';

packages/cli/test/integration/shared/db/credentials.ts

@@ -3,10 +3,10 @@ import type { User } from '@n8n/db';
 import type { ICredentialsDb } from '@n8n/db';
 import { CredentialsEntity } from '@n8n/db';
 import { CredentialsRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { CredentialSharingRole } from '@n8n/permissions';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 
 import type { CredentialPayload } from '../types';

packages/cli/test/integration/shared/db/folders.ts

@@ -1,9 +1,9 @@
 import type { Folder } from '@n8n/db';
 import type { Project } from '@n8n/db';
 import type { TagEntity } from '@n8n/db';
+import { FolderRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 
-import { FolderRepository } from '@/databases/repositories/folder.repository';
 import { randomName } from '@test-integration/random';
 
 export const createFolder = async (

packages/cli/test/integration/shared/db/projects.ts

@@ -1,12 +1,11 @@
 import type { Project } from '@n8n/db';
 import type { User } from '@n8n/db';
 import type { ProjectRelation } from '@n8n/db';
+import { ProjectRelationRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { ProjectRole } from '@n8n/permissions';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
-
 import { randomName } from '../random';
 
 export const createTeamProject = async (name?: string, adminUser?: User) => {

packages/cli/test/integration/shared/db/workflows.ts

@@ -1,7 +1,8 @@
-import { Project } from '@n8n/db';
-import { User } from '@n8n/db';
 import type { SharedWorkflow } from '@n8n/db';
 import type { IWorkflowDb } from '@n8n/db';
+import { Project } from '@n8n/db';
+import { User } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { WorkflowSharingRole } from '@n8n/permissions';
 import type { DeepPartial } from '@n8n/typeorm';
@@ -9,7 +10,6 @@ import type { IWorkflowBase } from 'n8n-workflow';
 import { NodeConnectionTypes } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
 

packages/cli/test/integration/shared/utils/community-nodes.ts

@@ -1,9 +1,9 @@
 import { InstalledPackages } from '@n8n/db';
+import { InstalledNodesRepository } from '@n8n/db';
+import { InstalledPackagesRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 
 import { NODE_PACKAGE_PREFIX } from '@/constants';
-import { InstalledNodesRepository } from '@/databases/repositories/installed-nodes.repository';
-import { InstalledPackagesRepository } from '@/databases/repositories/installed-packages.repository';
 
 import { COMMUNITY_NODE_VERSION, COMMUNITY_PACKAGE_VERSION } from '../constants';
 import { randomName } from '../random';

packages/cli/test/integration/user.repository.test.ts

@@ -1,6 +1,6 @@
+import { ProjectRelationRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';
 
 import { createAdmin, createMember, createOwner } from './shared/db/users';

packages/cli/test/integration/users.api.test.ts

@@ -1,12 +1,12 @@
 import type { User } from '@n8n/db';
+import { FolderRepository } from '@n8n/db';
+import { ProjectRelationRepository } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { v4 as uuid } from 'uuid';
 
 import { RESPONSE_ERROR_MESSAGES } from '@/constants';
 import { UsersController } from '@/controllers/users.controller';
-import { FolderRepository } from '@/databases/repositories/folder.repository';
-import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { UserRepository } from '@/databases/repositories/user.repository';

packages/cli/test/integration/workflows/workflows.controller.ee.test.ts

@@ -1,6 +1,7 @@
 import type { Project } from '@n8n/db';
 import type { User } from '@n8n/db';
 import type { WorkflowWithSharingsMetaDataAndCredentials } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { ProjectRole } from '@n8n/permissions';
 import { ApplicationError, WorkflowActivationError, type INode } from 'n8n-workflow';
@@ -8,7 +9,6 @@ import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import config from '@/config';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
 import { WorkflowRepository } from '@/databases/repositories/workflow.repository';

packages/cli/test/integration/workflows/workflows.controller.test.ts

@@ -1,5 +1,6 @@
 import type { User } from '@n8n/db';
 import type { ListQueryDb } from '@n8n/db';
+import { ProjectRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { Scope } from '@n8n/permissions';
 import { DateTime } from 'luxon';
@@ -7,7 +8,6 @@ import { PROJECT_ROOT, type INode, type IPinData, type IWorkflowBase } from 'n8n
 import { v4 as uuid } from 'uuid';
 
 import { ActiveWorkflowManager } from '@/active-workflow-manager';
-import { ProjectRepository } from '@/databases/repositories/project.repository';
 import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
 import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
 import type { WorkflowFolderUnionFull } from '@/databases/repositories/workflow.repository';