diff --git a/src/modules/ad/adapters/primaries/ad.controller.ts b/src/modules/ad/adapters/primaries/ad.controller.ts index d0213d2..ec2ca65 100644 --- a/src/modules/ad/adapters/primaries/ad.controller.ts +++ b/src/modules/ad/adapters/primaries/ad.controller.ts @@ -41,8 +41,6 @@ export class AdController { @GrpcMethod('AdsService', 'Create') async createAd(data: CreateAdRequest): Promise { - console.log('controler'); - console.log(data); try { const ad = await this._commandBus.execute(new CreateAdCommand(data)); return this._mapper.map(ad, Ad, AdPresenter); diff --git a/src/modules/ad/domain/dtos/create-ad.request.ts b/src/modules/ad/domain/dtos/create-ad.request.ts index 8323e88..17ab6f4 100644 --- a/src/modules/ad/domain/dtos/create-ad.request.ts +++ b/src/modules/ad/domain/dtos/create-ad.request.ts @@ -7,6 +7,7 @@ import { IsInt, ValidateIf, IsArray, + IsEnum, } from 'class-validator'; import { Frequency } from '../entities/frequency.enum'; import { Address } from '../entities/address'; @@ -34,7 +35,11 @@ export class CreateAdRequest { @AutoMap() passenger?: boolean; - @Transform(({ value }) => Frequency[value]) + @Transform( + ({ value }) => (value == 1 ? Frequency.PUNCTUAL : Frequency.RECURRENT), + { toClassOnly: true }, + ) + @IsEnum(Frequency) @AutoMap() frequency: Frequency; @@ -48,47 +53,40 @@ export class CreateAdRequest { @AutoMap() toDate: Date; - @Type(() => Date) @IsDate() @IsOptional() @AutoMap() - monTime?: Date; + monTime?: string; - @Type(() => Date) - @IsDate() + @IsString() @IsOptional() @AutoMap() - tueTime?: Date; + tueTime?: string; - @Type(() => Date) - @IsDate() + @IsString() @IsOptional() @AutoMap() - wedTime?: Date; + wedTime?: string; - @Type(() => Date) - @IsDate() + @IsString() @IsOptional() @AutoMap() - thuTime?: Date; + thuTime?: string; - @Type(() => Date) - @IsDate() + @IsString() @IsOptional() @AutoMap() - friTime?: Date; + friTime?: string; - @Type(() => Date) - @IsDate() + @IsString() @IsOptional() @AutoMap() - satTime?: Date; + satTime?: string; - @Type(() => Date) - @IsDate() + @IsString() @IsOptional() @AutoMap() - sunTime?: Date; + sunTime?: string; @IsInt() @IsOptional() diff --git a/src/modules/ad/domain/entities/frequency.enum.ts b/src/modules/ad/domain/entities/frequency.enum.ts index 6c571eb..0126874 100644 --- a/src/modules/ad/domain/entities/frequency.enum.ts +++ b/src/modules/ad/domain/entities/frequency.enum.ts @@ -1,4 +1,4 @@ export enum Frequency { - PUNCTUAL, - RECURRENT, + PUNCTUAL = 'PUNCTUAL', + RECURRENT = 'RECURRENT', } diff --git a/src/modules/ad/mappers/ad.profile.ts b/src/modules/ad/mappers/ad.profile.ts index 3f9b05e..abd117a 100644 --- a/src/modules/ad/mappers/ad.profile.ts +++ b/src/modules/ad/mappers/ad.profile.ts @@ -19,12 +19,12 @@ export class AdProfile extends AutomapperProfile { mapper, CreateAdRequest, Ad, - forMember( - (dest) => dest.frequency, - mapFrom((source) => - source.frequency == Frequency.PUNCTUAL ? 'PUNCTUAL' : 'RECCURENT', - ), - ), + // forMember( + // (dest) => dest.frequency, + // mapFrom((source) => + // source.frequency == Frequency.PUNCTUAL ? 'PUNCTUAL' : 'RECCURENT', + // ), + // ), ); }; } diff --git a/src/modules/database/adapters/secondaries/prisma-repository.abstract.ts b/src/modules/database/adapters/secondaries/prisma-repository.abstract.ts index 699ab86..dee142c 100644 --- a/src/modules/database/adapters/secondaries/prisma-repository.abstract.ts +++ b/src/modules/database/adapters/secondaries/prisma-repository.abstract.ts @@ -88,8 +88,6 @@ export abstract class PrismaRepository implements IRepository { return res; } catch (e) { - console.log('repository'); - console.log(e); if (e instanceof Prisma.PrismaClientKnownRequestError) { throw new DatabaseException( Prisma.PrismaClientKnownRequestError.name,