From a1aa43571471d51cc6e6c2c068a944d8abb0ccd4 Mon Sep 17 00:00:00 2001 From: Hugo Lextrait Date: Wed, 29 Mar 2023 10:21:25 +0200 Subject: [PATCH] Refacto enums --- dist/Customer/Contact.d.ts | 2 +- dist/Customer/Customer.d.ts | 2 +- dist/Customer/Document.d.ts | 2 +- dist/Customer/DocumentHistory.d.ts | 4 ++-- dist/Customer/Office.d.ts | 2 +- dist/Customer/OfficeFolder.d.ts | 2 +- dist/Customer/index.d.ts | 4 ++-- dist/Resource.d.ts | 1 + dist/Resource.js | 3 +++ src/Customer/Contact.ts | 2 +- src/Customer/Customer.ts | 2 +- src/Customer/Document.ts | 7 +------ src/Customer/DocumentHistory.ts | 4 ++-- src/Customer/Office.ts | 3 ++- src/Customer/OfficeFolder.ts | 2 +- src/Customer/index.ts | 4 ++-- src/Resource.ts | 4 ++++ 17 files changed, 27 insertions(+), 23 deletions(-) diff --git a/dist/Customer/Contact.d.ts b/dist/Customer/Contact.d.ts index f996b6f..d594939 100644 --- a/dist/Customer/Contact.d.ts +++ b/dist/Customer/Contact.d.ts @@ -8,7 +8,7 @@ export default class Contact extends Resource { email: string; cell_phone_number: string; phone_number: string; - civility: "MALE" | "FEMALE" | "OTHERS"; + civility: ECivility | string; address: Address; created_at: Date | null; updated_at: Date | null; diff --git a/dist/Customer/Customer.d.ts b/dist/Customer/Customer.d.ts index 9cdafca..5a5d7bf 100644 --- a/dist/Customer/Customer.d.ts +++ b/dist/Customer/Customer.d.ts @@ -2,7 +2,7 @@ import { Contact, Document } from "."; import OfficeFolderHasCustomer from "./OfficeFolderHasCustomer"; import Resource from "../Resource"; export default class Customer extends Resource { - status: "VALIDATED" | "PENDING" | "ERRONED"; + status: ECustomerStatus | string; contact: Contact; created_at: Date | null; updated_at: Date | null; diff --git a/dist/Customer/Document.d.ts b/dist/Customer/Document.d.ts index a747696..d92dc57 100644 --- a/dist/Customer/Document.d.ts +++ b/dist/Customer/Document.d.ts @@ -5,7 +5,7 @@ import File from "./File"; import OfficeFolder from "./OfficeFolder"; import Resource from "../Resource"; export default class Document extends Resource { - document_status: "ASKED" | "DEPOSITED" | "VALIDATED" | "ANCHORED" | "REFUSED"; + document_status: EDocumentStatus | string; document_type: DocumentType; folder: OfficeFolder; depositor: Customer; diff --git a/dist/Customer/DocumentHistory.d.ts b/dist/Customer/DocumentHistory.d.ts index d95c5f7..62ea2a2 100644 --- a/dist/Customer/DocumentHistory.d.ts +++ b/dist/Customer/DocumentHistory.d.ts @@ -1,7 +1,7 @@ -import { default as Document } from "./Document"; +import { default as Document, EDocumentStatus } from "./Document"; import Resource from "../Resource"; export default class DocumentHistory extends Resource { - document_status: "ASKED" | "DEPOSITED" | "VALIDATED" | "ANCHORED" | "REFUSED"; + document_status: EDocumentStatus | string; document: Document; refused_reason: string | null; created_at: Date | null; diff --git a/dist/Customer/Office.d.ts b/dist/Customer/Office.d.ts index b536495..cecb3a5 100644 --- a/dist/Customer/Office.d.ts +++ b/dist/Customer/Office.d.ts @@ -8,7 +8,7 @@ export default class Office extends Resource { name: string; crpcen: string; address: Address; - office_status: "ACTIVATED" | "DESACTIVATED"; + office_status: EOfficeStatus | string; created_at: Date | null; updated_at: Date | null; deed_types?: DeedType[]; diff --git a/dist/Customer/OfficeFolder.d.ts b/dist/Customer/OfficeFolder.d.ts index bf9c8f9..926f398 100644 --- a/dist/Customer/OfficeFolder.d.ts +++ b/dist/Customer/OfficeFolder.d.ts @@ -9,7 +9,7 @@ export default class OfficeFolder extends Resource { name: string; description: string | null; archived_description: string | null; - status: "LIVE" | "ARCHIVED"; + status: EFolderStatus | string; deed: Deed; office: Office; created_at: Date | null; diff --git a/dist/Customer/index.d.ts b/dist/Customer/index.d.ts index 73339ca..ffcf278 100644 --- a/dist/Customer/index.d.ts +++ b/dist/Customer/index.d.ts @@ -1,5 +1,5 @@ -import User from "./Customer"; -export default User; +import Customer from "./Customer"; +export default Customer; export { default as Address } from "./Address"; export { default as Contact } from "./Contact"; export { default as Deed } from "./Deed"; diff --git a/dist/Resource.d.ts b/dist/Resource.d.ts index 4d94677..5f629da 100644 --- a/dist/Resource.d.ts +++ b/dist/Resource.d.ts @@ -4,4 +4,5 @@ export default class Resource { uid: string; static hydrate(from: Partial, options?: ClassTransformOptions): T; static validateOrReject(validatorOptions?: ValidatorOptions): Promise; + validateOrReject(validatorOptions?: ValidatorOptions): Promise; } diff --git a/dist/Resource.js b/dist/Resource.js index c5e8552..0014a58 100644 --- a/dist/Resource.js +++ b/dist/Resource.js @@ -42,6 +42,9 @@ class Resource { static validateOrReject(validatorOptions) { return class_validator_1.default.validateOrReject(this, validatorOptions); } + validateOrReject(validatorOptions) { + return class_validator_1.default.validateOrReject(this, validatorOptions); + } } __decorate([ (0, class_validator_1.IsNotEmpty)({ message: "UID is required" }), diff --git a/src/Customer/Contact.ts b/src/Customer/Contact.ts index f9417d5..71e62e8 100644 --- a/src/Customer/Contact.ts +++ b/src/Customer/Contact.ts @@ -24,7 +24,7 @@ export default class Contact extends Resource { public phone_number!: string; @IsNotEmpty({ groups: ["create"], message: "Civility is required" }) - public civility!: "MALE" | "FEMALE" | "OTHERS"; + public civility!: ECivility | string; @IsNotEmpty({ groups: ["create"], message: "Address is required" }) @ValidateNested({ groups: ["create", "update"] }) diff --git a/src/Customer/Customer.ts b/src/Customer/Customer.ts index 864528f..62382f2 100644 --- a/src/Customer/Customer.ts +++ b/src/Customer/Customer.ts @@ -11,7 +11,7 @@ import { Type } from "class-transformer"; export default class Customer extends Resource { @IsNotEmpty({ groups: ["create"], message: "Status is required" }) - public status!: "VALIDATED" | "PENDING" | "ERRONED"; + public status!: ECustomerStatus | string; @IsNotEmpty({ groups: ["create"], message: "Contact is required" }) @ValidateNested({ groups: ["create", "update"] }) diff --git a/src/Customer/Document.ts b/src/Customer/Document.ts index 00c858f..628bfea 100644 --- a/src/Customer/Document.ts +++ b/src/Customer/Document.ts @@ -14,12 +14,7 @@ import { Type } from "class-transformer"; export default class Document extends Resource { @IsNotEmpty({ groups: ["create"], message: "Document status is required" }) - public document_status!: - | "ASKED" - | "DEPOSITED" - | "VALIDATED" - | "ANCHORED" - | "REFUSED"; + public document_status!: EDocumentStatus | string; @IsNotEmpty({ groups: ["create"], message: "Document type is required" }) @ValidateNested({ groups: ["create", "update"] }) diff --git a/src/Customer/DocumentHistory.ts b/src/Customer/DocumentHistory.ts index 5c61caf..ac656a5 100644 --- a/src/Customer/DocumentHistory.ts +++ b/src/Customer/DocumentHistory.ts @@ -1,11 +1,11 @@ import { IsNotEmpty, IsDate, ValidateNested } from "class-validator"; -import { default as Document } from "./Document"; +import { default as Document, EDocumentStatus } from "./Document"; import Resource from "../Resource"; import { Type } from "class-transformer"; export default class DocumentHistory extends Resource { @IsNotEmpty({ groups: ["create"], message: "Document status is required" }) - public document_status!: "ASKED" | "DEPOSITED" | "VALIDATED" | "ANCHORED" | "REFUSED"; + public document_status!: EDocumentStatus | string; @IsNotEmpty({ groups: ["create"], message: "Document is required" }) @ValidateNested({ groups: ["create", "update"] }) diff --git a/src/Customer/Office.ts b/src/Customer/Office.ts index b3000e6..c04eebf 100644 --- a/src/Customer/Office.ts +++ b/src/Customer/Office.ts @@ -27,7 +27,7 @@ export default class Office extends Resource { public address!: Address; @IsNotEmpty({ groups: ["create"], message: "Office status is required" }) - public office_status!: "ACTIVATED" | "DESACTIVATED"; + public office_status!: EOfficeStatus | string; @IsDate() public created_at: Date | null = null; @@ -55,3 +55,4 @@ export enum EOfficeStatus { ACTIVATED = "ACTIVATED", DESACTIVATED = "DESACTIVATED", } + diff --git a/src/Customer/OfficeFolder.ts b/src/Customer/OfficeFolder.ts index 5607547..79ade6c 100644 --- a/src/Customer/OfficeFolder.ts +++ b/src/Customer/OfficeFolder.ts @@ -24,7 +24,7 @@ export default class OfficeFolder extends Resource { public archived_description: string | null = null; @IsNotEmpty({ groups: ["create"], message: "Status is required" }) - public status!: "LIVE" | "ARCHIVED"; + public status!: EFolderStatus | string; @IsNotEmpty({ groups: ["create"], message: "Deed is required" }) @ValidateNested({ groups: ["create", "update"] }) diff --git a/src/Customer/index.ts b/src/Customer/index.ts index f0894a9..39dcde9 100644 --- a/src/Customer/index.ts +++ b/src/Customer/index.ts @@ -1,6 +1,6 @@ -import User from "./Customer"; +import Customer from "./Customer"; -export default User; +export default Customer; export { default as Address } from "./Address"; export { default as Contact } from "./Contact"; export { default as Deed } from "./Deed"; diff --git a/src/Resource.ts b/src/Resource.ts index d411a35..fd23d23 100644 --- a/src/Resource.ts +++ b/src/Resource.ts @@ -13,4 +13,8 @@ export default class Resource { public static validateOrReject(validatorOptions?: ValidatorOptions){ return validator.validateOrReject(this, validatorOptions); } + + public validateOrReject(validatorOptions?: ValidatorOptions){ + return validator.validateOrReject(this, validatorOptions); + } } \ No newline at end of file