From f61653f2e2341442dbe2d461168770b072b2bb3b Mon Sep 17 00:00:00 2001 From: Eugene Molodkin Date: Wed, 6 Nov 2024 13:45:16 +0100 Subject: [PATCH] wip: rename Test to TestDefinition --- ...itory.ts => test-definition.repository.ts} | 6 +++--- ...ller.ts => test-definitions.controller.ts} | 20 +++++++++---------- ...service.ts => test-definitions.service.ts} | 7 +++---- ...sts.types.ts => test-definitions.types.ts} | 4 ++-- 4 files changed, 18 insertions(+), 19 deletions(-) rename packages/cli/src/databases/repositories/{test.repository.ts => test-definition.repository.ts} (87%) rename packages/cli/src/evaluation/{tests.controller.ts => test-definitions.controller.ts} (78%) rename packages/cli/src/evaluation/{tests.service.ts => test-definitions.service.ts} (88%) rename packages/cli/src/evaluation/{tests.types.ts => test-definitions.types.ts} (89%) diff --git a/packages/cli/src/databases/repositories/test.repository.ts b/packages/cli/src/databases/repositories/test-definition.repository.ts similarity index 87% rename from packages/cli/src/databases/repositories/test.repository.ts rename to packages/cli/src/databases/repositories/test-definition.repository.ts index 65c46b49e8..5e2cee02d2 100644 --- a/packages/cli/src/databases/repositories/test.repository.ts +++ b/packages/cli/src/databases/repositories/test-definition.repository.ts @@ -6,7 +6,7 @@ import { TestDefinition } from '@/databases/entities/test-definition'; import type { ListQuery } from '@/requests'; @Service() -export class TestRepository extends Repository { +export class TestDefinitionRepository extends Repository { constructor(dataSource: DataSource) { super(TestDefinition, dataSource.manager); } @@ -32,9 +32,9 @@ export class TestRepository extends Repository { findManyOptions.take = options.take; } - const [tests, count] = await this.findAndCount(findManyOptions); + const [testDefinitions, count] = await this.findAndCount(findManyOptions); - return { tests, count }; + return { testDefinitions, count }; } async getOne(id: number, sharedWorkflowIds: string[]) { diff --git a/packages/cli/src/evaluation/tests.controller.ts b/packages/cli/src/evaluation/test-definitions.controller.ts similarity index 78% rename from packages/cli/src/evaluation/tests.controller.ts rename to packages/cli/src/evaluation/test-definitions.controller.ts index 9f0ac0b4a0..adc52b9c47 100644 --- a/packages/cli/src/evaluation/tests.controller.ts +++ b/packages/cli/src/evaluation/test-definitions.controller.ts @@ -5,22 +5,22 @@ import { listQueryMiddleware } from '@/middlewares'; import { getSharedWorkflowIds } from '@/public-api/v1/handlers/workflows/workflows.service'; import { isPositiveInteger } from '@/utils'; -import { TestsService } from './tests.service'; -import { TestsRequest } from './tests.types'; +import { TestDefinitionsService } from './test-definitions.service'; +import { TestDefinitionsRequest } from './test-definitions.types'; -@RestController('/evaluation/tests') -export class TestsController { - constructor(private readonly testsService: TestsService) {} +@RestController('/evaluation/test-definitions') +export class TestDefinitionsController { + constructor(private readonly testsService: TestDefinitionsService) {} @Get('/', { middlewares: listQueryMiddleware }) - async getMany(req: TestsRequest.GetMany) { + async getMany(req: TestDefinitionsRequest.GetMany) { const workflowIds = await getSharedWorkflowIds(req.user, ['workflow:read']); return await this.testsService.getMany(req.listQueryOptions, workflowIds); } @Get('/:id') - async getOne(req: TestsRequest.GetOne) { + async getOne(req: TestDefinitionsRequest.GetOne) { if (!isPositiveInteger(req.params.id)) { throw new BadRequestError('Test ID is not a number'); } @@ -31,7 +31,7 @@ export class TestsController { } @Post('/') - async create(req: TestsRequest.Create) { + async create(req: TestDefinitionsRequest.Create) { const workflowIds = await getSharedWorkflowIds(req.user, ['workflow:read']); if (!workflowIds.includes(req.body.workflowId)) { @@ -42,7 +42,7 @@ export class TestsController { } @Delete('/:id') - async delete(req: TestsRequest.Delete) { + async delete(req: TestDefinitionsRequest.Delete) { if (!isPositiveInteger(req.params.id)) { throw new BadRequestError('Test ID is not a number'); } @@ -55,7 +55,7 @@ export class TestsController { } @Patch('/:id') - async update(req: TestsRequest.Update) { + async update(req: TestDefinitionsRequest.Update) { if (!isPositiveInteger(req.params.id)) { throw new BadRequestError('Test ID is not a number'); } diff --git a/packages/cli/src/evaluation/tests.service.ts b/packages/cli/src/evaluation/test-definitions.service.ts similarity index 88% rename from packages/cli/src/evaluation/tests.service.ts rename to packages/cli/src/evaluation/test-definitions.service.ts index 0463e57be6..25eacf0a1c 100644 --- a/packages/cli/src/evaluation/tests.service.ts +++ b/packages/cli/src/evaluation/test-definitions.service.ts @@ -1,8 +1,7 @@ import { Service } from 'typedi'; import type { TestDefinition } from '@/databases/entities/test-definition'; -import type { User } from '@/databases/entities/user'; -import { TestRepository } from '@/databases/repositories/test.repository'; +import { TestDefinitionRepository } from '@/databases/repositories/test-definition.repository'; import { validateEntity } from '@/generic-helpers'; import type { ListQuery } from '@/requests'; @@ -16,8 +15,8 @@ type TestDefinitionLike = Omit< }; @Service() -export class TestsService { - constructor(private testRepository: TestRepository) {} +export class TestDefinitionsService { + constructor(private testRepository: TestDefinitionRepository) {} toEntity(attrs: { name?: string; diff --git a/packages/cli/src/evaluation/tests.types.ts b/packages/cli/src/evaluation/test-definitions.types.ts similarity index 89% rename from packages/cli/src/evaluation/tests.types.ts rename to packages/cli/src/evaluation/test-definitions.types.ts index e1c9b4e9ef..0322c97362 100644 --- a/packages/cli/src/evaluation/tests.types.ts +++ b/packages/cli/src/evaluation/test-definitions.types.ts @@ -1,10 +1,10 @@ import type { AuthenticatedRequest, ListQuery } from '@/requests'; // ---------------------------------- -// /tests +// /test-definitions // ---------------------------------- -export declare namespace TestsRequest { +export declare namespace TestDefinitionsRequest { namespace RouteParams { type TestId = { id: string;