From 7bfa0c32a8ad10b62dfba2eeb99c0ab560781547 Mon Sep 17 00:00:00 2001 From: hannathkadher Date: Fri, 20 Dec 2024 08:08:17 +0400 Subject: [PATCH] changed dto name --- .../common/services/base-product-model.service.ts | 4 ++-- src/space-model/dtos/create-space-model.dto.ts | 8 ++++---- src/space-model/dtos/index.ts | 2 +- .../create-space-product-model.dto.ts | 8 ++++---- src/space-model/dtos/product-model-dtos/index.ts | 1 + .../subspaces-model-dtos/create-subspace-model.dto.ts | 8 ++++---- .../subspaces-model-dtos/update-subspace-model.dto.ts | 8 ++++---- src/space-model/services/space-product-model.service.ts | 4 ++-- .../services/subspace/subspace-product-model.service.ts | 4 ++-- 9 files changed, 24 insertions(+), 23 deletions(-) rename src/space-model/dtos/{ => product-model-dtos}/create-space-product-model.dto.ts (91%) create mode 100644 src/space-model/dtos/product-model-dtos/index.ts diff --git a/src/space-model/common/services/base-product-model.service.ts b/src/space-model/common/services/base-product-model.service.ts index b83511a..c3230a3 100644 --- a/src/space-model/common/services/base-product-model.service.ts +++ b/src/space-model/common/services/base-product-model.service.ts @@ -1,12 +1,12 @@ import { HttpException, HttpStatus } from '@nestjs/common'; -import { CreateSpaceProductModelDto } from 'src/space-model/dtos'; +import { CreateProductModelDto } from '../../dtos'; import { ProductService } from '../../../product/services'; export abstract class BaseProductModelService { constructor(private readonly productService: ProductService) {} protected async validateProductCount( - dto: CreateSpaceProductModelDto, + dto: CreateProductModelDto, ): Promise { const productItemCount = dto.items.length; if (dto.productCount !== productItemCount) { diff --git a/src/space-model/dtos/create-space-model.dto.ts b/src/space-model/dtos/create-space-model.dto.ts index 2988e53..31ff764 100644 --- a/src/space-model/dtos/create-space-model.dto.ts +++ b/src/space-model/dtos/create-space-model.dto.ts @@ -2,7 +2,7 @@ import { ApiProperty } from '@nestjs/swagger'; import { IsNotEmpty, IsString, IsArray, ValidateNested } from 'class-validator'; import { Type } from 'class-transformer'; import { CreateSubspaceModelDto } from './subspaces-model-dtos/create-subspace-model.dto'; -import { CreateSpaceProductModelDto } from './create-space-product-model.dto'; +import { CreateProductModelDto } from './product-model-dtos'; export class CreateSpaceModelDto { @ApiProperty({ @@ -24,10 +24,10 @@ export class CreateSpaceModelDto { @ApiProperty({ description: 'List of products included in the model', - type: [CreateSpaceProductModelDto], + type: [CreateProductModelDto], }) @IsArray() @ValidateNested({ each: true }) - @Type(() => CreateSpaceProductModelDto) - spaceProductModels?: CreateSpaceProductModelDto[]; + @Type(() => CreateProductModelDto) + spaceProductModels?: CreateProductModelDto[]; } diff --git a/src/space-model/dtos/index.ts b/src/space-model/dtos/index.ts index 0f46c63..20aaebc 100644 --- a/src/space-model/dtos/index.ts +++ b/src/space-model/dtos/index.ts @@ -1,6 +1,6 @@ export * from './create-space-model.dto'; export * from './create-space-product-item-model.dto'; -export * from './create-space-product-model.dto'; +export * from './product-model-dtos'; export * from './project-param.dto'; export * from './update-space-model.dto'; export * from './space-model-param'; diff --git a/src/space-model/dtos/create-space-product-model.dto.ts b/src/space-model/dtos/product-model-dtos/create-space-product-model.dto.ts similarity index 91% rename from src/space-model/dtos/create-space-product-model.dto.ts rename to src/space-model/dtos/product-model-dtos/create-space-product-model.dto.ts index 3d88ca4..2ff2a7f 100644 --- a/src/space-model/dtos/create-space-product-model.dto.ts +++ b/src/space-model/dtos/product-model-dtos/create-space-product-model.dto.ts @@ -9,9 +9,9 @@ import { IsOptional, } from 'class-validator'; import { Type } from 'class-transformer'; -import { CreateProductItemModelDto } from './create-space-product-item-model.dto'; +import { CreateProductItemModelDto } from '../create-space-product-item-model.dto'; -export class CreateSpaceProductModelDto { +export class CreateProductModelDto { @ApiProperty({ description: 'ID of the product associated with the model', example: 'product-uuid', @@ -81,11 +81,11 @@ export class ModifyProductModelDto { @IsArray() @ApiProperty({ description: 'Create the product model ', - type: [CreateSpaceProductModelDto], + type: [CreateProductModelDto], }) @ValidateNested({ each: true }) @IsOptional() - add?: CreateSpaceProductModelDto[]; + add?: CreateProductModelDto[]; @IsArray() @ApiProperty({ diff --git a/src/space-model/dtos/product-model-dtos/index.ts b/src/space-model/dtos/product-model-dtos/index.ts new file mode 100644 index 0000000..3fdad23 --- /dev/null +++ b/src/space-model/dtos/product-model-dtos/index.ts @@ -0,0 +1 @@ +export * from './create-space-product-model.dto'; diff --git a/src/space-model/dtos/subspaces-model-dtos/create-subspace-model.dto.ts b/src/space-model/dtos/subspaces-model-dtos/create-subspace-model.dto.ts index d14cb91..ce5d2d1 100644 --- a/src/space-model/dtos/subspaces-model-dtos/create-subspace-model.dto.ts +++ b/src/space-model/dtos/subspaces-model-dtos/create-subspace-model.dto.ts @@ -6,7 +6,7 @@ import { IsString, ValidateNested, } from 'class-validator'; -import { CreateSpaceProductModelDto } from '../create-space-product-model.dto'; +import { CreateProductModelDto } from '../product-model-dtos'; import { Type } from 'class-transformer'; export class CreateSubspaceModelDto { @@ -20,11 +20,11 @@ export class CreateSubspaceModelDto { @ApiProperty({ description: 'List of products included in the model', - type: [CreateSpaceProductModelDto], + type: [CreateProductModelDto], }) @IsArray() @IsOptional() @ValidateNested({ each: true }) - @Type(() => CreateSpaceProductModelDto) - spaceProductModels?: CreateSpaceProductModelDto[]; + @Type(() => CreateProductModelDto) + spaceProductModels?: CreateProductModelDto[]; } diff --git a/src/space-model/dtos/subspaces-model-dtos/update-subspace-model.dto.ts b/src/space-model/dtos/subspaces-model-dtos/update-subspace-model.dto.ts index 962e979..eb5305c 100644 --- a/src/space-model/dtos/subspaces-model-dtos/update-subspace-model.dto.ts +++ b/src/space-model/dtos/subspaces-model-dtos/update-subspace-model.dto.ts @@ -7,7 +7,7 @@ import { IsOptional, ValidateNested, } from 'class-validator'; -import { CreateSpaceProductModelDto } from '../create-space-product-model.dto'; +import { CreateProductModelDto } from '../product-model-dtos'; export class UpdateSubspaceModelDto { @ApiProperty({ @@ -24,11 +24,11 @@ export class UpdateSubspaceModelDto { @ApiProperty({ description: 'List of products included in the model', - type: [CreateSpaceProductModelDto], + type: [CreateProductModelDto], }) @IsArray() @IsOptional() @ValidateNested({ each: true }) - @Type(() => CreateSpaceProductModelDto) - spaceProductModels?: CreateSpaceProductModelDto[]; + @Type(() => CreateProductModelDto) + spaceProductModels?: CreateProductModelDto[]; } diff --git a/src/space-model/services/space-product-model.service.ts b/src/space-model/services/space-product-model.service.ts index 36695be..ccfa780 100644 --- a/src/space-model/services/space-product-model.service.ts +++ b/src/space-model/services/space-product-model.service.ts @@ -1,6 +1,6 @@ import { QueryRunner } from 'typeorm'; import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; -import { CreateSpaceProductModelDto } from '../dtos'; +import { CreateProductModelDto } from '../dtos'; import { SpaceProductItemModelService } from './space-product-item-model.service'; import { BaseProductModelService } from '../common'; import { ProductService } from 'src/product/services'; @@ -20,7 +20,7 @@ export class SpaceProductModelService extends BaseProductModelService { } async createSpaceProductModels( - spaceProductModelDtos: CreateSpaceProductModelDto[], + spaceProductModelDtos: CreateProductModelDto[], spaceModel: SpaceModelEntity, queryRunner: QueryRunner, ) { diff --git a/src/space-model/services/subspace/subspace-product-model.service.ts b/src/space-model/services/subspace/subspace-product-model.service.ts index 8b3f9ac..9dfe733 100644 --- a/src/space-model/services/subspace/subspace-product-model.service.ts +++ b/src/space-model/services/subspace/subspace-product-model.service.ts @@ -5,7 +5,7 @@ import { } from '@app/common/modules/space-model'; import { HttpException, HttpStatus, Injectable } from '@nestjs/common'; import { SubspaceProductItemModelService } from './subspace-product-item-model.service'; -import { CreateSpaceProductModelDto } from '../../dtos'; +import { CreateProductModelDto } from '../../dtos'; import { QueryRunner } from 'typeorm'; import { BaseProductModelService } from '../../common'; import { ProductService } from 'src/product/services'; @@ -21,7 +21,7 @@ export class SubspaceProductModelService extends BaseProductModelService { } async createSubspaceProductModels( - spaceProductModelDtos: CreateSpaceProductModelDto[], + spaceProductModelDtos: CreateProductModelDto[], spaceModel: SpaceModelEntity, subspaceModel: SubspaceModelEntity, queryRunner: QueryRunner,