refactor(core): Move final batch of entities to @n8n/db (#15061)

packages/cli/src/databases/config.ts

@@ -1,4 +1,5 @@
 import { GlobalConfig } from '@n8n/config';
+import { entities } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { DataSourceOptions, LoggerOptions } from '@n8n/typeorm';
 import type { MysqlConnectionOptions } from '@n8n/typeorm/driver/mysql/MysqlConnectionOptions';
@@ -10,7 +11,10 @@ import { UserError } from 'n8n-workflow';
 import path from 'path';
 import type { TlsOptions } from 'tls';
 
-import { entities } from './entities';
+import { InsightsByPeriod } from '@/modules/insights/database/entities/insights-by-period';
+import { InsightsMetadata } from '@/modules/insights/database/entities/insights-metadata';
+import { InsightsRaw } from '@/modules/insights/database/entities/insights-raw';
+
 import { mysqlMigrations } from './migrations/mysqldb';
 import { postgresMigrations } from './migrations/postgresdb';
 import { sqliteMigrations } from './migrations/sqlite';
@@ -32,7 +36,7 @@ const getCommonOptions = () => {
 
 	return {
 		entityPrefix,
-		entities: Object.values(entities),
+		entities: [...Object.values(entities), InsightsRaw, InsightsByPeriod, InsightsMetadata],
 		subscribers: Object.values(subscribers),
 		migrationsTableName: `${entityPrefix}migrations`,
 		migrationsRun: false,

packages/cli/src/databases/entities/__tests__/user.entity.test.ts

@@ -1,35 +0,0 @@
-import { User } from '@n8n/db';
-
-describe('User Entity', () => {
-	describe('JSON.stringify', () => {
-		it('should not serialize sensitive data', () => {
-			const user = Object.assign(new User(), {
-				email: 'test@example.com',
-				firstName: 'Don',
-				lastName: 'Joe',
-				password: '123456789',
-			});
-			expect(JSON.stringify(user)).toEqual(
-				'{"email":"test@example.com","firstName":"Don","lastName":"Joe"}',
-			);
-		});
-	});
-
-	describe('createPersonalProjectName', () => {
-		test.each([
-			['Nathan', 'Nathaniel', 'nathan@nathaniel.n8n', 'Nathan Nathaniel <nathan@nathaniel.n8n>'],
-			[undefined, 'Nathaniel', 'nathan@nathaniel.n8n', '<nathan@nathaniel.n8n>'],
-			['Nathan', undefined, 'nathan@nathaniel.n8n', '<nathan@nathaniel.n8n>'],
-			[undefined, undefined, 'nathan@nathaniel.n8n', '<nathan@nathaniel.n8n>'],
-			[undefined, undefined, undefined, 'Unnamed Project'],
-			['Nathan', 'Nathaniel', undefined, 'Unnamed Project'],
-		])(
-			'given fistName: %s, lastName: %s and email: %s this gives the projectName: "%s"',
-			async (firstName, lastName, email, projectName) => {
-				const user = new User();
-				Object.assign(user, { firstName, lastName, email });
-				expect(user.createPersonalProjectName()).toBe(projectName);
-			},
-		);
-	});
-});

packages/cli/src/databases/entities/annotation-tag-entity.ee.ts

@@ -1,21 +0,0 @@
-import { WithTimestampsAndStringId } from '@n8n/db';
-import { Column, Entity, Index, ManyToMany, OneToMany } from '@n8n/typeorm';
-import { IsString, Length } from 'class-validator';
-
-import type { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
-import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
-
-@Entity()
-export class AnnotationTagEntity extends WithTimestampsAndStringId {
-	@Column({ length: 24 })
-	@Index({ unique: true })
-	@IsString({ message: 'Tag name must be of type string.' })
-	@Length(1, 24, { message: 'Tag name must be $constraint1 to $constraint2 characters long.' })
-	name: string;
-
-	@ManyToMany('ExecutionAnnotation', 'tags')
-	annotations: ExecutionAnnotation[];
-
-	@OneToMany('AnnotationTagMapping', 'tags')
-	annotationMappings: AnnotationTagMapping[];
-}

packages/cli/src/databases/entities/annotation-tag-mapping.ee.ts

@@ -1,24 +0,0 @@
-import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
-
-import type { AnnotationTagEntity } from './annotation-tag-entity.ee';
-import type { ExecutionAnnotation } from './execution-annotation.ee';
-
-/**
- * This entity represents the junction table between the execution annotations and the tags
- */
-@Entity({ name: 'execution_annotation_tags' })
-export class AnnotationTagMapping {
-	@PrimaryColumn()
-	annotationId: number;
-
-	@ManyToOne('ExecutionAnnotation', 'tagMappings')
-	@JoinColumn({ name: 'annotationId' })
-	annotations: ExecutionAnnotation[];
-
-	@PrimaryColumn()
-	tagId: string;
-
-	@ManyToOne('AnnotationTagEntity', 'annotationMappings')
-	@JoinColumn({ name: 'tagId' })
-	tags: AnnotationTagEntity[];
-}

packages/cli/src/databases/entities/auth-provider-sync-history.ts

@@ -1,41 +0,0 @@
-import { DateTimeColumn, AuthProviderType } from '@n8n/db';
-import { Column, Entity, PrimaryGeneratedColumn } from '@n8n/typeorm';
-
-export type RunningMode = 'dry' | 'live';
-export type SyncStatus = 'success' | 'error';
-
-@Entity()
-export class AuthProviderSyncHistory {
-	@PrimaryGeneratedColumn()
-	id: number;
-
-	@Column('text')
-	providerType: AuthProviderType;
-
-	@Column('text')
-	runMode: RunningMode;
-
-	@Column('text')
-	status: SyncStatus;
-
-	@DateTimeColumn()
-	startedAt: Date;
-
-	@DateTimeColumn()
-	endedAt: Date;
-
-	@Column()
-	scanned: number;
-
-	@Column()
-	created: number;
-
-	@Column()
-	updated: number;
-
-	@Column()
-	disabled: number;
-
-	@Column()
-	error: string;
-}

packages/cli/src/databases/entities/auth-user.ts

@@ -1,11 +0,0 @@
-import { User } from '@n8n/db';
-import { Column, Entity } from '@n8n/typeorm';
-
-@Entity({ name: 'user' })
-export class AuthUser extends User {
-	@Column({ type: String, nullable: true })
-	mfaSecret?: string | null;
-
-	@Column({ type: 'simple-array', default: '' })
-	mfaRecoveryCodes: string[];
-}

packages/cli/src/databases/entities/execution-annotation.ee.ts

@@ -1,62 +0,0 @@
-import {
-	Column,
-	Entity,
-	Index,
-	JoinColumn,
-	JoinTable,
-	ManyToMany,
-	OneToMany,
-	OneToOne,
-	PrimaryGeneratedColumn,
-	RelationId,
-} from '@n8n/typeorm';
-import type { AnnotationVote } from 'n8n-workflow';
-
-import type { AnnotationTagEntity } from './annotation-tag-entity.ee';
-import type { AnnotationTagMapping } from './annotation-tag-mapping.ee';
-import { ExecutionEntity } from './execution-entity';
-
-@Entity({ name: 'execution_annotations' })
-export class ExecutionAnnotation {
-	@PrimaryGeneratedColumn()
-	id: number;
-
-	/**
-	 * This field stores the up- or down-vote of the execution by user.
-	 */
-	@Column({ type: 'varchar', nullable: true })
-	vote: AnnotationVote | null;
-
-	/**
-	 * Custom text note added to the execution by user.
-	 */
-	@Column({ type: 'varchar', nullable: true })
-	note: string | null;
-
-	@RelationId((annotation: ExecutionAnnotation) => annotation.execution)
-	executionId: string;
-
-	@Index({ unique: true })
-	@OneToOne('ExecutionEntity', 'annotation', {
-		onDelete: 'CASCADE',
-	})
-	@JoinColumn({ name: 'executionId' })
-	execution: ExecutionEntity;
-
-	@ManyToMany('AnnotationTagEntity', 'annotations')
-	@JoinTable({
-		name: 'execution_annotation_tags', // table name for the junction table of this relation
-		joinColumn: {
-			name: 'annotationId',
-			referencedColumnName: 'id',
-		},
-		inverseJoinColumn: {
-			name: 'tagId',
-			referencedColumnName: 'id',
-		},
-	})
-	tags?: AnnotationTagEntity[];
-
-	@OneToMany('AnnotationTagMapping', 'annotations')
-	tagMappings: AnnotationTagMapping[];
-}

packages/cli/src/databases/entities/execution-data.ts

@@ -1,27 +0,0 @@
-import { JsonColumn, idStringifier } from '@n8n/db';
-import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
-import { IWorkflowBase } from 'n8n-workflow';
-
-import { ExecutionEntity } from './execution-entity';
-
-@Entity()
-export class ExecutionData {
-	@Column('text')
-	data: string;
-
-	// WARNING: the workflowData column has been changed from IWorkflowDb to IWorkflowBase
-	// when ExecutionData was introduced as a separate entity.
-	// This is because manual executions of unsaved workflows have no workflow id
-	// and IWorkflowDb has it as a mandatory field. IWorkflowBase reflects the correct
-	// data structure for this entity.
-	@JsonColumn()
-	workflowData: IWorkflowBase;
-
-	@PrimaryColumn({ transformer: idStringifier })
-	executionId: string;
-
-	@ManyToOne('ExecutionEntity', 'data', {
-		onDelete: 'CASCADE',
-	})
-	execution: ExecutionEntity;
-}

packages/cli/src/databases/entities/execution-entity.ts

@@ -1,90 +0,0 @@
-import { DateTimeColumn, datetimeColumnType, idStringifier, WorkflowEntity } from '@n8n/db';
-import {
-	Column,
-	Entity,
-	Generated,
-	Index,
-	ManyToOne,
-	OneToMany,
-	OneToOne,
-	PrimaryColumn,
-	Relation,
-	DeleteDateColumn,
-} from '@n8n/typeorm';
-import type { SimpleColumnType } from '@n8n/typeorm/driver/types/ColumnTypes';
-import { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
-
-import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
-
-import type { ExecutionData } from './execution-data';
-import type { ExecutionMetadata } from './execution-metadata';
-
-@Entity()
-@Index(['workflowId', 'id'])
-@Index(['waitTill', 'id'])
-@Index(['finished', 'id'])
-@Index(['workflowId', 'finished', 'id'])
-@Index(['workflowId', 'waitTill', 'id'])
-export class ExecutionEntity {
-	@Generated()
-	@PrimaryColumn({ transformer: idStringifier })
-	id: string;
-
-	/**
-	 * Whether the execution finished sucessfully.
-	 *
-	 * @deprecated Use `status` instead
-	 */
-	@Column()
-	finished: boolean;
-
-	@Column('varchar')
-	mode: WorkflowExecuteMode;
-
-	@Column({ nullable: true })
-	retryOf: string;
-
-	@Column({ nullable: true })
-	retrySuccessId: string;
-
-	@Column('varchar')
-	status: ExecutionStatus;
-
-	@Column(datetimeColumnType)
-	createdAt: Date;
-
-	/**
-	 * Time when the processing of the execution actually started. This column
-	 * is `null` when an execution is enqueued but has not started yet.
-	 */
-	@Column({
-		type: datetimeColumnType as SimpleColumnType,
-		nullable: true,
-	})
-	startedAt: Date | null;
-
-	@Index()
-	@DateTimeColumn({ nullable: true })
-	stoppedAt: Date;
-
-	@DeleteDateColumn({ type: datetimeColumnType as SimpleColumnType, nullable: true })
-	deletedAt: Date;
-
-	@Column({ nullable: true })
-	workflowId: string;
-
-	@DateTimeColumn({ nullable: true })
-	waitTill: Date | null;
-
-	@OneToMany('ExecutionMetadata', 'execution')
-	metadata: ExecutionMetadata[];
-
-	@OneToOne('ExecutionData', 'execution')
-	executionData: Relation<ExecutionData>;
-
-	@OneToOne('ExecutionAnnotation', 'execution')
-	annotation?: Relation<ExecutionAnnotation>;
-
-	@ManyToOne('WorkflowEntity')
-	workflow: WorkflowEntity;
-}

packages/cli/src/databases/entities/execution-metadata.ts

@@ -1,23 +0,0 @@
-import { Column, Entity, ManyToOne, PrimaryGeneratedColumn } from '@n8n/typeorm';
-
-import { ExecutionEntity } from './execution-entity';
-
-@Entity()
-export class ExecutionMetadata {
-	@PrimaryGeneratedColumn()
-	id: number;
-
-	@ManyToOne('ExecutionEntity', 'metadata', {
-		onDelete: 'CASCADE',
-	})
-	execution: ExecutionEntity;
-
-	@Column()
-	executionId: string;
-
-	@Column('text')
-	key: string;
-
-	@Column('text')
-	value: string;
-}

packages/cli/src/databases/entities/index.ts

@@ -1,82 +0,0 @@
-import {
-	EventDestinations,
-	InstalledNodes,
-	InstalledPackages,
-	InvalidAuthToken,
-	ProcessedData,
-	Settings,
-	Variables,
-	WebhookEntity,
-	AuthIdentity,
-	User,
-	WorkflowEntity,
-	CredentialsEntity,
-	ApiKey,
-	Folder,
-	FolderTagMapping,
-	Project,
-	ProjectRelation,
-	SharedCredentials,
-	SharedWorkflow,
-	TagEntity,
-	WorkflowStatistics,
-	WorkflowTagMapping,
-} from '@n8n/db';
-
-import { AnnotationTagEntity } from './annotation-tag-entity.ee';
-import { AnnotationTagMapping } from './annotation-tag-mapping.ee';
-import { AuthProviderSyncHistory } from './auth-provider-sync-history';
-import { AuthUser } from './auth-user';
-import { ExecutionAnnotation } from './execution-annotation.ee';
-import { ExecutionData } from './execution-data';
-import { ExecutionEntity } from './execution-entity';
-import { ExecutionMetadata } from './execution-metadata';
-import { TestCaseExecution } from './test-case-execution.ee';
-import { TestDefinition } from './test-definition.ee';
-import { TestMetric } from './test-metric.ee';
-import { TestRun } from './test-run.ee';
-import { WorkflowHistory } from './workflow-history';
-import { InsightsByPeriod } from '../../modules/insights/database/entities/insights-by-period';
-import { InsightsMetadata } from '../../modules/insights/database/entities/insights-metadata';
-import { InsightsRaw } from '../../modules/insights/database/entities/insights-raw';
-
-export const entities = {
-	AnnotationTagEntity,
-	AnnotationTagMapping,
-	AuthIdentity,
-	AuthProviderSyncHistory,
-	AuthUser,
-	CredentialsEntity,
-	EventDestinations,
-	ExecutionAnnotation,
-	ExecutionEntity,
-	InstalledNodes,
-	InstalledPackages,
-	InvalidAuthToken,
-	Settings,
-	SharedCredentials,
-	SharedWorkflow,
-	TagEntity,
-	User,
-	Variables,
-	WebhookEntity,
-	WorkflowEntity,
-	WorkflowTagMapping,
-	WorkflowStatistics,
-	ExecutionMetadata,
-	ExecutionData,
-	WorkflowHistory,
-	Project,
-	ProjectRelation,
-	ApiKey,
-	ProcessedData,
-	TestDefinition,
-	TestMetric,
-	TestRun,
-	TestCaseExecution,
-	Folder,
-	FolderTagMapping,
-	InsightsRaw,
-	InsightsMetadata,
-	InsightsByPeriod,
-};

packages/cli/src/databases/entities/test-case-execution.ee.ts

@@ -1,75 +0,0 @@
-import { DateTimeColumn, JsonColumn, WithStringId } from '@n8n/db';
-import { Column, Entity, ManyToOne, OneToOne } from '@n8n/typeorm';
-import type { IDataObject } from 'n8n-workflow';
-
-import type { ExecutionEntity } from '@/databases/entities/execution-entity';
-import { TestRun } from '@/databases/entities/test-run.ee';
-import type { TestCaseExecutionErrorCode } from '@/evaluation.ee/test-runner/errors.ee';
-
-export type TestCaseRunMetrics = Record<string, number | boolean>;
-
-export type TestCaseExecutionStatus =
-	| 'new' // Test case execution was created and added to the test run, but has not been started yet
-	| 'running' // Workflow under test is running
-	| 'evaluation_running' // Evaluation workflow is running
-	| 'success' // Both workflows have completed successfully
-	| 'error' // An error occurred during the execution of workflow under test or evaluation workflow
-	| 'warning' // There were warnings during the execution of workflow under test or evaluation workflow. Used only to signal possible issues to user, not to indicate a failure.
-	| 'cancelled';
-
-/**
- * This entity represents the linking between the test runs and individual executions.
- * It stores status, links to past, new and evaluation executions, and metrics produced by individual evaluation wf executions
- * Entries in this table are meant to outlive the execution entities, which might be pruned over time.
- * This allows us to keep track of the details of test runs' status and metrics even after the executions are deleted.
- */
-@Entity({ name: 'test_case_execution' })
-export class TestCaseExecution extends WithStringId {
-	@ManyToOne('TestRun')
-	testRun: TestRun;
-
-	@ManyToOne('ExecutionEntity', {
-		onDelete: 'SET NULL',
-		nullable: true,
-	})
-	pastExecution: ExecutionEntity | null;
-
-	@Column({ type: 'varchar', nullable: true })
-	pastExecutionId: string | null;
-
-	@OneToOne('ExecutionEntity', {
-		onDelete: 'SET NULL',
-		nullable: true,
-	})
-	execution: ExecutionEntity | null;
-
-	@Column({ type: 'varchar', nullable: true })
-	executionId: string | null;
-
-	@OneToOne('ExecutionEntity', {
-		onDelete: 'SET NULL',
-		nullable: true,
-	})
-	evaluationExecution: ExecutionEntity | null;
-
-	@Column({ type: 'varchar', nullable: true })
-	evaluationExecutionId: string | null;
-
-	@Column()
-	status: TestCaseExecutionStatus;
-
-	@DateTimeColumn({ nullable: true })
-	runAt: Date | null;
-
-	@DateTimeColumn({ nullable: true })
-	completedAt: Date | null;
-
-	@Column('varchar', { nullable: true })
-	errorCode: TestCaseExecutionErrorCode | null;
-
-	@JsonColumn({ nullable: true })
-	errorDetails: IDataObject | null;
-
-	@JsonColumn({ nullable: true })
-	metrics: TestCaseRunMetrics;
-}

packages/cli/src/databases/entities/test-definition.ee.ts

@@ -1,67 +0,0 @@
-import { JsonColumn, WithTimestampsAndStringId, WorkflowEntity } from '@n8n/db';
-import { Column, Entity, Index, ManyToOne, OneToMany, RelationId } from '@n8n/typeorm';
-import { Length } from 'class-validator';
-
-import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
-import type { TestMetric } from '@/databases/entities/test-metric.ee';
-
-// Entity representing a node in a workflow under test, for which data should be mocked during test execution
-export type MockedNodeItem = {
-	name?: string;
-	id: string;
-};
-
-/**
- * Entity representing a Test Definition
- * It combines:
- * - the workflow under test
- * - the workflow used to evaluate the results of test execution
- * - the filter used to select test cases from previous executions of the workflow under test - annotation tag
- */
-@Entity()
-@Index(['workflow'])
-@Index(['evaluationWorkflow'])
-export class TestDefinition extends WithTimestampsAndStringId {
-	@Column({ length: 255 })
-	@Length(1, 255, {
-		message: 'Test definition name must be $constraint1 to $constraint2 characters long.',
-	})
-	name: string;
-
-	@Column('text')
-	description: string;
-
-	@JsonColumn({ default: '[]' })
-	mockedNodes: MockedNodeItem[];
-
-	/**
-	 * Relation to the workflow under test
-	 */
-	@ManyToOne('WorkflowEntity', 'tests')
-	workflow: WorkflowEntity;
-
-	@RelationId((test: TestDefinition) => test.workflow)
-	workflowId: string;
-
-	/**
-	 * Relation to the workflow used to evaluate the results of test execution
-	 */
-	@ManyToOne('WorkflowEntity', 'evaluationTests')
-	evaluationWorkflow: WorkflowEntity;
-
-	@RelationId((test: TestDefinition) => test.evaluationWorkflow)
-	evaluationWorkflowId: string;
-
-	/**
-	 * Relation to the annotation tag associated with the test
-	 * This tag will be used to select the test cases to run from previous executions
-	 */
-	@ManyToOne('AnnotationTagEntity', 'test')
-	annotationTag: AnnotationTagEntity;
-
-	@RelationId((test: TestDefinition) => test.annotationTag)
-	annotationTagId: string;
-
-	@OneToMany('TestMetric', 'testDefinition')
-	metrics: TestMetric[];
-}

packages/cli/src/databases/entities/test-metric.ee.ts

@@ -1,29 +0,0 @@
-import { WithTimestampsAndStringId } from '@n8n/db';
-import { Column, Entity, Index, ManyToOne } from '@n8n/typeorm';
-import { Length } from 'class-validator';
-
-import { TestDefinition } from '@/databases/entities/test-definition.ee';
-
-/**
- * Entity representing a Test Metric
- * It represents a single metric that can be retrieved from evaluation workflow execution result
- */
-@Entity()
-@Index(['testDefinition'])
-export class TestMetric extends WithTimestampsAndStringId {
-	/**
-	 * Name of the metric.
-	 * This will be used as a property name to extract metric value from the evaluation workflow execution result object
-	 */
-	@Column({ length: 255 })
-	@Length(1, 255, {
-		message: 'Metric name must be $constraint1 to $constraint2 characters long.',
-	})
-	name: string;
-
-	/**
-	 * Relation to test definition
-	 */
-	@ManyToOne('TestDefinition', 'metrics')
-	testDefinition: TestDefinition;
-}

packages/cli/src/databases/entities/test-run.ee.ts

@@ -1,79 +0,0 @@
-import { WithTimestampsAndStringId, JsonColumn, DateTimeColumn } from '@n8n/db';
-import { Column, Entity, Index, ManyToOne, OneToMany, RelationId } from '@n8n/typeorm';
-import type { IDataObject } from 'n8n-workflow';
-
-import type { TestCaseExecution } from '@/databases/entities/test-case-execution.ee';
-import { TestDefinition } from '@/databases/entities/test-definition.ee';
-import type { TestRunFinalResult } from '@/databases/repositories/test-run.repository.ee';
-import type { TestRunErrorCode } from '@/evaluation.ee/test-runner/errors.ee';
-
-export type TestRunStatus = 'new' | 'running' | 'completed' | 'error' | 'cancelled';
-
-export type AggregatedTestRunMetrics = Record<string, number | boolean>;
-
-/**
- * Entity representing a Test Run.
- * It stores info about a specific run of a test, combining the test definition with the status and collected metrics
- */
-@Entity()
-@Index(['testDefinition'])
-export class TestRun extends WithTimestampsAndStringId {
-	@ManyToOne('TestDefinition', 'runs')
-	testDefinition: TestDefinition;
-
-	@RelationId((testRun: TestRun) => testRun.testDefinition)
-	testDefinitionId: string;
-
-	@Column('varchar')
-	status: TestRunStatus;
-
-	@DateTimeColumn({ nullable: true })
-	runAt: Date | null;
-
-	@DateTimeColumn({ nullable: true })
-	completedAt: Date | null;
-
-	@JsonColumn({ nullable: true })
-	metrics: AggregatedTestRunMetrics;
-
-	/**
-	 * Total number of the test cases, matching the filter condition of the test definition (specified annotationTag)
-	 */
-	@Column('integer', { nullable: true })
-	totalCases: number;
-
-	/**
-	 * Number of test cases that passed (evaluation workflow was executed successfully)
-	 */
-	@Column('integer', { nullable: true })
-	passedCases: number;
-
-	/**
-	 * Number of failed test cases
-	 * (any unexpected exception happened during the execution or evaluation workflow ended with an error)
-	 */
-	@Column('integer', { nullable: true })
-	failedCases: number;
-
-	/**
-	 * This will contain the error code if the test run failed.
-	 * This is used for test run level errors, not for individual test case errors.
-	 */
-	@Column('varchar', { nullable: true, length: 255 })
-	errorCode: TestRunErrorCode | null;
-
-	/**
-	 * Optional details about the error that happened during the test run
-	 */
-	@JsonColumn({ nullable: true })
-	errorDetails: IDataObject | null;
-
-	@OneToMany('TestCaseExecution', 'testRun')
-	testCaseExecutions: TestCaseExecution[];
-
-	/**
-	 * Calculated property to determine the final result of the test run
-	 * depending on the statuses of test case executions
-	 */
-	finalResult?: TestRunFinalResult | null;
-}

packages/cli/src/databases/entities/workflow-history.ts

@@ -1,27 +0,0 @@
-import { JsonColumn, WithTimestamps, WorkflowEntity } from '@n8n/db';
-import { Column, Entity, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
-import { IConnections } from 'n8n-workflow';
-import type { INode } from 'n8n-workflow';
-
-@Entity()
-export class WorkflowHistory extends WithTimestamps {
-	@PrimaryColumn()
-	versionId: string;
-
-	@Column()
-	workflowId: string;
-
-	@JsonColumn()
-	nodes: INode[];
-
-	@JsonColumn()
-	connections: IConnections;
-
-	@Column()
-	authors: string;
-
-	@ManyToOne('WorkflowEntity', {
-		onDelete: 'CASCADE',
-	})
-	workflow: WorkflowEntity;
-}

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

@@ -1,6 +1,7 @@
 import { GlobalConfig } from '@n8n/config';
 import type { SqliteConfig } from '@n8n/config/src/configs/database.config';
 import type { IExecutionResponse } from '@n8n/db';
+import { ExecutionEntity } from '@n8n/db';
 import { Container } from '@n8n/di';
 import type { SelectQueryBuilder } from '@n8n/typeorm';
 import { Not, LessThanOrEqual } from '@n8n/typeorm';
@@ -9,7 +10,6 @@ import { BinaryDataService } from 'n8n-core';
 import type { IRunExecutionData, IWorkflowBase } from 'n8n-workflow';
 import { nanoid } from 'nanoid';
 
-import { ExecutionEntity } from '@/databases/entities/execution-entity';
 import { ExecutionRepository } from '@/databases/repositories/execution.repository';
 import { mockInstance, mockEntityManager } from '@test/mocking';
 

packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts

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

packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts

@@ -1,8 +1,7 @@
+import { AnnotationTagEntity } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { DataSource, Repository } from '@n8n/typeorm';
 
-import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
-
 @Service()
 export class AnnotationTagRepository extends Repository<AnnotationTagEntity> {
 	constructor(dataSource: DataSource) {

packages/cli/src/databases/repositories/auth-provider-sync-history.repository.ts

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

packages/cli/src/databases/repositories/auth-user.repository.ts

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

packages/cli/src/databases/repositories/execution-annotation.repository.ts

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

packages/cli/src/databases/repositories/execution-data.repository.ts

@@ -1,10 +1,9 @@
+import { ExecutionData } from '@n8n/db';
 import { Service } from '@n8n/di';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 import type { EntityManager } from '@n8n/typeorm';
 import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
 
-import { ExecutionData } from '../entities/execution-data';
-
 @Service()
 export class ExecutionDataRepository extends Repository<ExecutionData> {
 	constructor(dataSource: DataSource) {

packages/cli/src/databases/repositories/execution-metadata.repository.ts

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

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

@@ -6,7 +6,17 @@ import type {
 	IExecutionResponse,
 	ExecutionSummaries,
 } from '@n8n/db';
-import { separate, SharedWorkflow, WorkflowEntity } from '@n8n/db';
+import {
+	separate,
+	SharedWorkflow,
+	WorkflowEntity,
+	AnnotationTagEntity,
+	AnnotationTagMapping,
+	ExecutionData,
+	ExecutionEntity,
+	ExecutionAnnotation,
+	ExecutionMetadata,
+} from '@n8n/db';
 import { Service } from '@n8n/di';
 import type {
 	FindManyOptions,
@@ -39,15 +49,9 @@ import type {
 	IRunExecutionData,
 } from 'n8n-workflow';
 
-import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
-import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
-import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
 import { PostgresLiveRowsRetrievalError } from '@/errors/postgres-live-rows-retrieval.error';
 
 import { ExecutionDataRepository } from './execution-data.repository';
-import { ExecutionData } from '../entities/execution-data';
-import { ExecutionEntity } from '../entities/execution-entity';
-import { ExecutionMetadata } from '../entities/execution-metadata';
 
 export interface IGetExecutionsQueryFilter {
 	id?: FindOperator<string> | string;

packages/cli/src/databases/repositories/test-case-execution.repository.ee.ts

@@ -1,12 +1,11 @@
+import { TestCaseExecution } from '@n8n/db';
+import type { TestCaseExecutionErrorCode } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { EntityManager } from '@n8n/typeorm';
 import { DataSource, In, Not, Repository } from '@n8n/typeorm';
 import type { DeepPartial } from '@n8n/typeorm/common/DeepPartial';
 import type { IDataObject } from 'n8n-workflow';
 
-import { TestCaseExecution } from '@/databases/entities/test-case-execution.ee';
-import type { TestCaseExecutionErrorCode } from '@/evaluation.ee/test-runner/errors.ee';
-
 type StatusUpdateOptions = {
 	testRunId: string;
 	pastExecutionId: string;

packages/cli/src/databases/repositories/test-definition.repository.ee.ts

@@ -1,8 +1,8 @@
+import { TestDefinition } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { FindManyOptions, FindOptionsWhere } from '@n8n/typeorm';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 
-import { TestDefinition } from '@/databases/entities/test-definition.ee';
 import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
 import type { ListQuery } from '@/requests';
 

packages/cli/src/databases/repositories/test-metric.repository.ee.ts

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

packages/cli/src/databases/repositories/test-run.repository.ee.ts

@@ -1,17 +1,14 @@
+import type { AggregatedTestRunMetrics, TestRunErrorCode, TestRunFinalResult } from '@n8n/db';
+import { TestRun } from '@n8n/db';
 import { Service } from '@n8n/di';
 import type { EntityManager, FindManyOptions } from '@n8n/typeorm';
 import { DataSource, In, Repository } from '@n8n/typeorm';
 import type { IDataObject } from 'n8n-workflow';
 
-import type { AggregatedTestRunMetrics } from '@/databases/entities/test-run.ee';
-import { TestRun } from '@/databases/entities/test-run.ee';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
-import type { TestRunErrorCode } from '@/evaluation.ee/test-runner/errors.ee';
 import { getTestRunFinalResult } from '@/evaluation.ee/test-runner/utils.ee';
 import type { ListQuery } from '@/requests';
 
-export type TestRunFinalResult = 'success' | 'error' | 'warning';
-
 export type TestRunSummary = TestRun & {
 	finalResult: TestRunFinalResult | null;
 };

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

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