refacto role and rules

dist/Admin/OfficeRole.d.ts

@@ -0,0 +1,3 @@
+export * from "../Notary/Role";
+import OfficeRole from "../Notary/OfficeRole";
+export default OfficeRole;

dist/Admin/OfficeRole.js

@@ -0,0 +1,22 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("../Notary/Role"), exports);
+const OfficeRole_1 = __importDefault(require("../Notary/OfficeRole"));
+exports.default = OfficeRole_1.default;

dist/Admin/index.d.ts

@@ -19,5 +19,6 @@ export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakehol
 export { default as UserHasNotification } from "./UserHasNotification";
 export { default as Rule } from "./Rule";
 export { default as Role } from "./Role";
+export { default as OfficeRole } from "./OfficeRole";
 export { default as RoleHasRules } from "./RoleHasRules";
 export { default as OfficeRoleHasRules } from "./OfficeRoleHasRules";

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.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;
+exports.OfficeRoleHasRules = exports.RoleHasRules = exports.OfficeRole = 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");
@@ -44,6 +44,8 @@ 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 OfficeRole_1 = require("./OfficeRole");
+Object.defineProperty(exports, "OfficeRole", { enumerable: true, get: function () { return __importDefault(OfficeRole_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");

dist/Notary/OfficeRole.d.ts

@@ -0,0 +1,18 @@
+import Resource from "../Resource";
+import User from "./User";
+import Office from "./Office";
+import Rule from "./Rule";
+export default class OfficeRole extends Resource {
+    uid?: string;
+    name: string;
+    created_at: Date | null;
+    updated_at: Date | null;
+    office: Office;
+    rules?: Rule[];
+    user?: User[];
+}
+export declare enum ECustomerStatus {
+    VALIDATED = "VALIDATED",
+    PENDING = "PENDING",
+    ERRONED = "ERRONED"
+}

dist/Notary/OfficeRole.js

@@ -0,0 +1,75 @@
+"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.ECustomerStatus = void 0;
+const class_validator_1 = require("class-validator");
+const Resource_1 = __importDefault(require("../Resource"));
+const class_transformer_1 = require("class-transformer");
+const User_1 = __importDefault(require("./User"));
+const Office_1 = __importDefault(require("./Office"));
+const Rule_1 = __importDefault(require("./Rule"));
+class OfficeRole extends Resource_1.default {
+    constructor() {
+        super(...arguments);
+        this.created_at = null;
+        this.updated_at = null;
+    }
+}
+__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([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsNotEmpty)({ message: "Name is required" }),
+    __metadata("design:type", String)
+], OfficeRole.prototype, "name", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsDate)(),
+    __metadata("design:type", Object)
+], OfficeRole.prototype, "created_at", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsDate)(),
+    __metadata("design:type", Object)
+], OfficeRole.prototype, "updated_at", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsNotEmpty)({ message: "Office is required" }),
+    (0, class_validator_1.ValidateNested)({ groups: ["createOfficeRole"] }),
+    (0, class_transformer_1.Type)(() => Office_1.default),
+    __metadata("design:type", Office_1.default)
+], OfficeRole.prototype, "office", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.IsNotEmpty)({ message: "Rules are required" }),
+    (0, class_validator_1.ValidateNested)({ groups: ["updateOfficeRole"] }),
+    (0, class_transformer_1.Type)(() => Rule_1.default),
+    __metadata("design:type", Array)
+], OfficeRole.prototype, "rules", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_validator_1.ValidateNested)(),
+    (0, class_transformer_1.Type)(() => User_1.default),
+    __metadata("design:type", Array)
+], OfficeRole.prototype, "user", void 0);
+exports.default = OfficeRole;
+var ECustomerStatus;
+(function (ECustomerStatus) {
+    ECustomerStatus["VALIDATED"] = "VALIDATED";
+    ECustomerStatus["PENDING"] = "PENDING";
+    ECustomerStatus["ERRONED"] = "ERRONED";
+})(ECustomerStatus = exports.ECustomerStatus || (exports.ECustomerStatus = {}));

