From fc76a3ac63e5b6aee5ffc2ad3027aa9fdab01de0 Mon Sep 17 00:00:00 2001 From: Vins Date: Tue, 19 Dec 2023 14:59:27 +0100 Subject: [PATCH] nullable cell_phone_number --- dist/Notary/Contact.d.ts | 2 +- dist/Notary/Contact.js | 3 +- src/Notary/Contact.ts | 152 +++++++++++++++++++-------------------- 3 files changed, 79 insertions(+), 78 deletions(-) diff --git a/dist/Notary/Contact.d.ts b/dist/Notary/Contact.d.ts index cd3c4cf..9012769 100644 --- a/dist/Notary/Contact.d.ts +++ b/dist/Notary/Contact.d.ts @@ -6,7 +6,7 @@ export default class Contact extends ContactCustomer { first_name: string; last_name: string; email: string; - cell_phone_number: string; + cell_phone_number?: string | null; phone_number?: string | null; civility: ECivility | string; address?: Address; diff --git a/dist/Notary/Contact.js b/dist/Notary/Contact.js index 925838e..10f9b11 100644 --- a/dist/Notary/Contact.js +++ b/dist/Notary/Contact.js @@ -34,6 +34,7 @@ const Address_1 = __importDefault(require("./Address")); class Contact extends Contact_1.default { constructor() { super(...arguments); + this.cell_phone_number = null; this.phone_number = null; } } @@ -99,7 +100,7 @@ __decorate([ groups: ["createCustomer", "updateCustomer"], message: "Le numéro de téléphone doit être au format 0X XX XX XX XX ou +33X XX XX XX XX", }), - __metadata("design:type", String) + __metadata("design:type", Object) ], Contact.prototype, "cell_phone_number", void 0); __decorate([ (0, class_transformer_1.Expose)(), diff --git a/src/Notary/Contact.ts b/src/Notary/Contact.ts index f5015ac..86a52fc 100644 --- a/src/Notary/Contact.ts +++ b/src/Notary/Contact.ts @@ -2,91 +2,91 @@ export * from "../Customer/Contact"; import { Expose, Type } from "class-transformer"; import ContactCustomer, { ECivility } from "../Customer/Contact"; import { - IsEmail, - IsNotEmpty, - IsOptional, - Matches, - NotEquals, - ValidateNested, + IsEmail, + IsNotEmpty, + IsOptional, + Matches, + NotEquals, + ValidateNested, } from "class-validator"; import Address from "./Address"; export default class Contact extends ContactCustomer { - @Expose() - public override uid?: string; + @Expose() + public override uid?: string; - @Expose() - @IsOptional({ groups: ["updateCustomer"] }) - @NotEquals(null || "", { - groups: ["updateCustomer"], - message: "Prénom ne peut pas être vide", - }) - @IsNotEmpty({ - groups: ["createCustomer"], - message: "Prénom ne peut pas être vide", - }) - public override first_name!: string; + @Expose() + @IsOptional({ groups: ["updateCustomer"] }) + @NotEquals(null || "", { + groups: ["updateCustomer"], + message: "Prénom ne peut pas être vide", + }) + @IsNotEmpty({ + groups: ["createCustomer"], + message: "Prénom ne peut pas être vide", + }) + public override first_name!: string; - @Expose() - @IsOptional({ groups: ["updateCustomer"] }) - @NotEquals(null || "", { - groups: ["updateCustomer"], - message: "Nom ne peut pas être vide", - }) - @IsNotEmpty({ - groups: ["createCustomer"], - message: "Nom ne peut pas être vide", - }) - public override last_name!: string; + @Expose() + @IsOptional({ groups: ["updateCustomer"] }) + @NotEquals(null || "", { + groups: ["updateCustomer"], + message: "Nom ne peut pas être vide", + }) + @IsNotEmpty({ + groups: ["createCustomer"], + message: "Nom ne peut pas être vide", + }) + public override last_name!: string; - @Expose() - @IsOptional({ groups: ["updateCustomer"] }) - @NotEquals(null || "", { - groups: ["updateCustomer"], - message: "Email ne peut pas être vide", - }) - @IsNotEmpty({ - groups: ["createCustomer"], - message: "Email ne peut pas être vide", - }) - @IsEmail( - {}, - { - groups: ["createCustomer", "updateCustomer"], - message: "Format de l'email incorrect", - } - ) - public override email!: string; + @Expose() + @IsOptional({ groups: ["updateCustomer"] }) + @NotEquals(null || "", { + groups: ["updateCustomer"], + message: "Email ne peut pas être vide", + }) + @IsNotEmpty({ + groups: ["createCustomer"], + message: "Email ne peut pas être vide", + }) + @IsEmail( + {}, + { + groups: ["createCustomer", "updateCustomer"], + message: "Format de l'email incorrect", + } + ) + public override email!: string; - @Expose() - @IsOptional({ groups: ["updateCustomer"] }) - @NotEquals(null || "", { - groups: ["updateCustomer"], - message: "Numéro de téléphone ne peut pas être vide", - }) - @IsNotEmpty({ - groups: ["createCustomer"], - message: "Numéro de téléphone ne peut pas être vide", - }) - @Matches(/^\+[2-9]{2,3}[0-9]{9}$/, { - groups: ["createCustomer", "updateCustomer"], - message: - "Le numéro de téléphone doit être au format 0X XX XX XX XX ou +33X XX XX XX XX", - }) - public override cell_phone_number!: string; + @Expose() + @IsOptional({ groups: ["updateCustomer"] }) + @NotEquals(null || "", { + groups: ["updateCustomer"], + message: "Numéro de téléphone ne peut pas être vide", + }) + @IsNotEmpty({ + groups: ["createCustomer"], + message: "Numéro de téléphone ne peut pas être vide", + }) + @Matches(/^\+[2-9]{2,3}[0-9]{9}$/, { + groups: ["createCustomer", "updateCustomer"], + message: + "Le numéro de téléphone doit être au format 0X XX XX XX XX ou +33X XX XX XX XX", + }) + public override cell_phone_number?: string | null = null; - @Expose() - @IsOptional() - public override phone_number?: string | null = null; + @Expose() + @IsOptional() + public override phone_number?: string | null = null; - @Expose() - @IsOptional({ groups: ["updateCustomer"] }) - @IsNotEmpty({ groups: ["createCustomer"], message: "Civility is required" }) - public override civility!: ECivility | string; + @Expose() + @IsOptional({ groups: ["updateCustomer"] }) + @IsNotEmpty({ groups: ["createCustomer"], message: "Civility is required" }) + public override civility!: ECivility | string; - @Expose() - @IsOptional({ groups: ["createCustomer", "updateCustomer"] }) - @ValidateNested({ groups: ["createCustomer", "updateCustomer"] }) - @Type(() => Address) - public override address?: Address; + @Expose() + @IsOptional({ groups: ["createCustomer", "updateCustomer"] }) + @ValidateNested({ groups: ["createCustomer", "updateCustomer"] }) + @Type(() => Address) + public override address?: Address; }