diff --git a/dist/Notary/User.js b/dist/Notary/User.js index 5e6ae99..0e10f6a 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", "createAppointment"], message: "UID is required" }), + (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder", "updateFolder", "updateUser", "createVote"], message: "UID is required" }), __metadata("design:type", String) ], User.prototype, "uid", void 0); __decorate([ diff --git a/dist/SuperAdmin/Appointment.js b/dist/SuperAdmin/Appointment.js index efacc98..98da1ca 100644 --- a/dist/SuperAdmin/Appointment.js +++ b/dist/SuperAdmin/Appointment.js @@ -22,13 +22,12 @@ class Appointment extends Resource_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["createVote"], message: "UID is required" }), __metadata("design:type", String) ], Appointment.prototype, "uid", void 0); __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["createAppointment"], message: "User is required" }), - (0, class_validator_1.ValidateNested)({ groups: ["createAppointment"] }), + (0, class_validator_1.IsOptional)({ groups: ["createVote"] }), + (0, class_validator_1.ValidateNested)({ groups: ["createVote"] }), (0, class_transformer_1.Type)(() => User_1.default), __metadata("design:type", User_1.default) ], Appointment.prototype, "targeted_user", void 0); @@ -43,6 +42,7 @@ __decorate([ ], Appointment.prototype, "votes", void 0); __decorate([ (0, class_transformer_1.Expose)(), + (0, class_validator_1.IsNotEmpty)({ groups: ["createVote"], message: "choice is required" }), __metadata("design:type", String) ], Appointment.prototype, "choice", void 0); exports.default = Appointment; diff --git a/src/Notary/User.ts b/src/Notary/User.ts index 0636286..4ac426b 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", "createAppointment"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createFolder", "updateFolder", "updateUser", "createVote"] ,message: "UID is required" }) public uid?: string; @Expose() diff --git a/src/SuperAdmin/Appointment.ts b/src/SuperAdmin/Appointment.ts index a9d011a..75b78de 100644 --- a/src/SuperAdmin/Appointment.ts +++ b/src/SuperAdmin/Appointment.ts @@ -2,16 +2,15 @@ import Resource from "../Resource"; import { Expose, Type } from "class-transformer"; import User from "./User"; import Vote from "./Vote"; -import { IsNotEmpty, ValidateNested } from "class-validator"; +import { IsNotEmpty, IsOptional, ValidateNested } from "class-validator"; export default class Appointment extends Resource { @Expose() - @IsNotEmpty({ groups: ["createVote"] ,message: "UID is required" }) public uid?: string; @Expose() - @IsNotEmpty({ groups: ["createAppointment"], message: "User is required"}) - @ValidateNested({ groups: ["createAppointment"] }) + @IsOptional({ groups: ["createVote"]}) + @ValidateNested({ groups: ["createVote"] }) @Type(() => User) public targeted_user!: User; @@ -23,6 +22,7 @@ export default class Appointment extends Resource { public votes?: Vote[]; @Expose() + @IsNotEmpty({ groups: ["createVote"], message: "choice is required"}) public choice!: EVote | string; }