dist/Notary/OfficeRoleHasRules.d.ts

@@ -1,12 +1,10 @@
 import Resource from "../Resource";
-import Role from "./Role";
 import Rule from "./Rule";
-import Office from "./Office";
+import OfficeRole from "./OfficeRole";
 export default class OfficeRoleHasRules extends Resource {
     uid?: string;
-    role: Role;
+    officeRole: OfficeRole;
     rules: Rule[];
-    office: Office;
     created_at: Date | null;
     updated_at: Date | null;
 }

dist/Notary/OfficeRoleHasRules.js

@@ -15,9 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const class_validator_1 = require("class-validator");
 const Resource_1 = __importDefault(require("../Resource"));
 const class_transformer_1 = require("class-transformer");
-const Role_1 = __importDefault(require("./Role"));
 const Rule_1 = __importDefault(require("./Rule"));
-const Office_1 = __importDefault(require("./Office"));
+const OfficeRole_1 = __importDefault(require("./OfficeRole"));
 class OfficeRoleHasRules extends Resource_1.default {
     constructor() {
         super(...arguments);
@@ -34,9 +33,9 @@ __decorate([
     (0, class_transformer_1.Expose)(),
     (0, class_validator_1.IsNotEmpty)({ message: "Role is required" }),
     (0, class_validator_1.ValidateNested)({ groups: ["updateRole"] }),
-    (0, class_transformer_1.Type)(() => Role_1.default),
+    (0, class_transformer_1.Type)(() => OfficeRole_1.default),
-    __metadata("design:type", Role_1.default)
+    __metadata("design:type", OfficeRole_1.default)
-], OfficeRoleHasRules.prototype, "role", void 0);
+], OfficeRoleHasRules.prototype, "officeRole", void 0);
 __decorate([
     (0, class_transformer_1.Expose)(),
     (0, class_validator_1.IsNotEmpty)({ message: "Rule is required" }),
@@ -44,13 +43,6 @@ __decorate([
     (0, class_transformer_1.Type)(() => Rule_1.default),
     __metadata("design:type", Array)
 ], OfficeRoleHasRules.prototype, "rules", void 0);
-__decorate([
-    (0, class_transformer_1.Expose)(),
-    (0, class_validator_1.IsNotEmpty)({ message: "Office is required" }),
-    (0, class_validator_1.ValidateNested)({ groups: ["createRule"] }),
-    (0, class_transformer_1.Type)(() => Office_1.default),
-    __metadata("design:type", Office_1.default)
-], OfficeRoleHasRules.prototype, "office", void 0);
 __decorate([
     (0, class_transformer_1.Expose)(),
     (0, class_validator_1.IsDate)(),

dist/Notary/Role.d.ts

@@ -1,16 +1,12 @@
-import OfficeFolderHasCustomer from "./OfficeFolderHasCustomer";
 import Resource from "../Resource";
-import RoleHasRules from "./RoleHasRules";
 import User from "./User";
-import OfficeRoleHasRules from "./OfficeRoleHasRules";
+import Rule from "./Rule";
 export default class Role extends Resource {
     uid?: string;
     name: string;
     created_at: Date | null;
     updated_at: Date | null;
-    office_folder_has_customers?: OfficeFolderHasCustomer[];
+    rules?: Rule[];
-    role_has_rules?: RoleHasRules;
-    office_role_has_rules?: OfficeRoleHasRules;
     user?: User[];
 }
 export declare enum ECustomerStatus {

dist/Notary/Role.js

@@ -14,12 +14,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ECustomerStatus = void 0;
 const class_validator_1 = require("class-validator");
-const OfficeFolderHasCustomer_1 = __importDefault(require("./OfficeFolderHasCustomer"));
 const Resource_1 = __importDefault(require("../Resource"));
 const class_transformer_1 = require("class-transformer");
-const RoleHasRules_1 = __importDefault(require("./RoleHasRules"));
 const User_1 = __importDefault(require("./User"));
-const OfficeRoleHasRules_1 = __importDefault(require("./OfficeRoleHasRules"));
+const Rule_1 = __importDefault(require("./Rule"));
 class Role extends Resource_1.default {
     constructor() {
         super(...arguments);
@@ -49,23 +47,11 @@ __decorate([
 ], Role.prototype, "updated_at", void 0);
 __decorate([
     (0, class_transformer_1.Expose)(),
-    (0, class_transformer_1.Type)(() => OfficeFolderHasCustomer_1.default),
+    (0, class_validator_1.IsNotEmpty)({ message: "Rules are required" }),
+    (0, class_validator_1.ValidateNested)({ groups: ["updateRole"] }),
+    (0, class_transformer_1.Type)(() => Rule_1.default),
     __metadata("design:type", Array)
-], Role.prototype, "office_folder_has_customers", void 0);
+], Role.prototype, "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)(() => RoleHasRules_1.default),
-    __metadata("design:type", RoleHasRules_1.default)
-], 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, "office_role_has_rules", void 0);
 __decorate([
     (0, class_transformer_1.Expose)(),
     (0, class_validator_1.ValidateNested)(),

dist/Notary/User.d.ts

@@ -4,6 +4,7 @@ import Office from "./Office";
 import OfficeFolderHasStakeholder from "./OfficeFolderHasStakeholder";
 import Resource from "../Resource";
 import Role from "./Role";
+import OfficeRole from "./OfficeRole";
 export default class User extends Resource {
     uid?: string;
     idNot: string;
@@ -14,4 +15,5 @@ export default class User extends Resource {
     office_folder_has_stakeholders?: OfficeFolderHasStakeholder[];
     documents?: Document[];
     role?: Role;
+    office_role?: OfficeRole;
 }

dist/Notary/User.js

@@ -20,6 +20,7 @@ const OfficeFolderHasStakeholder_1 = __importDefault(require("./OfficeFolderHasS
 const Resource_1 = __importDefault(require("../Resource"));
 const class_transformer_1 = require("class-transformer");
 const Role_1 = __importDefault(require("./Role"));
+const OfficeRole_1 = __importDefault(require("./OfficeRole"));
 class User extends Resource_1.default {
     constructor() {
         super(...arguments);
@@ -74,4 +75,9 @@ __decorate([
     (0, class_transformer_1.Type)(() => Role_1.default),
     __metadata("design:type", Role_1.default)
 ], User.prototype, "role", void 0);
+__decorate([
+    (0, class_transformer_1.Expose)(),
+    (0, class_transformer_1.Type)(() => OfficeRole_1.default),
+    __metadata("design:type", OfficeRole_1.default)
+], User.prototype, "office_role", void 0);
 exports.default = User;

dist/Notary/index.d.ts

@@ -19,5 +19,6 @@ export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakehol
 export { default as UserHasNotification } from "./UserHasNotification";
 export { default as Rule } from "./Rule";
 export { default as Role } from "./Role";
+export { default as OfficeRole } from "./OfficeRole";
 export { default as RoleHasRules } from "./RoleHasRules";
 export { default as OfficeRoleHasRules } from "./OfficeRoleHasRules";

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.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;
+exports.OfficeRoleHasRules = exports.RoleHasRules = exports.OfficeRole = 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");
@@ -44,6 +44,8 @@ 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 OfficeRole_1 = require("./OfficeRole");
+Object.defineProperty(exports, "OfficeRole", { enumerable: true, get: function () { return __importDefault(OfficeRole_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");

dist/SuperAdmin/OfficeRole.d.ts

@@ -0,0 +1,3 @@
+export * from "../Admin/Role";
+import OfficeRole from "../Admin/OfficeRole";
+export default OfficeRole;

dist/SuperAdmin/OfficeRole.js

@@ -0,0 +1,22 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+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 __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("../Admin/Role"), exports);
+const OfficeRole_1 = __importDefault(require("../Admin/OfficeRole"));
+exports.default = OfficeRole_1.default;

dist/SuperAdmin/index.d.ts

@@ -19,5 +19,6 @@ export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakehol
 export { default as UserHasNotification } from "./UserHasNotification";
 export { default as Rule } from "./Rule";
 export { default as Role } from "./Role";
+export { default as OfficeRole } from "./OfficeRole";
 export { default as RoleHasRules } from "./RoleHasRules";
 export { default as OfficeRoleHasRules } from "./OfficeRoleHasRules";

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.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;
+exports.OfficeRoleHasRules = exports.RoleHasRules = exports.OfficeRole = 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");
@@ -44,6 +44,8 @@ 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 OfficeRole_1 = require("./OfficeRole");
+Object.defineProperty(exports, "OfficeRole", { enumerable: true, get: function () { return __importDefault(OfficeRole_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");

src/Admin/OfficeRole.ts

@@ -0,0 +1,5 @@
+export * from "../Notary/Role";
+import OfficeRole from "../Notary/OfficeRole";
+
+export default OfficeRole;
+

src/Admin/index.ts

@@ -20,5 +20,6 @@ export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholde
 export {default as UserHasNotification} from "./UserHasNotification";
 export {default as Rule} from "./Rule";
 export {default as Role} from "./Role";
+export {default as OfficeRole} from "./OfficeRole";
 export {default as RoleHasRules} from "./RoleHasRules";
 export {default as OfficeRoleHasRules} from "./OfficeRoleHasRules";

src/Notary/OfficeRole.ts

@@ -0,0 +1,51 @@
+import {
+  IsDate,
+  IsNotEmpty,
+  ValidateNested,
+} from "class-validator";
+import Resource from "../Resource";
+import { Expose, Type } from "class-transformer";
+import User from "./User";
+import Office from "./Office";
+import Rule from "./Rule";
+
+export default class OfficeRole extends Resource {
+  @Expose()
+  @IsNotEmpty({ groups: ["updateOfficeRole"] ,message: "UID is required" })
+  public uid?: string;
+
+  @Expose()
+  @IsNotEmpty({message: "Name is required"})
+  public name!: string;
+
+  @Expose()
+  @IsDate()
+  public created_at: Date | null = null;
+
+  @Expose()
+  @IsDate()
+  public updated_at: Date | null = null;
+
+  @Expose()
+  @IsNotEmpty({message: "Office is required"})
+  @ValidateNested({ groups: ["createOfficeRole"] })
+  @Type(() => Office)
+  public office!: Office;
+
+  @Expose()
+  @IsNotEmpty({message: "Rules are required"})
+  @ValidateNested({ groups: ["updateOfficeRole"] })
+  @Type(() => Rule)
+  public rules?: Rule[];
+
+  @Expose()
+  @ValidateNested()
+  @Type(() => User)
+  user?: User[];
+}
+
+export enum ECustomerStatus {
+  VALIDATED = "VALIDATED",
+  PENDING = "PENDING",
+  ERRONED = "ERRONED",
+}

src/Notary/OfficeRoleHasRules.ts

@@ -5,9 +5,8 @@ import {
 } from "class-validator";
 import Resource from "../Resource";
 import { Expose, Type } from "class-transformer";
-import Role from "./Role";
 import Rule from "./Rule";
-import Office from "./Office";
+import OfficeRole from "./OfficeRole";
 
 export default class OfficeRoleHasRules extends Resource {
   @Expose()
@@ -17,8 +16,8 @@ export default class OfficeRoleHasRules extends Resource {
   @Expose()
   @IsNotEmpty({message: "Role is required"})
   @ValidateNested({ groups: ["updateRole"] })
-  @Type(() => Role)
+  @Type(() => OfficeRole)
-  public role!: Role;
+  public officeRole!: OfficeRole;
 
   @Expose()
   @IsNotEmpty({message: "Rule is required"})
@@ -26,12 +25,6 @@ export default class OfficeRoleHasRules extends Resource {
   @Type(() => Rule)
   public rules!: Rule[];
 
-  @Expose()
-  @IsNotEmpty({message: "Office is required"})
-  @ValidateNested({ groups: ["createRule"] })
-  @Type(() => Office)
-  public office!: Office;
-
   @Expose()
   @IsDate()
   public created_at: Date | null = null;

src/Notary/Role.ts

@@ -3,12 +3,11 @@ import {
   IsNotEmpty,
   ValidateNested,
 } from "class-validator";
-import OfficeFolderHasCustomer from "./OfficeFolderHasCustomer";
 import Resource from "../Resource";
 import { Expose, Type } from "class-transformer";
-import RoleHasRules from "./RoleHasRules";
 import User from "./User";
-import OfficeRoleHasRules from "./OfficeRoleHasRules";
+import Rule from "./Rule";
+
 
 export default class Role extends Resource {
   @Expose()
@@ -27,21 +26,11 @@ export default class Role extends Resource {
   @IsDate()
   public updated_at: Date | null = null;
 
-  @Expose()
-  @Type(() => OfficeFolderHasCustomer)
-  office_folder_has_customers?: OfficeFolderHasCustomer[];
-
   @Expose()
   @IsNotEmpty({message: "Rules are required"})
   @ValidateNested({ groups: ["updateRole"] })
-  @Type(() => RoleHasRules)
+  @Type(() => Rule)
-  public role_has_rules?: RoleHasRules;
+  public rules?: Rule[];
-
-  @Expose()
-  @IsNotEmpty({message: "Rules are required"})
-  @ValidateNested({ groups: ["updateRole"] })
-  @Type(() => OfficeRoleHasRules)
-  public office_role_has_rules?: OfficeRoleHasRules;
 
   @Expose()
   @ValidateNested()

src/Notary/User.ts

@@ -9,6 +9,7 @@ import OfficeFolderHasStakeholder from "./OfficeFolderHasStakeholder";
 import Resource from "../Resource";
 import { Expose, Type } from "class-transformer";
 import Role from "./Role";
+import OfficeRole from "./OfficeRole";
 
 export default class User extends Resource {
   @Expose()
@@ -48,4 +49,8 @@ export default class User extends Resource {
   @IsNotEmpty({ groups: ["createUser", "auth"] ,message: "Role is required" })
   @Type(() => Role)
   public role?: Role;
+
+  @Expose()
+  @Type(() => OfficeRole)
+  public office_role?: OfficeRole;
 }

src/Notary/index.ts

@@ -20,5 +20,6 @@ export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholde
 export {default as UserHasNotification} from "./UserHasNotification";
 export {default as Rule} from "./Rule";
 export {default as Role} from "./Role";
+export {default as OfficeRole} from "./OfficeRole";
 export {default as RoleHasRules} from "./RoleHasRules";
 export {default as OfficeRoleHasRules} from "./OfficeRoleHasRules";

src/SuperAdmin/OfficeRole.ts

@@ -0,0 +1,5 @@
+export * from "../Admin/Role";
+import OfficeRole from "../Admin/OfficeRole";
+
+export default OfficeRole;
+

src/SuperAdmin/index.ts

@@ -20,5 +20,6 @@ export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholde
 export {default as UserHasNotification} from "./UserHasNotification";
 export {default as Rule} from "./Rule";
 export {default as Role} from "./Role";
+export {default as OfficeRole} from "./OfficeRole";
 export {default as RoleHasRules} from "./RoleHasRules";
 export {default as OfficeRoleHasRules} from "./OfficeRoleHasRules";