From a36d0eea42e6252b422d4b0160bf3675e7f47fec Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Fri, 13 Oct 2023 11:21:24 +0200 Subject: [PATCH] fix EDocumentStatus --- dist/Customer/Document.d.ts | 2 +- dist/Customer/Document.js | 2 +- dist/Notary/OfficeFolder.js | 10 ++- src/Customer/Document.ts | 2 +- src/Notary/OfficeFolder.ts | 125 ++++++++++++++++++++---------------- 5 files changed, 79 insertions(+), 62 deletions(-) diff --git a/dist/Customer/Document.d.ts b/dist/Customer/Document.d.ts index 86ed92d..aa89bb2 100644 --- a/dist/Customer/Document.d.ts +++ b/dist/Customer/Document.d.ts @@ -18,6 +18,6 @@ export default class Document extends Resource { export declare enum EDocumentStatus { ASKED = "ASKED", DEPOSITED = "DEPOSITED", - VALIDATED = "c", + VALIDATED = "VALIDATED", REFUSED = "REFUSED" } diff --git a/dist/Customer/Document.js b/dist/Customer/Document.js index 8dfef71..1fc0745 100644 --- a/dist/Customer/Document.js +++ b/dist/Customer/Document.js @@ -77,6 +77,6 @@ var EDocumentStatus; (function (EDocumentStatus) { EDocumentStatus["ASKED"] = "ASKED"; EDocumentStatus["DEPOSITED"] = "DEPOSITED"; - EDocumentStatus["VALIDATED"] = "c"; + EDocumentStatus["VALIDATED"] = "VALIDATED"; EDocumentStatus["REFUSED"] = "REFUSED"; })(EDocumentStatus = exports.EDocumentStatus || (exports.EDocumentStatus = {})); diff --git a/dist/Notary/OfficeFolder.js b/dist/Notary/OfficeFolder.js index c51feec..11528d9 100644 --- a/dist/Notary/OfficeFolder.js +++ b/dist/Notary/OfficeFolder.js @@ -53,7 +53,10 @@ __decorate([ ], OfficeFolder.prototype, "uid", void 0); __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.NotEquals)(null || "", { groups: ["updateFolder"], message: "Numéro de dossier ne peut pas être vide" }), + (0, class_validator_1.NotEquals)(null || "", { + groups: ["updateFolder"], + message: "Numéro de dossier ne peut pas être vide", + }), (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder"], message: "Numéro de dossier ne peut pas être vide", @@ -62,7 +65,10 @@ __decorate([ ], OfficeFolder.prototype, "folder_number", void 0); __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.NotEquals)(null || "", { groups: ["updateFolder"], message: "Nom de dossier ne peut pas être vide" }), + (0, class_validator_1.NotEquals)(null || "", { + groups: ["updateFolder"], + message: "Nom de dossier ne peut pas être vide", + }), (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder"], message: "Nom de dossier ne peut pas être vide", diff --git a/src/Customer/Document.ts b/src/Customer/Document.ts index a046ab7..3f03d89 100644 --- a/src/Customer/Document.ts +++ b/src/Customer/Document.ts @@ -48,6 +48,6 @@ export default class Document extends Resource { export enum EDocumentStatus { ASKED = "ASKED", DEPOSITED = "DEPOSITED", - VALIDATED = "c", + VALIDATED = "VALIDATED", REFUSED = "REFUSED", } diff --git a/src/Notary/OfficeFolder.ts b/src/Notary/OfficeFolder.ts index 13d18b3..b019212 100644 --- a/src/Notary/OfficeFolder.ts +++ b/src/Notary/OfficeFolder.ts @@ -1,7 +1,12 @@ export * from "../Customer/OfficeFolder"; import { Expose, Type } from "class-transformer"; import OfficeFolderCustomer from "../Customer/OfficeFolder"; -import { IsNotEmpty, IsOptional, NotEquals, ValidateNested } from "class-validator"; +import { + IsNotEmpty, + IsOptional, + NotEquals, + ValidateNested, +} from "class-validator"; import User from "./User"; import Deed from "./Deed"; import Customer from "./Customer"; @@ -11,71 +16,77 @@ import EFolderStatus from "../Customer/EFolderStatus"; import OfficeFolderAnchor from "./OfficeFolderAnchor"; export default class OfficeFolder extends OfficeFolderCustomer { - @Expose() - @IsNotEmpty({ groups: ["createDocument"], message: "UID is required" }) - public override uid?: string; + @Expose() + @IsNotEmpty({ groups: ["createDocument"], message: "UID is required" }) + public override uid?: string; - @Expose() - @NotEquals(null || "", { groups: ["updateFolder"], message: "Numéro de dossier ne peut pas être vide" }) - @IsNotEmpty({ - groups: ["createFolder"], - message: "Numéro de dossier ne peut pas être vide", - }) - public override folder_number!: string; + @Expose() + @NotEquals(null || "", { + groups: ["updateFolder"], + message: "Numéro de dossier ne peut pas être vide", + }) + @IsNotEmpty({ + groups: ["createFolder"], + message: "Numéro de dossier ne peut pas être vide", + }) + public override folder_number!: string; - @Expose() - @NotEquals(null || "", { groups: ["updateFolder"], message: "Nom de dossier ne peut pas être vide" }) - @IsNotEmpty({ - groups: ["createFolder"], - message: "Nom de dossier ne peut pas être vide", - }) - public override name!: string; + @Expose() + @NotEquals(null || "", { + groups: ["updateFolder"], + message: "Nom de dossier ne peut pas être vide", + }) + @IsNotEmpty({ + groups: ["createFolder"], + message: "Nom de dossier ne peut pas être vide", + }) + public override name!: string; - @Expose() - @IsOptional({ groups: ["updateFolder"] }) - public override description: string | null = null; + @Expose() + @IsOptional({ groups: ["updateFolder"] }) + public override description: string | null = null; - @Expose() - @IsOptional({ groups: ["updateFolder"] }) - public override archived_description: string | null = null; + @Expose() + @IsOptional({ groups: ["updateFolder"] }) + public override archived_description: string | null = null; - @Expose() - @IsOptional({ groups: ["updateFolder"] }) - public override status: EFolderStatus | string = EFolderStatus.LIVE; + @Expose() + @IsOptional({ groups: ["updateFolder"] }) + public override status: EFolderStatus | string = EFolderStatus.LIVE; - @Expose() - @IsNotEmpty({ groups: ["createFolder"], message: "Office is required" }) - @ValidateNested({ groups: ["createFolder"] }) - @Type(() => Office) - public override office?: Office; + @Expose() + @IsNotEmpty({ groups: ["createFolder"], message: "Office is required" }) + @ValidateNested({ groups: ["createFolder"] }) + @Type(() => Office) + public override office?: Office; - @Expose() - @IsNotEmpty({ groups: ["createFolder"], message: "Deed type is required" }) - @ValidateNested({ groups: ["createFolder"] }) - @Type(() => Deed) - public deed?: Deed; + @Expose() + @IsNotEmpty({ groups: ["createFolder"], message: "Deed type is required" }) + @ValidateNested({ groups: ["createFolder"] }) + @Type(() => Deed) + public deed?: Deed; - @Expose() - @IsOptional({ groups: ["updateFolder"] }) - @ValidateNested({ groups: ["createFolder", "updateFolder"] }) - @Type(() => User) - stakeholders?: User[]; + @Expose() + @IsOptional({ groups: ["updateFolder"] }) + @ValidateNested({ groups: ["createFolder", "updateFolder"] }) + @Type(() => User) + stakeholders?: User[]; - @Expose() - @IsOptional({ groups: ["updateFolder"] }) - @ValidateNested({ groups: ["updateFolder"] }) - @Type(() => Customer) - public override customers?: Customer[]; + @Expose() + @IsOptional({ groups: ["updateFolder"] }) + @ValidateNested({ groups: ["updateFolder"] }) + @Type(() => Customer) + public override customers?: Customer[]; - @Expose() - @IsOptional({ groups: ["updateFolder"] }) - @ValidateNested({ groups: ["updateFolder"] }) - @Type(() => Document) - documents?: Document[]; + @Expose() + @IsOptional({ groups: ["updateFolder"] }) + @ValidateNested({ groups: ["updateFolder"] }) + @Type(() => Document) + documents?: Document[]; - @Expose() - @IsOptional({ groups: ["updateFolder"] }) - @ValidateNested({ groups: ["updateFolder"] }) - @Type(() => OfficeFolderAnchor) - folder_anchor?: OfficeFolderAnchor | null = null; + @Expose() + @IsOptional({ groups: ["updateFolder"] }) + @ValidateNested({ groups: ["updateFolder"] }) + @Type(() => OfficeFolderAnchor) + folder_anchor?: OfficeFolderAnchor | null = null; }