From b5f3af9fb580e194a866f41846fc721a766b6e2d Mon Sep 17 00:00:00 2001 From: OxSaitama Date: Mon, 26 Jun 2023 11:52:32 +0200 Subject: [PATCH] refacto role and rules --- dist/Admin/index.d.ts | 4 ++++ dist/Admin/index.js | 10 +++++++++- dist/Notary/OfficeRoleHasRules.d.ts | 2 +- dist/Notary/OfficeRoleHasRules.js | 4 ++-- dist/Notary/Role.d.ts | 4 ++-- dist/Notary/Role.js | 4 ++-- dist/Notary/RoleHasRules.d.ts | 2 +- dist/Notary/RoleHasRules.js | 4 ++-- dist/Notary/Rule.d.ts | 4 ++-- dist/Notary/Rule.js | 4 ++-- dist/Notary/User.js | 3 ++- dist/Notary/index.d.ts | 4 ++++ dist/Notary/index.js | 10 +++++++++- dist/SuperAdmin/index.d.ts | 4 ++++ dist/SuperAdmin/index.js | 10 +++++++++- src/Admin/index.ts | 6 +++++- src/Notary/OfficeRoleHasRules.ts | 2 +- src/Notary/Role.ts | 4 ++-- src/Notary/RoleHasRules.ts | 2 +- src/Notary/Rule.ts | 4 ++-- src/Notary/User.ts | 3 ++- src/Notary/index.ts | 6 +++++- src/SuperAdmin/index.ts | 6 +++++- 23 files changed, 78 insertions(+), 28 deletions(-) diff --git a/dist/Admin/index.d.ts b/dist/Admin/index.d.ts index 4c44553..ab14054 100644 --- a/dist/Admin/index.d.ts +++ b/dist/Admin/index.d.ts @@ -17,3 +17,7 @@ export { default as OfficeFolder } from "./OfficeFolder"; export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer"; export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder"; export { default as UserHasNotification } from "./UserHasNotification"; +export { default as Rule } from "./Rule"; +export { default as Role } from "./Role"; +export { default as RoleHasRules } from "./RoleHasRules"; +export { default as OfficeRoleHasRules } from "./OfficeRoleHasRules"; diff --git a/dist/Admin/index.js b/dist/Admin/index.js index 983f290..e223836 100644 --- a/dist/Admin/index.js +++ b/dist/Admin/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.UserHasNotification = exports.OfficeFolderHasStakeholder = exports.OfficeFolderHasCustomer = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedTypeHasDocumentType = exports.DeedType = exports.DeedHasDocumentType = exports.Deed = exports.Contact = exports.Customer = exports.Address = void 0; +exports.OfficeRoleHasRules = exports.RoleHasRules = exports.Role = exports.Rule = exports.UserHasNotification = exports.OfficeFolderHasStakeholder = exports.OfficeFolderHasCustomer = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedTypeHasDocumentType = exports.DeedType = exports.DeedHasDocumentType = 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("../SuperAdmin/Address"); @@ -40,3 +40,11 @@ var OfficeFolderHasStakeholder_1 = require("./OfficeFolderHasStakeholder"); Object.defineProperty(exports, "OfficeFolderHasStakeholder", { enumerable: true, get: function () { return __importDefault(OfficeFolderHasStakeholder_1).default; } }); var UserHasNotification_1 = require("./UserHasNotification"); Object.defineProperty(exports, "UserHasNotification", { enumerable: true, get: function () { return __importDefault(UserHasNotification_1).default; } }); +var Rule_1 = require("./Rule"); +Object.defineProperty(exports, "Rule", { enumerable: true, get: function () { return __importDefault(Rule_1).default; } }); +var Role_1 = require("./Role"); +Object.defineProperty(exports, "Role", { enumerable: true, get: function () { return __importDefault(Role_1).default; } }); +var RoleHasRules_1 = require("./RoleHasRules"); +Object.defineProperty(exports, "RoleHasRules", { enumerable: true, get: function () { return __importDefault(RoleHasRules_1).default; } }); +var OfficeRoleHasRules_1 = require("./OfficeRoleHasRules"); +Object.defineProperty(exports, "OfficeRoleHasRules", { enumerable: true, get: function () { return __importDefault(OfficeRoleHasRules_1).default; } }); diff --git a/dist/Notary/OfficeRoleHasRules.d.ts b/dist/Notary/OfficeRoleHasRules.d.ts index 93a31a2..ac1d716 100644 --- a/dist/Notary/OfficeRoleHasRules.d.ts +++ b/dist/Notary/OfficeRoleHasRules.d.ts @@ -5,7 +5,7 @@ import Office from "./Office"; export default class OfficeRoleHasRules extends Resource { uid?: string; role: Role; - rule: Rule; + rules: Rule[]; office: Office; created_at: Date | null; updated_at: Date | null; diff --git a/dist/Notary/OfficeRoleHasRules.js b/dist/Notary/OfficeRoleHasRules.js index b738d6b..8af1c7f 100644 --- a/dist/Notary/OfficeRoleHasRules.js +++ b/dist/Notary/OfficeRoleHasRules.js @@ -42,8 +42,8 @@ __decorate([ (0, class_validator_1.IsNotEmpty)({ message: "Rule is required" }), (0, class_validator_1.ValidateNested)({ groups: ["createRule", "updateRule"] }), (0, class_transformer_1.Type)(() => Rule_1.default), - __metadata("design:type", Rule_1.default) -], OfficeRoleHasRules.prototype, "rule", void 0); + __metadata("design:type", Array) +], OfficeRoleHasRules.prototype, "rules", void 0); __decorate([ (0, class_transformer_1.Expose)(), (0, class_validator_1.IsNotEmpty)({ message: "Office is required" }), diff --git a/dist/Notary/Role.d.ts b/dist/Notary/Role.d.ts index 4785cab..948e026 100644 --- a/dist/Notary/Role.d.ts +++ b/dist/Notary/Role.d.ts @@ -9,8 +9,8 @@ export default class Role extends Resource { created_at: Date | null; updated_at: Date | null; office_folder_has_customers?: OfficeFolderHasCustomer[]; - roleHasRules?: RoleHasRules; - officeRoleHasRules?: OfficeRoleHasRules; + role_has_rules?: RoleHasRules; + office_role_has_rules?: OfficeRoleHasRules; user?: User[]; } export declare enum ECustomerStatus { diff --git a/dist/Notary/Role.js b/dist/Notary/Role.js index 53e4a08..a4fd6d6 100644 --- a/dist/Notary/Role.js +++ b/dist/Notary/Role.js @@ -58,14 +58,14 @@ __decorate([ (0, class_validator_1.ValidateNested)({ groups: ["updateRole"] }), (0, class_transformer_1.Type)(() => RoleHasRules_1.default), __metadata("design:type", RoleHasRules_1.default) -], Role.prototype, "roleHasRules", void 0); +], Role.prototype, "role_has_rules", void 0); __decorate([ (0, class_transformer_1.Expose)(), (0, class_validator_1.IsNotEmpty)({ message: "Rules are required" }), (0, class_validator_1.ValidateNested)({ groups: ["updateRole"] }), (0, class_transformer_1.Type)(() => OfficeRoleHasRules_1.default), __metadata("design:type", OfficeRoleHasRules_1.default) -], Role.prototype, "officeRoleHasRules", void 0); +], Role.prototype, "office_role_has_rules", void 0); __decorate([ (0, class_transformer_1.Expose)(), (0, class_validator_1.ValidateNested)(), diff --git a/dist/Notary/RoleHasRules.d.ts b/dist/Notary/RoleHasRules.d.ts index c67a4ed..6a08df8 100644 --- a/dist/Notary/RoleHasRules.d.ts +++ b/dist/Notary/RoleHasRules.d.ts @@ -4,7 +4,7 @@ import Rule from "./Rule"; export default class RoleHasRules extends Resource { uid?: string; role: Role; - rule: Rule; + rules: Rule[]; created_at: Date | null; updated_at: Date | null; } diff --git a/dist/Notary/RoleHasRules.js b/dist/Notary/RoleHasRules.js index 79dbe31..8a416ef 100644 --- a/dist/Notary/RoleHasRules.js +++ b/dist/Notary/RoleHasRules.js @@ -41,8 +41,8 @@ __decorate([ (0, class_validator_1.IsNotEmpty)({ message: "Rule is required" }), (0, class_validator_1.ValidateNested)({ groups: ["updateRule"] }), (0, class_transformer_1.Type)(() => Rule_1.default), - __metadata("design:type", Rule_1.default) -], RoleHasRules.prototype, "rule", void 0); + __metadata("design:type", Array) +], RoleHasRules.prototype, "rules", void 0); __decorate([ (0, class_transformer_1.Expose)(), (0, class_validator_1.IsDate)(), diff --git a/dist/Notary/Rule.d.ts b/dist/Notary/Rule.d.ts index 43d8bf7..fd46487 100644 --- a/dist/Notary/Rule.d.ts +++ b/dist/Notary/Rule.d.ts @@ -6,6 +6,6 @@ export default class Rule extends Resource { name: string; created_at: Date | null; updated_at: Date | null; - officeRoleHasRules?: OfficeRoleHasRules[]; - roleHasRules?: RoleHasRules[]; + office_role_has_rules?: OfficeRoleHasRules[]; + role_has_rules?: RoleHasRules[]; } diff --git a/dist/Notary/Rule.js b/dist/Notary/Rule.js index f3fe12b..ecc34ee 100644 --- a/dist/Notary/Rule.js +++ b/dist/Notary/Rule.js @@ -48,10 +48,10 @@ __decorate([ (0, class_transformer_1.Expose)(), (0, class_transformer_1.Type)(() => OfficeRoleHasRules_1.default), __metadata("design:type", Array) -], Rule.prototype, "officeRoleHasRules", void 0); +], Rule.prototype, "office_role_has_rules", void 0); __decorate([ (0, class_transformer_1.Expose)(), (0, class_transformer_1.Type)(() => RoleHasRules_1.default), __metadata("design:type", Array) -], Rule.prototype, "roleHasRules", void 0); +], Rule.prototype, "role_has_rules", void 0); exports.default = Rule; diff --git a/dist/Notary/User.js b/dist/Notary/User.js index 99e2b52..88e9433 100644 --- a/dist/Notary/User.js +++ b/dist/Notary/User.js @@ -70,7 +70,8 @@ __decorate([ ], User.prototype, "documents", void 0); __decorate([ (0, class_transformer_1.Expose)(), - (0, class_validator_1.IsNotEmpty)({ groups: ["createUser"], message: "Role is required" }), + (0, class_validator_1.IsNotEmpty)({ groups: ["createUser", "auth"], message: "Role is required" }), + (0, class_transformer_1.Type)(() => Role_1.default), __metadata("design:type", Role_1.default) ], User.prototype, "role", void 0); exports.default = User; diff --git a/dist/Notary/index.d.ts b/dist/Notary/index.d.ts index 4c44553..ab14054 100644 --- a/dist/Notary/index.d.ts +++ b/dist/Notary/index.d.ts @@ -17,3 +17,7 @@ export { default as OfficeFolder } from "./OfficeFolder"; export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer"; export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder"; export { default as UserHasNotification } from "./UserHasNotification"; +export { default as Rule } from "./Rule"; +export { default as Role } from "./Role"; +export { default as RoleHasRules } from "./RoleHasRules"; +export { default as OfficeRoleHasRules } from "./OfficeRoleHasRules"; diff --git a/dist/Notary/index.js b/dist/Notary/index.js index 983f290..e223836 100644 --- a/dist/Notary/index.js +++ b/dist/Notary/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.UserHasNotification = exports.OfficeFolderHasStakeholder = exports.OfficeFolderHasCustomer = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedTypeHasDocumentType = exports.DeedType = exports.DeedHasDocumentType = exports.Deed = exports.Contact = exports.Customer = exports.Address = void 0; +exports.OfficeRoleHasRules = exports.RoleHasRules = exports.Role = exports.Rule = exports.UserHasNotification = exports.OfficeFolderHasStakeholder = exports.OfficeFolderHasCustomer = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedTypeHasDocumentType = exports.DeedType = exports.DeedHasDocumentType = 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("../SuperAdmin/Address"); @@ -40,3 +40,11 @@ var OfficeFolderHasStakeholder_1 = require("./OfficeFolderHasStakeholder"); Object.defineProperty(exports, "OfficeFolderHasStakeholder", { enumerable: true, get: function () { return __importDefault(OfficeFolderHasStakeholder_1).default; } }); var UserHasNotification_1 = require("./UserHasNotification"); Object.defineProperty(exports, "UserHasNotification", { enumerable: true, get: function () { return __importDefault(UserHasNotification_1).default; } }); +var Rule_1 = require("./Rule"); +Object.defineProperty(exports, "Rule", { enumerable: true, get: function () { return __importDefault(Rule_1).default; } }); +var Role_1 = require("./Role"); +Object.defineProperty(exports, "Role", { enumerable: true, get: function () { return __importDefault(Role_1).default; } }); +var RoleHasRules_1 = require("./RoleHasRules"); +Object.defineProperty(exports, "RoleHasRules", { enumerable: true, get: function () { return __importDefault(RoleHasRules_1).default; } }); +var OfficeRoleHasRules_1 = require("./OfficeRoleHasRules"); +Object.defineProperty(exports, "OfficeRoleHasRules", { enumerable: true, get: function () { return __importDefault(OfficeRoleHasRules_1).default; } }); diff --git a/dist/SuperAdmin/index.d.ts b/dist/SuperAdmin/index.d.ts index eab76cf..9d20f16 100644 --- a/dist/SuperAdmin/index.d.ts +++ b/dist/SuperAdmin/index.d.ts @@ -17,3 +17,7 @@ export { default as OfficeFolder } from "./OfficeFolder"; export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer"; export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder"; export { default as UserHasNotification } from "./UserHasNotification"; +export { default as Rule } from "./Rule"; +export { default as Role } from "./Role"; +export { default as RoleHasRules } from "./RoleHasRules"; +export { default as OfficeRoleHasRules } from "./OfficeRoleHasRules"; diff --git a/dist/SuperAdmin/index.js b/dist/SuperAdmin/index.js index 2b06943..e33c62b 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.UserHasNotification = exports.OfficeFolderHasStakeholder = exports.OfficeFolderHasCustomer = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedTypeHasDocumentType = exports.DeedType = exports.DeedHasDocumentType = exports.Deed = exports.Contact = exports.Customer = exports.Address = void 0; +exports.OfficeRoleHasRules = exports.RoleHasRules = exports.Role = exports.Rule = exports.UserHasNotification = exports.OfficeFolderHasStakeholder = exports.OfficeFolderHasCustomer = exports.OfficeFolder = exports.Office = exports.Notification = exports.File = exports.DocumentType = exports.DocumentHistory = exports.Document = exports.DeedTypeHasDocumentType = exports.DeedType = exports.DeedHasDocumentType = 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"); @@ -40,3 +40,11 @@ var OfficeFolderHasStakeholder_1 = require("./OfficeFolderHasStakeholder"); Object.defineProperty(exports, "OfficeFolderHasStakeholder", { enumerable: true, get: function () { return __importDefault(OfficeFolderHasStakeholder_1).default; } }); var UserHasNotification_1 = require("./UserHasNotification"); Object.defineProperty(exports, "UserHasNotification", { enumerable: true, get: function () { return __importDefault(UserHasNotification_1).default; } }); +var Rule_1 = require("./Rule"); +Object.defineProperty(exports, "Rule", { enumerable: true, get: function () { return __importDefault(Rule_1).default; } }); +var Role_1 = require("./Role"); +Object.defineProperty(exports, "Role", { enumerable: true, get: function () { return __importDefault(Role_1).default; } }); +var RoleHasRules_1 = require("./RoleHasRules"); +Object.defineProperty(exports, "RoleHasRules", { enumerable: true, get: function () { return __importDefault(RoleHasRules_1).default; } }); +var OfficeRoleHasRules_1 = require("./OfficeRoleHasRules"); +Object.defineProperty(exports, "OfficeRoleHasRules", { enumerable: true, get: function () { return __importDefault(OfficeRoleHasRules_1).default; } }); diff --git a/src/Admin/index.ts b/src/Admin/index.ts index 85871fe..8b898cd 100644 --- a/src/Admin/index.ts +++ b/src/Admin/index.ts @@ -17,4 +17,8 @@ export {default as Office} from "./Office"; export {default as OfficeFolder} from "./OfficeFolder"; export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer"; export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder"; -export {default as UserHasNotification} from "./UserHasNotification"; \ No newline at end of file +export {default as UserHasNotification} from "./UserHasNotification"; +export {default as Rule} from "./Rule"; +export {default as Role} from "./Role"; +export {default as RoleHasRules} from "./RoleHasRules"; +export {default as OfficeRoleHasRules} from "./OfficeRoleHasRules"; \ No newline at end of file diff --git a/src/Notary/OfficeRoleHasRules.ts b/src/Notary/OfficeRoleHasRules.ts index 72e6598..281fb26 100644 --- a/src/Notary/OfficeRoleHasRules.ts +++ b/src/Notary/OfficeRoleHasRules.ts @@ -24,7 +24,7 @@ export default class OfficeRoleHasRules extends Resource { @IsNotEmpty({message: "Rule is required"}) @ValidateNested({ groups: ["createRule","updateRule"] }) @Type(() => Rule) - public rule!: Rule; + public rules!: Rule[]; @Expose() @IsNotEmpty({message: "Office is required"}) diff --git a/src/Notary/Role.ts b/src/Notary/Role.ts index 7c57838..d8e307e 100644 --- a/src/Notary/Role.ts +++ b/src/Notary/Role.ts @@ -35,13 +35,13 @@ export default class Role extends Resource { @IsNotEmpty({message: "Rules are required"}) @ValidateNested({ groups: ["updateRole"] }) @Type(() => RoleHasRules) - public roleHasRules?: RoleHasRules; + public role_has_rules?: RoleHasRules; @Expose() @IsNotEmpty({message: "Rules are required"}) @ValidateNested({ groups: ["updateRole"] }) @Type(() => OfficeRoleHasRules) - public officeRoleHasRules?: OfficeRoleHasRules; + public office_role_has_rules?: OfficeRoleHasRules; @Expose() @ValidateNested() diff --git a/src/Notary/RoleHasRules.ts b/src/Notary/RoleHasRules.ts index b3b87af..8354e4e 100644 --- a/src/Notary/RoleHasRules.ts +++ b/src/Notary/RoleHasRules.ts @@ -23,7 +23,7 @@ export default class RoleHasRules extends Resource { @IsNotEmpty({message: "Rule is required"}) @ValidateNested({ groups: ["updateRule"] }) @Type(() => Rule) - public rule!: Rule; + public rules!: Rule[]; @Expose() @IsDate() diff --git a/src/Notary/Rule.ts b/src/Notary/Rule.ts index c623999..ba71294 100644 --- a/src/Notary/Rule.ts +++ b/src/Notary/Rule.ts @@ -26,9 +26,9 @@ export default class Rule extends Resource { @Expose() @Type(() => OfficeRoleHasRules) - officeRoleHasRules?: OfficeRoleHasRules[]; + office_role_has_rules?: OfficeRoleHasRules[]; @Expose() @Type(() => RoleHasRules) - roleHasRules?: RoleHasRules[]; + role_has_rules?: RoleHasRules[]; } \ No newline at end of file diff --git a/src/Notary/User.ts b/src/Notary/User.ts index 8cd2043..156524b 100644 --- a/src/Notary/User.ts +++ b/src/Notary/User.ts @@ -45,6 +45,7 @@ export default class User extends Resource { documents?: Document[]; @Expose() - @IsNotEmpty({ groups: ["createUser"] ,message: "Role is required" }) + @IsNotEmpty({ groups: ["createUser", "auth"] ,message: "Role is required" }) + @Type(() => Role) public role?: Role; } diff --git a/src/Notary/index.ts b/src/Notary/index.ts index 85871fe..8b898cd 100644 --- a/src/Notary/index.ts +++ b/src/Notary/index.ts @@ -17,4 +17,8 @@ export {default as Office} from "./Office"; export {default as OfficeFolder} from "./OfficeFolder"; export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer"; export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder"; -export {default as UserHasNotification} from "./UserHasNotification"; \ No newline at end of file +export {default as UserHasNotification} from "./UserHasNotification"; +export {default as Rule} from "./Rule"; +export {default as Role} from "./Role"; +export {default as RoleHasRules} from "./RoleHasRules"; +export {default as OfficeRoleHasRules} from "./OfficeRoleHasRules"; \ No newline at end of file diff --git a/src/SuperAdmin/index.ts b/src/SuperAdmin/index.ts index 7852499..3789992 100644 --- a/src/SuperAdmin/index.ts +++ b/src/SuperAdmin/index.ts @@ -17,4 +17,8 @@ export {default as Office} from "./Office"; export {default as OfficeFolder} from "./OfficeFolder"; export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer"; export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder"; -export {default as UserHasNotification} from "./UserHasNotification"; \ No newline at end of file +export {default as UserHasNotification} from "./UserHasNotification"; +export {default as Rule} from "./Rule"; +export {default as Role} from "./Role"; +export {default as RoleHasRules} from "./RoleHasRules"; +export {default as OfficeRoleHasRules} from "./OfficeRoleHasRules"; \ No newline at end of file