From f2c9e79671770e46d4d360fa3a2afb53a12e1b19 Mon Sep 17 00:00:00 2001 From: Vincent Alamelle Date: Wed, 3 May 2023 11:56:13 +0200 Subject: [PATCH] Removed old groups --- src/Customer/Address.ts | 14 ++++------ src/Customer/Contact.ts | 27 +++++++++---------- src/Customer/Customer.ts | 13 +++------ src/Customer/Deed.ts | 11 +++----- src/Customer/DeedHasDocumentType.ts | 7 +---- src/Customer/DeedType.ts | 16 +++++------ src/Customer/DeedTypeHasDocumentType.ts | 7 ++--- src/Customer/Document.ts | 20 +++++--------- src/Customer/DocumentHistory.ts | 6 +---- src/Customer/DocumentType.ts | 18 +++++-------- src/Customer/File.ts | 6 +---- src/Customer/Notification.ts | 5 ---- src/Customer/Office.ts | 19 +++++-------- src/Customer/OfficeFolder.ts | 31 +++++++++++++--------- src/Customer/OfficeFolderHasCustomer.ts | 7 ++--- src/Customer/OfficeFolderHasStakeholder.ts | 7 ++--- src/Customer/UserHasNotification.ts | 7 +---- src/Notary/User.ts | 12 +-------- 18 files changed, 80 insertions(+), 153 deletions(-) diff --git a/src/Customer/Address.ts b/src/Customer/Address.ts index 2b6b2d0..cffc048 100644 --- a/src/Customer/Address.ts +++ b/src/Customer/Address.ts @@ -1,20 +1,20 @@ -import { IsNotEmpty, IsDate, IsOptional, ValidateNested } from "class-validator"; +import { IsNotEmpty, IsDate } from "class-validator"; import Contact from "./Contact"; import Office from "./Office"; import Resource from "../Resource"; import { Type } from "class-transformer"; export default class Address extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) + public uid?: string; - @IsNotEmpty({ groups: ["create" , "createCustomer" , "createOffice"], message: "Address is required" }) + @IsNotEmpty({ groups: ["createCustomer" , "createOffice", "updateCustomer"], message: "Address is required" }) public address!: string; - @IsNotEmpty({ groups: ["create" , "createCustomer" , "createOffice"], message: "City is required" }) + @IsNotEmpty({ groups: ["createCustomer" , "createOffice", "updateCustomer"], message: "City is required" }) public city!: string; - @IsNotEmpty({ groups: ["create" , "createCustomer" , "createOffice"], message: "State is required" }) + @IsNotEmpty({ groups: ["createCustomer" , "createOffice", "updateCustomer"], message: "State is required" }) public zip_code!: number; @IsDate() @@ -23,13 +23,9 @@ export default class Address extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Office) public office?: Office | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Contact) public contact?: Contact | null = null; } diff --git a/src/Customer/Contact.ts b/src/Customer/Contact.ts index aaece7d..192dafe 100644 --- a/src/Customer/Contact.ts +++ b/src/Customer/Contact.ts @@ -9,29 +9,32 @@ export default class Contact extends Resource { @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create" , "createCustomer"], message: "First name is required" }) - @IsOptional({ groups: ["update"] }) + @IsOptional({ groups: ["updateCustomer"]}) + @IsNotEmpty({ groups: ["createCustomer", "updateCustomer"], message: "First name is required" }) public first_name!: string; - @IsNotEmpty({ groups: ["create" , "createCustomer"], message: "Last name is required" }) - @IsOptional({ groups: ["update"] }) + @IsOptional({ groups: ["updateCustomer"]}) + @IsNotEmpty({ groups: ["createCustomer", "updateCustomer"], message: "Last name is required" }) public last_name!: string; - @IsNotEmpty({ groups: ["create" , "createCustomer"] }) - @IsEmail({}, { groups: ["create", "update"], message: "Email is not valid" }) + @IsOptional({ groups: ["updateCustomer"]}) + @IsNotEmpty({ groups: ["createCustomer", "updateCustomer"] }) + @IsEmail({}, { groups: ["createCustomer", "updateCustomer"], message: "Email is not valid" }) public email!: string; - @IsNotEmpty({ groups: ["create" , "createCustomer"] }) + @IsOptional({ groups: ["updateCustomer"]}) + @IsNotEmpty({ groups: ["createCustomer", "updateCustomer"] }) public cell_phone_number!: string; @IsOptional() public phone_number?: string; - @IsNotEmpty({ groups: ["create" , "createCustomer"], message: "Civility is required" }) + @IsOptional({ groups: ["updateCustomer"]}) + @IsNotEmpty({ groups: ["createCustomer", "updateCustomer"], message: "Civility is required" }) public civility!: ECivility | string; - @IsOptional({ groups: ["createCustomer"]}) - @ValidateNested({ groups: ["create", "update" , "createCustomer"] }) + @IsOptional({ groups: ["createCustomer", "updateCustomer"]}) + @ValidateNested({ groups: ["createCustomer", "updateCustomer"] }) @Type(() => Address) public address?: Address; @@ -44,13 +47,9 @@ export default class Contact extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => User) public user?: User | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Customer) public customer?: Customer | null = null; } diff --git a/src/Customer/Customer.ts b/src/Customer/Customer.ts index 9f50796..b240219 100644 --- a/src/Customer/Customer.ts +++ b/src/Customer/Customer.ts @@ -1,7 +1,6 @@ import { IsDate, IsNotEmpty, - IsOptional, ValidateNested, } from "class-validator"; import { Contact, Document } from "."; @@ -10,14 +9,14 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class Customer extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["updateFolder"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"], message: "Status is required" }) + @IsNotEmpty({ groups: ["updateCustomer"], message: "Status is required" }) public status!: ECustomerStatus | string; - @IsNotEmpty({ groups: ["create" , "createCustomer"], message: "Contact is required" }) - @ValidateNested({ groups: ["create", "update" , "createCustomer"] }) + @IsNotEmpty({ groups: ["createCustomer", "updateCustomer"], message: "Contact is required" }) + @ValidateNested({ groups: ["createCustomer", "updateCustomer"] }) @Type(() => Contact) public contact!: Contact; @@ -27,13 +26,9 @@ export default class Customer extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => OfficeFolderHasCustomer) office_folder_has_customers?: OfficeFolderHasCustomer[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Document) documents?: Document[]; } diff --git a/src/Customer/Deed.ts b/src/Customer/Deed.ts index 0fa8c65..110c379 100644 --- a/src/Customer/Deed.ts +++ b/src/Customer/Deed.ts @@ -1,4 +1,4 @@ -import { IsNotEmpty, IsDate, ValidateNested, IsOptional } from "class-validator"; +import { IsNotEmpty, IsDate, ValidateNested } from "class-validator"; import DeedType from "./DeedType"; import DeedHasDocumentType from "./DeedHasDocumentType"; import OfficeFolder from "./OfficeFolder"; @@ -6,11 +6,10 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class Deed extends Resource{ - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create", "createFolder"], message: "Deed type is required" }) - @ValidateNested({ groups: ["create", "update" , "createFolder"] }) + @IsNotEmpty({ groups: ["createFolder"], message: "Deed type is required" }) + @ValidateNested({ groups: ["createFolder"] }) @Type(() => DeedType) public deed_type!: DeedType; @@ -20,13 +19,9 @@ export default class Deed extends Resource{ @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => DeedHasDocumentType) public deed_has_document_types?: DeedHasDocumentType[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => OfficeFolder) public office_folder?: OfficeFolder; } diff --git a/src/Customer/DeedHasDocumentType.ts b/src/Customer/DeedHasDocumentType.ts index bd653d2..0bd701f 100644 --- a/src/Customer/DeedHasDocumentType.ts +++ b/src/Customer/DeedHasDocumentType.ts @@ -1,20 +1,15 @@ -import { IsNotEmpty, IsDate, ValidateNested } from "class-validator"; +import { IsDate } from "class-validator"; import Deed from "./Deed"; import DocumentType from "./DocumentType"; import Resource from "../Resource"; import { Type } from "class-transformer"; export default class DeedHasDocumentType extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"], message: "Document type is required" }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => DocumentType) public document_type!: DocumentType; - @IsNotEmpty({ groups: ["create"], message: "Deed is required" }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Deed) public deed!: Deed; diff --git a/src/Customer/DeedType.ts b/src/Customer/DeedType.ts index 40062a1..9fb0119 100644 --- a/src/Customer/DeedType.ts +++ b/src/Customer/DeedType.ts @@ -11,20 +11,20 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class DeedType extends Resource { - @IsNotEmpty({ groups: ["update" , "createFolder"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createFolder"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create", "createDeedType"], message: "Name is required" }) + @IsNotEmpty({ groups: ["createDeedType"], message: "Name is required" }) public name!: string; - @IsNotEmpty({ groups: ["create" , "createDeedType"], message: "Description is required" }) + @IsNotEmpty({ groups: ["createDeedType"], message: "Description is required" }) public description!: string; @IsDate() public archived_at: Date | null = null; - @IsNotEmpty({ groups: ["create" , "createDeedType"], message: "Office is required" }) - @ValidateNested({ groups: ["create", "update" , "createDeedType"] }) + @IsNotEmpty({ groups: ["createDeedType"], message: "Office is required" }) + @ValidateNested({ groups: ["createDeedType"] }) @Type(() => Office) public office!: Office; @@ -34,13 +34,11 @@ export default class DeedType extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Deed) public deed?: Deed[]; - @IsOptional({ groups: ["create", "update" , "createDeedType"] }) - @ValidateNested({ groups: ["create", "update" , "createDeedType"] }) + @IsOptional({ groups: ["createDeedType"] }) + @ValidateNested({ groups: ["createDeedType"] }) @Type(() => DeedTypeHasDocumentType) public deed_type_has_document_types?: DeedTypeHasDocumentType[]; } diff --git a/src/Customer/DeedTypeHasDocumentType.ts b/src/Customer/DeedTypeHasDocumentType.ts index 8a5521a..7209dff 100644 --- a/src/Customer/DeedTypeHasDocumentType.ts +++ b/src/Customer/DeedTypeHasDocumentType.ts @@ -5,16 +5,13 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class DeedTypeHasDocumentType extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create" , "createDeedType"], message: "Document type is required" }) - @ValidateNested({ groups: ["create", "update" , "createDeedType"] }) + @IsNotEmpty({ groups: ["createDeedType"], message: "Document type is required" }) + @ValidateNested({ groups: ["createDeedType"] }) @Type(() => DocumentType) public document_type!: DocumentType; - @IsNotEmpty({ groups: ["create"], message: "Deed type is required" }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => DeedType) public deed_type!: DeedType; diff --git a/src/Customer/Document.ts b/src/Customer/Document.ts index 1ef5088..be38b15 100644 --- a/src/Customer/Document.ts +++ b/src/Customer/Document.ts @@ -1,7 +1,6 @@ import { IsNotEmpty, IsDate, - IsOptional, ValidateNested, } from "class-validator"; import Customer from "."; @@ -13,24 +12,23 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class Document extends Resource { - @IsNotEmpty({ groups: ["update" , "createDocument"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createDocument"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"], message: "Document status is required" }) public document_status!: EDocumentStatus | string; - @IsNotEmpty({ groups: ["create", "createDocument"], message: "Document type is required" }) - @ValidateNested({ groups: ["create", "update" , "createDocument"] }) + @IsNotEmpty({ groups: ["createDocument", "updateFolder"], message: "Document type is required" }) + @ValidateNested({ groups: ["createDocument"] }) @Type(() => DocumentType) public document_type!: DocumentType; - @IsNotEmpty({ groups: ["create" , "createDocument"], message: "Folder is required" }) - @ValidateNested({ groups: ["create", "update" , "createDocument"] }) + @IsNotEmpty({ groups: ["createDocument"], message: "Folder is required" }) + @ValidateNested({ groups: ["createDocument"] }) @Type(() => OfficeFolder) public folder!: OfficeFolder; - @IsNotEmpty({ groups: ["create" , "createDocument"], message: "Depositor is required" }) - @ValidateNested({ groups: ["create", "update" , "createDocument"] }) + @IsNotEmpty({ groups: ["createDocument", "updateFolder"], message: "Depositor is required" }) + @ValidateNested({ groups: ["createDocument"] }) @Type(() => Customer) public depositor!: Customer; @@ -40,13 +38,9 @@ export default class Document extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => File) public files?: File[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => DocumentHistory) public document_history?: DocumentHistory[]; } diff --git a/src/Customer/DocumentHistory.ts b/src/Customer/DocumentHistory.ts index f28cceb..00f57f1 100644 --- a/src/Customer/DocumentHistory.ts +++ b/src/Customer/DocumentHistory.ts @@ -1,17 +1,13 @@ -import { IsNotEmpty, IsDate, ValidateNested } from "class-validator"; +import { IsDate } from "class-validator"; import { default as Document, EDocumentStatus } from "./Document"; import Resource from "../Resource"; import { Type } from "class-transformer"; export default class DocumentHistory extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"], message: "Document status is required" }) public document_status!: EDocumentStatus | string; - @IsNotEmpty({ groups: ["create"], message: "Document is required" }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Document) public document!: Document; diff --git a/src/Customer/DocumentType.ts b/src/Customer/DocumentType.ts index 28857f6..c474a02 100644 --- a/src/Customer/DocumentType.ts +++ b/src/Customer/DocumentType.ts @@ -7,23 +7,23 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class DocumentType extends Resource { - @IsNotEmpty({ groups: ["update" , "createDocument" , "createDeedType"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createDocument" , "createDeedType", "updateFolder"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create", "createDocumentType"], message: "Name is required" }) + @IsNotEmpty({ groups: ["createDocumentType"], message: "Name is required" }) public name!: string; - @IsNotEmpty({ groups: ["create" , "createDocumentType"], message: "Public description is required" }) + @IsNotEmpty({ groups: ["createDocumentType"], message: "Public description is required" }) public public_description!: string; - @IsOptional({ groups: ["create", "update" , "createDocumentType"] }) + @IsOptional({ groups: ["createDocumentType"] }) public private_description: string | null = null; @IsDate() public archived_at: Date | null = null; - @IsNotEmpty({ groups: ["create" , "createDocumentType"], message: "Office is required" }) - @ValidateNested({ groups: ["create", "update" , "createDocumentType"] }) + @IsNotEmpty({ groups: ["createDocumentType"], message: "Office is required" }) + @ValidateNested({ groups: ["createDocumentType"] }) @Type(() => Office) public office!: Office; @@ -33,18 +33,12 @@ export default class DocumentType extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Document) public documents?: Document[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => DeedHasDocumentType) public deed_has_document_types?: DeedHasDocumentType[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => DeedTypeHasDocumentType) public deed_type_has_document_types?: DeedTypeHasDocumentType[]; } diff --git a/src/Customer/File.ts b/src/Customer/File.ts index d8118ad..54eecc0 100644 --- a/src/Customer/File.ts +++ b/src/Customer/File.ts @@ -1,18 +1,14 @@ -import { IsNotEmpty, IsDate, ValidateNested } from "class-validator"; +import { IsDate } from "class-validator"; import Document from "./Document"; import Resource from "../Resource"; import { Type } from "class-transformer"; export default class File extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"], message: "Document is required" }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Document) public document!: Document; - @IsNotEmpty({ groups: ["create"], message: "file path is required" }) public file_path!: string;; @IsDate() diff --git a/src/Customer/Notification.ts b/src/Customer/Notification.ts index 409966c..d9f311a 100644 --- a/src/Customer/Notification.ts +++ b/src/Customer/Notification.ts @@ -10,13 +10,10 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class Notification extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"], message: "Message is required" }) public message!: string; - @IsNotEmpty({ groups: ["create"], message: "Redirection url is required" }) @IsUrl() public redirection_url!: string; @@ -26,8 +23,6 @@ export default class Notification extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => UserHasNotification) user_has_notifications?: UserHasNotification[]; } diff --git a/src/Customer/Office.ts b/src/Customer/Office.ts index 09d4c32..5c6f552 100644 --- a/src/Customer/Office.ts +++ b/src/Customer/Office.ts @@ -12,24 +12,23 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class Office extends Resource { - @IsNotEmpty({ groups: ["update" , "createFolder" , "createDeedType" , "createDocumentType"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createFolder" , "createDeedType" , "createDocumentType"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create" , "createOffice"], message: "ID IdNote is required" }) + @IsNotEmpty({ groups: ["createOffice"], message: "ID IdNote is required" }) public idNot!: string; - @IsNotEmpty({ groups: ["create" , "createOffice"], message: "Name is required" }) + @IsNotEmpty({ groups: ["createOffice"], message: "Name is required" }) public name!: string; - @IsNotEmpty({ groups: ["create" , "createOffice"], message: "CRPCEN is required" }) + @IsNotEmpty({ groups: ["createOffice"], message: "CRPCEN is required" }) public crpcen!: string; - @IsNotEmpty({ groups: ["create" , "createOffice"], message: "Address is required" }) - @ValidateNested({ groups: ["create", "update" , "createOffice"] }) + @IsNotEmpty({ groups: ["createOffice"], message: "Address is required" }) + @ValidateNested({ groups: ["createOffice"] }) @Type(() => Address) public address!: Address; - @IsNotEmpty({ groups: ["create"], message: "Office status is required" }) public office_status!: EOfficeStatus | string; @IsDate() @@ -38,18 +37,12 @@ export default class Office extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => DeedType) public deed_types?: DeedType[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => User) public users?: User[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => OfficeFolder) public office_folders?: OfficeFolder[]; } diff --git a/src/Customer/OfficeFolder.ts b/src/Customer/OfficeFolder.ts index 698d5e4..f7f7999 100644 --- a/src/Customer/OfficeFolder.ts +++ b/src/Customer/OfficeFolder.ts @@ -13,29 +13,34 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class OfficeFolder extends Resource { - @IsNotEmpty({ groups: ["update" , "createDocument"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createDocument"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create" , "createFolder"], message: "Folder number is required" }) + @IsOptional({ groups : ["updateFolder"]}) + @IsNotEmpty({ groups: ["createFolder"], message: "Folder number is required" }) public folder_number!: string; - @IsNotEmpty({ groups: ["create" , "createFolder"], message: "Name is required" }) + @IsOptional({ groups : ["updateFolder"]}) + @IsNotEmpty({ groups: ["createFolder"], message: "Name is required" }) public name!: string; + @IsOptional({ groups : ["updateFolder"]}) @IsNotEmpty({ groups: ["createFolder"], message: "Description is required" }) public description: string | null = null; + @IsOptional({ groups : ["updateFolder"]}) public archived_description: string | null = null; + @IsOptional({ groups : ["updateFolder"]}) public status: EFolderStatus | string = EFolderStatus.LIVE; - @IsNotEmpty({ groups: ["create", "createFolder"], message: "Deed is required" }) - @ValidateNested({ groups: ["create" , "createFolder"] }) + @IsNotEmpty({ groups: ["createFolder"], message: "Deed is required" }) + @ValidateNested({ groups: ["createFolder"] }) @Type(() => Deed) public deed!: Deed; - @IsNotEmpty({ groups: ["create" , "createFolder"], message: "Office is required" }) - @ValidateNested({ groups: ["create" , "createFolder"] }) + @IsNotEmpty({ groups: ["createFolder"], message: "Office is required" }) + @ValidateNested({ groups: ["createFolder"] }) @Type(() => Office) public office!: Office; @@ -45,18 +50,18 @@ export default class OfficeFolder extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) + @IsOptional({ groups: ["updateFolder"] }) + @ValidateNested({ groups: ["updateFolder"] }) @Type(() => OfficeFolderHasCustomer) office_folder_has_customers?: OfficeFolderHasCustomer[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update" , "createFolder"] }) + @IsOptional({ groups: ["updateFolder"] }) + @ValidateNested({ groups: ["createFolder", "updateFolder"] }) @Type(() => OfficeFolderHasStakeholder) office_folder_has_stakeholder?: OfficeFolderHasStakeholder[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) + @IsOptional({ groups: ["updateFolder"] }) + @ValidateNested({ groups: ["updateFolder"] }) @Type(() => Document) documents?: Document[]; } diff --git a/src/Customer/OfficeFolderHasCustomer.ts b/src/Customer/OfficeFolderHasCustomer.ts index 9fc357a..350a5c4 100644 --- a/src/Customer/OfficeFolderHasCustomer.ts +++ b/src/Customer/OfficeFolderHasCustomer.ts @@ -5,16 +5,13 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class OfficeFolderHasCustomer extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"], message: "Customer is required" }) - @ValidateNested({ groups: ["create", "update"] }) + @IsNotEmpty({ groups: ["updateFolder"], message: "Customer is required" }) + @ValidateNested({ groups: ["updateFolder"] }) @Type(() => Customer) public customer!: Customer; - @IsNotEmpty({ groups: ["create"], message: "Office folder is required" }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => OfficeFolder) public office_folder!: OfficeFolder; diff --git a/src/Customer/OfficeFolderHasStakeholder.ts b/src/Customer/OfficeFolderHasStakeholder.ts index 6e81973..9d91e7a 100644 --- a/src/Customer/OfficeFolderHasStakeholder.ts +++ b/src/Customer/OfficeFolderHasStakeholder.ts @@ -5,16 +5,13 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class OfficeFolderHasStakeholder extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create" , "createFolder"], message: "User Stakeholder is required" }) - @ValidateNested({ groups: ["create", "update" , "createFolder"] }) + @IsNotEmpty({ groups: ["createFolder", "updateFolder"], message: "User Stakeholder is required" }) + @ValidateNested({ groups: ["createFolder", "updateFolder"] }) @Type(() => User) public user_stakeholder!: User; - //IsNotEmpty({ groups: ["create"], message: "Office folder is required" }) - //@ValidateNested({ groups: ["create", "update"] }) @Type(() => OfficeFolder) public office_folder?: OfficeFolder; diff --git a/src/Customer/UserHasNotification.ts b/src/Customer/UserHasNotification.ts index 40026b8..09f04f3 100644 --- a/src/Customer/UserHasNotification.ts +++ b/src/Customer/UserHasNotification.ts @@ -1,20 +1,15 @@ -import { IsNotEmpty, IsDate, ValidateNested } from "class-validator"; +import { IsDate } from "class-validator"; import Notification from "./Notification"; import User from "../Notary/User"; import Resource from "../Resource"; import { Type } from "class-transformer"; export default class UserHasNotification extends Resource { - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"], message: "User is required" }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => User) public user!: User; - @IsNotEmpty({ groups: ["create"], message: "Notification is required" }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Notification) public notification!: Notification; diff --git a/src/Notary/User.ts b/src/Notary/User.ts index 74b8835..f845f3c 100644 --- a/src/Notary/User.ts +++ b/src/Notary/User.ts @@ -1,8 +1,6 @@ import { IsNotEmpty, IsDate, - IsOptional, - ValidateNested, } from "class-validator"; import Contact from "../Customer/Contact"; import Document from "../Customer/Document"; @@ -12,18 +10,14 @@ import Resource from "../Resource"; import { Type } from "class-transformer"; export default class User extends Resource { - @IsNotEmpty({ groups: ["update", "createFolder"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createFolder", "updateFolder"] ,message: "UID is required" }) public uid?: string; - @IsNotEmpty({ groups: ["create"] }) public idNot!: string; - @IsNotEmpty({ groups: ["create"] }) - @ValidateNested({ groups: ["create"] }) @Type(() => Contact) public contact!: Contact; - @IsNotEmpty({ groups: ["create"] }) public office_membership!: Office; @IsDate() @@ -32,13 +26,9 @@ export default class User extends Resource { @IsDate() public updated_at: Date | null = null; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => OfficeFolderHasStakeholder) office_folder_has_stakeholders?: OfficeFolderHasStakeholder[]; - @IsOptional({ groups: ["create", "update"] }) - @ValidateNested({ groups: ["create", "update"] }) @Type(() => Document) documents?: Document[]; }