From 5a783f082bb03d36d4339fc02e808247d5c16b39 Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Tue, 25 Jul 2023 14:11:15 +0200 Subject: [PATCH] add appointment for super-admin --- dist/Notary/DeedType.js | 6 ++--- dist/Notary/DocumentType.js | 2 +- dist/SuperAdmin/Appointment.d.ts | 13 +++++++++ dist/SuperAdmin/Appointment.js | 45 ++++++++++++++++++++++++++++++++ dist/SuperAdmin/User.d.ts | 7 +++-- dist/SuperAdmin/User.js | 21 ++++++++++++++- dist/SuperAdmin/Vote.d.ts | 13 +++++++++ dist/SuperAdmin/Vote.js | 45 ++++++++++++++++++++++++++++++++ dist/SuperAdmin/index.d.ts | 2 ++ dist/SuperAdmin/index.js | 6 ++++- src/Notary/DeedType.ts | 6 ++--- src/Notary/DocumentType.ts | 2 +- src/SuperAdmin/Appointment.ts | 25 ++++++++++++++++++ src/SuperAdmin/User.ts | 10 +++++-- src/SuperAdmin/Vote.ts | 25 ++++++++++++++++++ src/SuperAdmin/index.ts | 4 ++- 16 files changed, 217 insertions(+), 15 deletions(-) create mode 100644 dist/SuperAdmin/Appointment.d.ts create mode 100644 dist/SuperAdmin/Appointment.js create mode 100644 dist/SuperAdmin/Vote.d.ts create mode 100644 dist/SuperAdmin/Vote.js create mode 100644 src/SuperAdmin/Appointment.ts create mode 100644 src/SuperAdmin/Vote.ts diff --git a/dist/Notary/DeedType.js b/dist/Notary/DeedType.js index ce61dee..f4c6676 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"], message: "UID is required" }), + (0, class_validator_1.IsNotEmpty)({ groups: ["createFolder", "updateDeedType"], message: "UID is required" }), __metadata("design:type", String) ], DeedType.prototype, "uid", void 0); __decorate([ @@ -73,8 +73,8 @@ __decorate([ ], DeedType.prototype, "deed", void 0); __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsOptional)({ groups: ["createDeedType"] }), - (0, class_validator_1.ValidateNested)({ groups: ["createDeedType"] }), + (0, class_validator_1.IsOptional)({ groups: ["createDeedType", "updateDeedType"] }), + (0, class_validator_1.ValidateNested)({ groups: ["createDeedType", "updateDeedType"] }), (0, class_transformer_1.Type)(() => DocumentType_1.default), __metadata("design:type", Array) ], DeedType.prototype, "document_types", void 0); diff --git a/dist/Notary/DocumentType.js b/dist/Notary/DocumentType.js index bacf92e..439b7c4 100644 --- a/dist/Notary/DocumentType.js +++ b/dist/Notary/DocumentType.js @@ -43,7 +43,7 @@ class DocumentType extends DocumentType_1.default { } __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["createDocument", "createDeedType", "updateFolder", "updateDeed"], message: "UID is required" }), + (0, class_validator_1.IsNotEmpty)({ groups: ["createDocument", "createDeedType", "updateFolder", "updateDeed", "updateDeedType"], message: "UID is required" }), __metadata("design:type", String) ], DocumentType.prototype, "uid", void 0); __decorate([ diff --git a/dist/SuperAdmin/Appointment.d.ts b/dist/SuperAdmin/Appointment.d.ts new file mode 100644 index 0000000..995de96 --- /dev/null +++ b/dist/SuperAdmin/Appointment.d.ts @@ -0,0 +1,13 @@ +import Resource from "../Resource"; +import User from "./User"; +import Vote from "./Vote"; +export default class Appointment extends Resource { + uid?: string; + user: User; + status: EAppointmentStatus | string; + votes?: Vote[]; +} +export declare enum EAppointmentStatus { + OPEN = "OPEN", + CLOSED = "CLOSED" +} diff --git a/dist/SuperAdmin/Appointment.js b/dist/SuperAdmin/Appointment.js new file mode 100644 index 0000000..53e8178 --- /dev/null +++ b/dist/SuperAdmin/Appointment.js @@ -0,0 +1,45 @@ +"use strict"; +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.EAppointmentStatus = void 0; +const Resource_1 = __importDefault(require("../Resource")); +const class_transformer_1 = require("class-transformer"); +const User_1 = __importDefault(require("./User")); +const Vote_1 = __importDefault(require("./Vote")); +class Appointment extends Resource_1.default { +} +__decorate([ + (0, class_transformer_1.Expose)(), + __metadata("design:type", String) +], Appointment.prototype, "uid", void 0); +__decorate([ + (0, class_transformer_1.Expose)(), + (0, class_transformer_1.Type)(() => User_1.default), + __metadata("design:type", User_1.default) +], Appointment.prototype, "user", void 0); +__decorate([ + (0, class_transformer_1.Expose)(), + __metadata("design:type", String) +], Appointment.prototype, "status", void 0); +__decorate([ + (0, class_transformer_1.Expose)(), + (0, class_transformer_1.Type)(() => Vote_1.default), + __metadata("design:type", Array) +], Appointment.prototype, "votes", void 0); +exports.default = Appointment; +var EAppointmentStatus; +(function (EAppointmentStatus) { + EAppointmentStatus["OPEN"] = "OPEN"; + EAppointmentStatus["CLOSED"] = "CLOSED"; +})(EAppointmentStatus = exports.EAppointmentStatus || (exports.EAppointmentStatus = {})); diff --git a/dist/SuperAdmin/User.d.ts b/dist/SuperAdmin/User.d.ts index 0baf630..4714353 100644 --- a/dist/SuperAdmin/User.d.ts +++ b/dist/SuperAdmin/User.d.ts @@ -1,3 +1,6 @@ export * from "../Admin/User"; -import User from "../Admin/User"; -export default User; +import UserAdmin from "../Admin/User"; +import Vote from "./Vote"; +export default class User extends UserAdmin { + vote?: Vote; +} diff --git a/dist/SuperAdmin/User.js b/dist/SuperAdmin/User.js index e6567d0..336233f 100644 --- a/dist/SuperAdmin/User.js +++ b/dist/SuperAdmin/User.js @@ -10,13 +10,32 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi if (k2 === undefined) k2 = k; o[k2] = m[k]; })); +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; var __exportStar = (this && this.__exportStar) || function(m, exports) { for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p); }; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); __exportStar(require("../Admin/User"), exports); +const class_transformer_1 = require("class-transformer"); const User_1 = __importDefault(require("../Admin/User")); -exports.default = User_1.default; +const Vote_1 = __importDefault(require("./Vote")); +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) +], User.prototype, "vote", void 0); +exports.default = User; +; diff --git a/dist/SuperAdmin/Vote.d.ts b/dist/SuperAdmin/Vote.d.ts new file mode 100644 index 0000000..97b1115 --- /dev/null +++ b/dist/SuperAdmin/Vote.d.ts @@ -0,0 +1,13 @@ +import Resource from "../Resource"; +import User from "./User"; +import Appointment from "./Appointment"; +export default class Vote extends Resource { + uid?: string; + appointment: Appointment; + voter: User; + choice: EVote | string; +} +export declare enum EVote { + NOMINATE = "NOMINATE", + DISMISS = "DISMISS" +} diff --git a/dist/SuperAdmin/Vote.js b/dist/SuperAdmin/Vote.js new file mode 100644 index 0000000..c1882d2 --- /dev/null +++ b/dist/SuperAdmin/Vote.js @@ -0,0 +1,45 @@ +"use strict"; +var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { + var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; + if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc); + else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; + return c > 3 && r && Object.defineProperty(target, key, r), r; +}; +var __metadata = (this && this.__metadata) || function (k, v) { + if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v); +}; +var __importDefault = (this && this.__importDefault) || function (mod) { + return (mod && mod.__esModule) ? mod : { "default": mod }; +}; +Object.defineProperty(exports, "__esModule", { value: true }); +exports.EVote = void 0; +const Resource_1 = __importDefault(require("../Resource")); +const class_transformer_1 = require("class-transformer"); +const User_1 = __importDefault(require("./User")); +const Appointment_1 = __importDefault(require("./Appointment")); +class Vote extends Resource_1.default { +} +__decorate([ + (0, class_transformer_1.Expose)(), + __metadata("design:type", String) +], Vote.prototype, "uid", void 0); +__decorate([ + (0, class_transformer_1.Expose)(), + (0, class_transformer_1.Type)(() => Appointment_1.default), + __metadata("design:type", Appointment_1.default) +], Vote.prototype, "appointment", void 0); +__decorate([ + (0, class_transformer_1.Expose)(), + (0, class_transformer_1.Type)(() => User_1.default), + __metadata("design:type", User_1.default) +], Vote.prototype, "voter", void 0); +__decorate([ + (0, class_transformer_1.Expose)(), + __metadata("design:type", String) +], Vote.prototype, "choice", void 0); +exports.default = Vote; +var EVote; +(function (EVote) { + EVote["NOMINATE"] = "NOMINATE"; + EVote["DISMISS"] = "DISMISS"; +})(EVote = exports.EVote || (exports.EVote = {})); diff --git a/dist/SuperAdmin/index.d.ts b/dist/SuperAdmin/index.d.ts index f54c2ca..2455bc1 100644 --- a/dist/SuperAdmin/index.d.ts +++ b/dist/SuperAdmin/index.d.ts @@ -15,3 +15,5 @@ export { default as OfficeFolder } from "./OfficeFolder"; export { default as Rule } from "./Rule"; export { default as Role } from "./Role"; export { default as OfficeRole } from "./OfficeRole"; +export { default as Appointment } from "./Appointment"; +export { default as Vote } from "./Vote"; diff --git a/dist/SuperAdmin/index.js b/dist/SuperAdmin/index.js index c1e07ab..e68c740 100644 --- a/dist/SuperAdmin/index.js +++ b/dist/SuperAdmin/index.js @@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) { return (mod && mod.__esModule) ? mod : { "default": mod }; }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.OfficeRole = exports.Role = exports.Rule = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedType = exports.Deed = exports.Contact = exports.Customer = exports.Address = void 0; +exports.Vote = exports.Appointment = exports.OfficeRole = exports.Role = exports.Rule = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedType = exports.Deed = exports.Contact = exports.Customer = exports.Address = void 0; const User_1 = __importDefault(require("./User")); exports.default = User_1.default; var Address_1 = require("./Address"); @@ -36,3 +36,7 @@ var Role_1 = require("./Role"); Object.defineProperty(exports, "Role", { enumerable: true, get: function () { return __importDefault(Role_1).default; } }); var OfficeRole_1 = require("./OfficeRole"); Object.defineProperty(exports, "OfficeRole", { enumerable: true, get: function () { return __importDefault(OfficeRole_1).default; } }); +var Appointment_1 = require("./Appointment"); +Object.defineProperty(exports, "Appointment", { enumerable: true, get: function () { return __importDefault(Appointment_1).default; } }); +var Vote_1 = require("./Vote"); +Object.defineProperty(exports, "Vote", { enumerable: true, get: function () { return __importDefault(Vote_1).default; } }); diff --git a/src/Notary/DeedType.ts b/src/Notary/DeedType.ts index ea6c00f..1d36f8b 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"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createFolder", "updateDeedType"] ,message: "UID is required" }) public override uid?: string; @Expose() @@ -34,8 +34,8 @@ export default class DeedType extends DeedTypeCustomer { public override deed?: Deed[]; @Expose() - @IsOptional({ groups: ["createDeedType"] }) - @ValidateNested({ groups: ["createDeedType"] }) + @IsOptional({ groups: ["createDeedType", "updateDeedType"] }) + @ValidateNested({ groups: ["createDeedType", "updateDeedType"] }) @Type(() => DocumentType) public override document_types?: DocumentType[]; }; \ No newline at end of file diff --git a/src/Notary/DocumentType.ts b/src/Notary/DocumentType.ts index af48261..04ed5de 100644 --- a/src/Notary/DocumentType.ts +++ b/src/Notary/DocumentType.ts @@ -9,7 +9,7 @@ import DeedType from "./DeedType"; export default class DocumentType extends DocumentTypeCustomer { @Expose() - @IsNotEmpty({ groups: ["createDocument" , "createDeedType", "updateFolder", "updateDeed"] ,message: "UID is required" }) + @IsNotEmpty({ groups: ["createDocument" , "createDeedType", "updateFolder", "updateDeed", "updateDeedType"] ,message: "UID is required" }) public override uid?: string; @Expose() diff --git a/src/SuperAdmin/Appointment.ts b/src/SuperAdmin/Appointment.ts new file mode 100644 index 0000000..8df97ba --- /dev/null +++ b/src/SuperAdmin/Appointment.ts @@ -0,0 +1,25 @@ +import Resource from "../Resource"; +import { Expose, Type } from "class-transformer"; +import User from "./User"; +import Vote from "./Vote"; + +export default class Appointment extends Resource { + @Expose() + public uid?: string; + + @Expose() + @Type(() => User) + public user!: User; + + @Expose() + public status!: EAppointmentStatus | string; + + @Expose() + @Type(() => Vote) + public votes?: Vote[]; +} + +export enum EAppointmentStatus { + OPEN = "OPEN", + CLOSED = "CLOSED" +} diff --git a/src/SuperAdmin/User.ts b/src/SuperAdmin/User.ts index 8b66422..79b8416 100644 --- a/src/SuperAdmin/User.ts +++ b/src/SuperAdmin/User.ts @@ -1,4 +1,10 @@ export * from "../Admin/User"; -import User from "../Admin/User"; +import { Expose, Type } from "class-transformer"; +import UserAdmin from "../Admin/User"; +import Vote from "./Vote"; -export default User; \ No newline at end of file +export default class User extends UserAdmin { + @Expose() + @Type(() => Vote) + public vote?: Vote; +}; \ No newline at end of file diff --git a/src/SuperAdmin/Vote.ts b/src/SuperAdmin/Vote.ts new file mode 100644 index 0000000..fb69fb0 --- /dev/null +++ b/src/SuperAdmin/Vote.ts @@ -0,0 +1,25 @@ +import Resource from "../Resource"; +import { Expose, Type } from "class-transformer"; +import User from "./User"; +import Appointment from "./Appointment"; + +export default class Vote extends Resource { + @Expose() + public uid?: string; + + @Expose() + @Type(() => Appointment) + public appointment!: Appointment; + + @Expose() + @Type(() => User) + public voter!: User; + + @Expose() + public choice!: EVote | string; +} + +export enum EVote { + NOMINATE = "NOMINATE", + DISMISS = "DISMISS" +} diff --git a/src/SuperAdmin/index.ts b/src/SuperAdmin/index.ts index 1aec29d..1be5bd3 100644 --- a/src/SuperAdmin/index.ts +++ b/src/SuperAdmin/index.ts @@ -15,4 +15,6 @@ export {default as Office} from "./Office"; export {default as OfficeFolder} from "./OfficeFolder"; export {default as Rule} from "./Rule"; export {default as Role} from "./Role"; -export {default as OfficeRole} from "./OfficeRole"; \ No newline at end of file +export {default as OfficeRole} from "./OfficeRole"; +export {default as Appointment} from "./Appointment"; +export {default as Vote} from "./Vote"; \ No newline at end of file