diff --git a/.github/workflows/ci-postgres-mysql.yml b/.github/workflows/ci-postgres-mysql.yml index 07ac754356..f3464a2467 100644 --- a/.github/workflows/ci-postgres-mysql.yml +++ b/.github/workflows/ci-postgres-mysql.yml @@ -7,6 +7,7 @@ on: pull_request: paths: - packages/cli/src/databases/** + - packages/cli/src/modules/*/database/** - .github/workflows/ci-postgres-mysql.yml - .github/docker-compose.yml pull_request_review: diff --git a/packages/cli/src/databases/entities/index.ts b/packages/cli/src/databases/entities/index.ts index 1066aa059c..aab1044abf 100644 --- a/packages/cli/src/databases/entities/index.ts +++ b/packages/cli/src/databases/entities/index.ts @@ -33,9 +33,9 @@ import { WorkflowEntity } from './workflow-entity'; import { WorkflowHistory } from './workflow-history'; import { WorkflowStatistics } from './workflow-statistics'; import { WorkflowTagMapping } from './workflow-tag-mapping'; -import { InsightsByPeriod } from '../../modules/insights/entities/insights-by-period'; -import { InsightsMetadata } from '../../modules/insights/entities/insights-metadata'; -import { InsightsRaw } from '../../modules/insights/entities/insights-raw'; +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, diff --git a/packages/cli/src/modules/insights/__tests__/insights.controller.test.ts b/packages/cli/src/modules/insights/__tests__/insights.controller.test.ts index 82f7696b95..c13f0b8f43 100644 --- a/packages/cli/src/modules/insights/__tests__/insights.controller.test.ts +++ b/packages/cli/src/modules/insights/__tests__/insights.controller.test.ts @@ -3,9 +3,9 @@ import { Container } from '@n8n/di'; import { mockInstance } from '@test/mocking'; import * as testDb from '@test-integration/test-db'; -import { TypeToNumber } from '../entities/insights-shared'; +import { TypeToNumber } from '../database/entities/insights-shared'; +import { InsightsByPeriodRepository } from '../database/repositories/insights-by-period.repository'; import { InsightsController } from '../insights.controller'; -import { InsightsByPeriodRepository } from '../repositories/insights-by-period.repository'; // Initialize DB once for all tests beforeAll(async () => { diff --git a/packages/cli/src/modules/insights/__tests__/insights.service.test.ts b/packages/cli/src/modules/insights/__tests__/insights.service.test.ts index 36bb41c5c9..0805d190c2 100644 --- a/packages/cli/src/modules/insights/__tests__/insights.service.test.ts +++ b/packages/cli/src/modules/insights/__tests__/insights.service.test.ts @@ -7,9 +7,9 @@ import type { ExecutionStatus, IRun, WorkflowExecuteMode } from 'n8n-workflow'; import type { Project } from '@/databases/entities/project'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { IWorkflowDb } from '@/interfaces'; -import type { TypeUnit } from '@/modules/insights/entities/insights-shared'; -import { InsightsMetadataRepository } from '@/modules/insights/repositories/insights-metadata.repository'; -import { InsightsRawRepository } from '@/modules/insights/repositories/insights-raw.repository'; +import type { TypeUnit } from '@/modules/insights/database/entities/insights-shared'; +import { InsightsMetadataRepository } from '@/modules/insights/database/repositories/insights-metadata.repository'; +import { InsightsRawRepository } from '@/modules/insights/database/repositories/insights-raw.repository'; import { createTeamProject } from '@test-integration/db/projects'; import { createWorkflow } from '@test-integration/db/workflows'; import * as testDb from '@test-integration/test-db'; @@ -19,9 +19,9 @@ import { createRawInsightsEvent, createCompactedInsightsEvent, createRawInsightsEvents, -} from '../entities/__tests__/db-utils'; +} from '../database/entities/__tests__/db-utils'; +import { InsightsByPeriodRepository } from '../database/repositories/insights-by-period.repository'; import { InsightsService } from '../insights.service'; -import { InsightsByPeriodRepository } from '../repositories/insights-by-period.repository'; async function truncateAll() { const insightsRawRepository = Container.get(InsightsRawRepository); diff --git a/packages/cli/src/modules/insights/entities/__tests__/db-utils.ts b/packages/cli/src/modules/insights/database/entities/__tests__/db-utils.ts similarity index 96% rename from packages/cli/src/modules/insights/entities/__tests__/db-utils.ts rename to packages/cli/src/modules/insights/database/entities/__tests__/db-utils.ts index 84e1e203c2..03c4b0f31c 100644 --- a/packages/cli/src/modules/insights/entities/__tests__/db-utils.ts +++ b/packages/cli/src/modules/insights/database/entities/__tests__/db-utils.ts @@ -5,12 +5,12 @@ import type { IWorkflowBase } from 'n8n-workflow'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import { InsightsMetadata } from '../../entities/insights-metadata'; -import { InsightsRaw } from '../../entities/insights-raw'; import { InsightsByPeriodRepository } from '../../repositories/insights-by-period.repository'; import { InsightsMetadataRepository } from '../../repositories/insights-metadata.repository'; import { InsightsRawRepository } from '../../repositories/insights-raw.repository'; import { InsightsByPeriod } from '../insights-by-period'; +import { InsightsMetadata } from '../insights-metadata'; +import { InsightsRaw } from '../insights-raw'; async function getWorkflowSharing(workflow: IWorkflowBase) { return await Container.get(SharedWorkflowRepository).find({ diff --git a/packages/cli/src/modules/insights/entities/__tests__/insights-by-period.test.ts b/packages/cli/src/modules/insights/database/entities/__tests__/insights-by-period.test.ts similarity index 100% rename from packages/cli/src/modules/insights/entities/__tests__/insights-by-period.test.ts rename to packages/cli/src/modules/insights/database/entities/__tests__/insights-by-period.test.ts diff --git a/packages/cli/src/modules/insights/entities/__tests__/insights-raw.test.ts b/packages/cli/src/modules/insights/database/entities/__tests__/insights-raw.test.ts similarity index 100% rename from packages/cli/src/modules/insights/entities/__tests__/insights-raw.test.ts rename to packages/cli/src/modules/insights/database/entities/__tests__/insights-raw.test.ts diff --git a/packages/cli/src/modules/insights/entities/insights-by-period.ts b/packages/cli/src/modules/insights/database/entities/insights-by-period.ts similarity index 93% rename from packages/cli/src/modules/insights/entities/insights-by-period.ts rename to packages/cli/src/modules/insights/database/entities/insights-by-period.ts index 34b7abb15b..25c8ae6cc0 100644 --- a/packages/cli/src/modules/insights/entities/insights-by-period.ts +++ b/packages/cli/src/modules/insights/database/entities/insights-by-period.ts @@ -10,7 +10,7 @@ import { PeriodUnitToNumber, TypeToNumber, } from './insights-shared'; -import { datetimeColumnType } from '../../../databases/entities/abstract-entity'; +import { datetimeColumnType } from '../../../../databases/entities/abstract-entity'; @Entity() export class InsightsByPeriod extends BaseEntity { diff --git a/packages/cli/src/modules/insights/entities/insights-metadata.ts b/packages/cli/src/modules/insights/database/entities/insights-metadata.ts similarity index 100% rename from packages/cli/src/modules/insights/entities/insights-metadata.ts rename to packages/cli/src/modules/insights/database/entities/insights-metadata.ts diff --git a/packages/cli/src/modules/insights/entities/insights-raw.ts b/packages/cli/src/modules/insights/database/entities/insights-raw.ts similarity index 92% rename from packages/cli/src/modules/insights/entities/insights-raw.ts rename to packages/cli/src/modules/insights/database/entities/insights-raw.ts index ceff552a98..4c20e04e64 100644 --- a/packages/cli/src/modules/insights/entities/insights-raw.ts +++ b/packages/cli/src/modules/insights/database/entities/insights-raw.ts @@ -4,7 +4,7 @@ import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from '@n8n/typeorm import { UnexpectedError } from 'n8n-workflow'; import { isValidTypeNumber, NumberToType, TypeToNumber } from './insights-shared'; -import { datetimeColumnType } from '../../../databases/entities/abstract-entity'; +import { datetimeColumnType } from '../../../../databases/entities/abstract-entity'; export const { type: dbType } = Container.get(GlobalConfig).database; diff --git a/packages/cli/src/modules/insights/entities/insights-shared.ts b/packages/cli/src/modules/insights/database/entities/insights-shared.ts similarity index 100% rename from packages/cli/src/modules/insights/entities/insights-shared.ts rename to packages/cli/src/modules/insights/database/entities/insights-shared.ts diff --git a/packages/cli/src/modules/insights/repositories/insights-by-period.repository.ts b/packages/cli/src/modules/insights/database/repositories/insights-by-period.repository.ts similarity index 100% rename from packages/cli/src/modules/insights/repositories/insights-by-period.repository.ts rename to packages/cli/src/modules/insights/database/repositories/insights-by-period.repository.ts diff --git a/packages/cli/src/modules/insights/repositories/insights-metadata.repository.ts b/packages/cli/src/modules/insights/database/repositories/insights-metadata.repository.ts similarity index 100% rename from packages/cli/src/modules/insights/repositories/insights-metadata.repository.ts rename to packages/cli/src/modules/insights/database/repositories/insights-metadata.repository.ts diff --git a/packages/cli/src/modules/insights/repositories/insights-raw.repository.ts b/packages/cli/src/modules/insights/database/repositories/insights-raw.repository.ts similarity index 100% rename from packages/cli/src/modules/insights/repositories/insights-raw.repository.ts rename to packages/cli/src/modules/insights/database/repositories/insights-raw.repository.ts diff --git a/packages/cli/src/modules/insights/insights.service.ts b/packages/cli/src/modules/insights/insights.service.ts index 0462efd3ca..1bcd06e916 100644 --- a/packages/cli/src/modules/insights/insights.service.ts +++ b/packages/cli/src/modules/insights/insights.service.ts @@ -11,14 +11,14 @@ import { import { SharedWorkflow } from '@/databases/entities/shared-workflow'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { OnShutdown } from '@/decorators/on-shutdown'; -import { InsightsMetadata } from '@/modules/insights/entities/insights-metadata'; -import { InsightsRaw } from '@/modules/insights/entities/insights-raw'; +import { InsightsMetadata } from '@/modules/insights/database/entities/insights-metadata'; +import { InsightsRaw } from '@/modules/insights/database/entities/insights-raw'; -import type { TypeUnit } from './entities/insights-shared'; -import { NumberToType } from './entities/insights-shared'; +import type { TypeUnit } from './database/entities/insights-shared'; +import { NumberToType } from './database/entities/insights-shared'; +import { InsightsByPeriodRepository } from './database/repositories/insights-by-period.repository'; +import { InsightsRawRepository } from './database/repositories/insights-raw.repository'; import { InsightsConfig } from './insights.config'; -import { InsightsByPeriodRepository } from './repositories/insights-by-period.repository'; -import { InsightsRawRepository } from './repositories/insights-raw.repository'; const config = Container.get(InsightsConfig);