From 114b6eed6570b97cfa8076b447a500f81cd49872 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Wed, 16 Aug 2023 11:59:33 +0200 Subject: [PATCH] remove uid enforcement for updates --- dist/Customer/File.js | 1 - dist/Notary/Contact.js | 1 - dist/Notary/DeedType.js | 2 +- dist/Notary/Office.js | 2 +- dist/Notary/OfficeRole.js | 1 - dist/Notary/Role.js | 1 - dist/Notary/Rule.js | 2 +- dist/Notary/User.js | 2 +- dist/SuperAdmin/User.d.ts | 2 +- dist/SuperAdmin/User.js | 2 +- src/Admin/Office.ts | 14 -------------- src/Customer/File.ts | 1 - src/Notary/Contact.ts | 1 - src/Notary/DeedType.ts | 2 +- src/Notary/Office.ts | 2 +- src/Notary/OfficeRole.ts | 1 - src/Notary/Role.ts | 1 - src/Notary/Rule.ts | 2 +- src/Notary/User.ts | 2 +- src/SuperAdmin/User.ts | 2 +- 20 files changed, 11 insertions(+), 33 deletions(-) diff --git a/dist/Customer/File.js b/dist/Customer/File.js index e4aa2c2..6c9c1f6 100644 --- a/dist/Customer/File.js +++ b/dist/Customer/File.js @@ -26,7 +26,6 @@ class File extends Resource_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["updateFile"], message: "UID is required" }), __metadata("design:type", String) ], File.prototype, "uid", void 0); __decorate([ diff --git a/dist/Notary/Contact.js b/dist/Notary/Contact.js index 57f08b0..2bb361b 100644 --- a/dist/Notary/Contact.js +++ b/dist/Notary/Contact.js @@ -39,7 +39,6 @@ class Contact extends Contact_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["update"], message: "UID is required" }), __metadata("design:type", String) ], Contact.prototype, "uid", void 0); __decorate([ diff --git a/dist/Notary/DeedType.js b/dist/Notary/DeedType.js index f4c6676..0d54817 100644 --- a/dist/Notary/DeedType.js +++ b/dist/Notary/DeedType.js @@ -41,7 +41,7 @@ class DeedType extends DeedType_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder", "updateDeedType"], message: "UID is required" }), + (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder"], message: "UID is required" }), __metadata("design:type", String) ], DeedType.prototype, "uid", void 0); __decorate([ diff --git a/dist/Notary/Office.js b/dist/Notary/Office.js index cef5ac4..f5e185f 100644 --- a/dist/Notary/Office.js +++ b/dist/Notary/Office.js @@ -39,7 +39,7 @@ class Office extends Office_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["updateOffice", "createFolder", "createDeedType", "createDocumentType", "createRule", "createRole"], message: "UID is required" }), + (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder", "createDeedType", "createDocumentType", "createRule", "createRole"], message: "UID is required" }), __metadata("design:type", String) ], Office.prototype, "uid", void 0); __decorate([ diff --git a/dist/Notary/OfficeRole.js b/dist/Notary/OfficeRole.js index 48327fd..91bf307 100644 --- a/dist/Notary/OfficeRole.js +++ b/dist/Notary/OfficeRole.js @@ -28,7 +28,6 @@ class OfficeRole extends Resource_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["updateOfficeRole"], message: "UID is required" }), __metadata("design:type", String) ], OfficeRole.prototype, "uid", void 0); __decorate([ diff --git a/dist/Notary/Role.js b/dist/Notary/Role.js index 2064ea2..45102a4 100644 --- a/dist/Notary/Role.js +++ b/dist/Notary/Role.js @@ -27,7 +27,6 @@ class Role extends Resource_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["updateRole"], message: "UID is required" }), __metadata("design:type", String) ], Role.prototype, "uid", void 0); __decorate([ diff --git a/dist/Notary/Rule.js b/dist/Notary/Rule.js index 26c65e2..8944814 100644 --- a/dist/Notary/Rule.js +++ b/dist/Notary/Rule.js @@ -26,7 +26,7 @@ class Rule extends Resource_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["updateRule", "updateOfficeRole"], message: "UID is required" }), + (0, class_validator_1.IsNotEmpty)({ groups: ["updateOfficeRole"], message: "UID is required" }), __metadata("design:type", String) ], Rule.prototype, "uid", void 0); __decorate([ diff --git a/dist/Notary/User.js b/dist/Notary/User.js index 0e10f6a..c7b487e 100644 --- a/dist/Notary/User.js +++ b/dist/Notary/User.js @@ -30,7 +30,7 @@ class User extends Resource_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder", "updateFolder", "updateUser", "createVote"], message: "UID is required" }), + (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder", "updateFolder", "createVote"], message: "UID is required" }), __metadata("design:type", String) ], User.prototype, "uid", void 0); __decorate([ diff --git a/dist/SuperAdmin/User.d.ts b/dist/SuperAdmin/User.d.ts index 4714353..d492703 100644 --- a/dist/SuperAdmin/User.d.ts +++ b/dist/SuperAdmin/User.d.ts @@ -2,5 +2,5 @@ export * from "../Admin/User"; import UserAdmin from "../Admin/User"; import Vote from "./Vote"; export default class User extends UserAdmin { - vote?: Vote; + vote?: Vote[]; } diff --git a/dist/SuperAdmin/User.js b/dist/SuperAdmin/User.js index 336233f..9e1ccd2 100644 --- a/dist/SuperAdmin/User.js +++ b/dist/SuperAdmin/User.js @@ -35,7 +35,7 @@ class User extends User_1.default { __decorate([ (0, class_transformer_1.Expose)(), (0, class_transformer_1.Type)(() => Vote_1.default), - __metadata("design:type", Vote_1.default) + __metadata("design:type", Array) ], User.prototype, "vote", void 0); exports.default = User; ; diff --git a/src/Admin/Office.ts b/src/Admin/Office.ts index 1846c84..550d5a6 100644 --- a/src/Admin/Office.ts +++ b/src/Admin/Office.ts @@ -2,17 +2,3 @@ export * from "../Notary/Office"; import Office from "../Notary/Office"; export default Office; - - -/** - * @description If we overrride the users we should be able to use the new overrided Notary user type - */ -// export * from "../Notary/Office"; -// import { IsOptional } from "class-validator"; -// import Office_ from "../Notary/Office"; -// import Notary from "."; - -// export default class Office extends Office_ { -// @IsOptional() -// public override users?: Notary[]; -// }; \ No newline at end of file diff --git a/src/Customer/File.ts b/src/Customer/File.ts index 7fb6b00..3c322b6 100644 --- a/src/Customer/File.ts +++ b/src/Customer/File.ts @@ -5,7 +5,6 @@ import { Expose, Type } from "class-transformer"; export default class File extends Resource { @Expose() - @IsNotEmpty({ groups: ["updateFile"], message: "UID is required" }) public uid?: string; @Expose() diff --git a/src/Notary/Contact.ts b/src/Notary/Contact.ts index 934c7d0..77da09d 100644 --- a/src/Notary/Contact.ts +++ b/src/Notary/Contact.ts @@ -6,7 +6,6 @@ import Address from "./Address"; export default class Contact extends ContactCustomer { @Expose() - @IsNotEmpty({ groups: ["update"] ,message: "UID is required" }) public override uid?: string; @Expose() diff --git a/src/Notary/DeedType.ts b/src/Notary/DeedType.ts index 1d36f8b..f7647d1 100644 --- a/src/Notary/DeedType.ts +++ b/src/Notary/DeedType.ts @@ -8,7 +8,7 @@ import Office from "./Office"; export default class DeedType extends DeedTypeCustomer { @Expose() - @IsNotEmpty({ groups: ["createFolder", "updateDeedType"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createFolder"] ,message: "UID is required" }) public override uid?: string; @Expose() diff --git a/src/Notary/Office.ts b/src/Notary/Office.ts index 8dab3d8..875e3ea 100644 --- a/src/Notary/Office.ts +++ b/src/Notary/Office.ts @@ -9,7 +9,7 @@ import { OfficeFolder } from "../Customer"; export default class Office extends OfficeCustomer{ @Expose() - @IsNotEmpty({ groups: ["updateOffice", "createFolder" , "createDeedType" , "createDocumentType", "createRule", "createRole"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createFolder" , "createDeedType" , "createDocumentType", "createRule", "createRole"] ,message: "UID is required" }) public override uid?: string; @Expose() diff --git a/src/Notary/OfficeRole.ts b/src/Notary/OfficeRole.ts index d11e971..18caa28 100644 --- a/src/Notary/OfficeRole.ts +++ b/src/Notary/OfficeRole.ts @@ -11,7 +11,6 @@ import Rule from "./Rule"; export default class OfficeRole extends Resource { @Expose() - @IsNotEmpty({ groups: ["updateOfficeRole"] ,message: "UID is required" }) public uid?: string; @Expose() diff --git a/src/Notary/Role.ts b/src/Notary/Role.ts index 9405805..3a9ef4e 100644 --- a/src/Notary/Role.ts +++ b/src/Notary/Role.ts @@ -11,7 +11,6 @@ import Rule from "./Rule"; export default class Role extends Resource { @Expose() - @IsNotEmpty({ groups: ["updateRole"] ,message: "UID is required" }) public uid?: string; @Expose() diff --git a/src/Notary/Rule.ts b/src/Notary/Rule.ts index 50740a8..e064d29 100644 --- a/src/Notary/Rule.ts +++ b/src/Notary/Rule.ts @@ -8,7 +8,7 @@ import OfficeRole from "./OfficeRole"; export default class Rule extends Resource { @Expose() - @IsNotEmpty({ groups: ["updateRule", "updateOfficeRole"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["updateOfficeRole"] ,message: "UID is required" }) public uid?: string; @Expose() diff --git a/src/Notary/User.ts b/src/Notary/User.ts index 4ac426b..561e068 100644 --- a/src/Notary/User.ts +++ b/src/Notary/User.ts @@ -13,7 +13,7 @@ import OfficeFolder from "./OfficeFolder"; export default class User extends Resource { @Expose() - @IsNotEmpty({ groups: ["createFolder", "updateFolder", "updateUser", "createVote"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createFolder", "updateFolder", "createVote"] ,message: "UID is required" }) public uid?: string; @Expose() diff --git a/src/SuperAdmin/User.ts b/src/SuperAdmin/User.ts index 79b8416..259d06c 100644 --- a/src/SuperAdmin/User.ts +++ b/src/SuperAdmin/User.ts @@ -6,5 +6,5 @@ import Vote from "./Vote"; export default class User extends UserAdmin { @Expose() @Type(() => Vote) - public vote?: Vote; + public vote?: Vote[]; }; \ No newline at end of file