refacto role and rules

This commit is contained in:
OxSaitama 2023-06-26 11:52:32 +02:00
parent 77c1c43492
commit b5f3af9fb5
23 changed files with 78 additions and 28 deletions

View File

@ -17,3 +17,7 @@ export { default as OfficeFolder } from "./OfficeFolder";
export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer"; export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer";
export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder"; export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder";
export { default as UserHasNotification } from "./UserHasNotification"; 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";

10
dist/Admin/index.js vendored
View File

@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod }; return (mod && mod.__esModule) ? mod : { "default": mod };
}; };
Object.defineProperty(exports, "__esModule", { value: true }); 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")); const User_1 = __importDefault(require("./User"));
exports.default = User_1.default; exports.default = User_1.default;
var Address_1 = require("../SuperAdmin/Address"); 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; } }); Object.defineProperty(exports, "OfficeFolderHasStakeholder", { enumerable: true, get: function () { return __importDefault(OfficeFolderHasStakeholder_1).default; } });
var UserHasNotification_1 = require("./UserHasNotification"); var UserHasNotification_1 = require("./UserHasNotification");
Object.defineProperty(exports, "UserHasNotification", { enumerable: true, get: function () { return __importDefault(UserHasNotification_1).default; } }); 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; } });

View File

@ -5,7 +5,7 @@ import Office from "./Office";
export default class OfficeRoleHasRules extends Resource { export default class OfficeRoleHasRules extends Resource {
uid?: string; uid?: string;
role: Role; role: Role;
rule: Rule; rules: Rule[];
office: Office; office: Office;
created_at: Date | null; created_at: Date | null;
updated_at: Date | null; updated_at: Date | null;

View File

@ -42,8 +42,8 @@ __decorate([
(0, class_validator_1.IsNotEmpty)({ message: "Rule is required" }), (0, class_validator_1.IsNotEmpty)({ message: "Rule is required" }),
(0, class_validator_1.ValidateNested)({ groups: ["createRule", "updateRule"] }), (0, class_validator_1.ValidateNested)({ groups: ["createRule", "updateRule"] }),
(0, class_transformer_1.Type)(() => Rule_1.default), (0, class_transformer_1.Type)(() => Rule_1.default),
__metadata("design:type", Rule_1.default) __metadata("design:type", Array)
], OfficeRoleHasRules.prototype, "rule", void 0); ], OfficeRoleHasRules.prototype, "rules", void 0);
__decorate([ __decorate([
(0, class_transformer_1.Expose)(), (0, class_transformer_1.Expose)(),
(0, class_validator_1.IsNotEmpty)({ message: "Office is required" }), (0, class_validator_1.IsNotEmpty)({ message: "Office is required" }),

View File

@ -9,8 +9,8 @@ export default class Role extends Resource {
created_at: Date | null; created_at: Date | null;
updated_at: Date | null; updated_at: Date | null;
office_folder_has_customers?: OfficeFolderHasCustomer[]; office_folder_has_customers?: OfficeFolderHasCustomer[];
roleHasRules?: RoleHasRules; role_has_rules?: RoleHasRules;
officeRoleHasRules?: OfficeRoleHasRules; office_role_has_rules?: OfficeRoleHasRules;
user?: User[]; user?: User[];
} }
export declare enum ECustomerStatus { export declare enum ECustomerStatus {

4
dist/Notary/Role.js vendored
View File

@ -58,14 +58,14 @@ __decorate([
(0, class_validator_1.ValidateNested)({ groups: ["updateRole"] }), (0, class_validator_1.ValidateNested)({ groups: ["updateRole"] }),
(0, class_transformer_1.Type)(() => RoleHasRules_1.default), (0, class_transformer_1.Type)(() => RoleHasRules_1.default),
__metadata("design:type", RoleHasRules_1.default) __metadata("design:type", RoleHasRules_1.default)
], Role.prototype, "roleHasRules", void 0); ], Role.prototype, "role_has_rules", void 0);
__decorate([ __decorate([
(0, class_transformer_1.Expose)(), (0, class_transformer_1.Expose)(),
(0, class_validator_1.IsNotEmpty)({ message: "Rules are required" }), (0, class_validator_1.IsNotEmpty)({ message: "Rules are required" }),
(0, class_validator_1.ValidateNested)({ groups: ["updateRole"] }), (0, class_validator_1.ValidateNested)({ groups: ["updateRole"] }),
(0, class_transformer_1.Type)(() => OfficeRoleHasRules_1.default), (0, class_transformer_1.Type)(() => OfficeRoleHasRules_1.default),
__metadata("design:type", OfficeRoleHasRules_1.default) __metadata("design:type", OfficeRoleHasRules_1.default)
], Role.prototype, "officeRoleHasRules", void 0); ], Role.prototype, "office_role_has_rules", void 0);
__decorate([ __decorate([
(0, class_transformer_1.Expose)(), (0, class_transformer_1.Expose)(),
(0, class_validator_1.ValidateNested)(), (0, class_validator_1.ValidateNested)(),

View File

@ -4,7 +4,7 @@ import Rule from "./Rule";
export default class RoleHasRules extends Resource { export default class RoleHasRules extends Resource {
uid?: string; uid?: string;
role: Role; role: Role;
rule: Rule; rules: Rule[];
created_at: Date | null; created_at: Date | null;
updated_at: Date | null; updated_at: Date | null;
} }

View File

@ -41,8 +41,8 @@ __decorate([
(0, class_validator_1.IsNotEmpty)({ message: "Rule is required" }), (0, class_validator_1.IsNotEmpty)({ message: "Rule is required" }),
(0, class_validator_1.ValidateNested)({ groups: ["updateRule"] }), (0, class_validator_1.ValidateNested)({ groups: ["updateRule"] }),
(0, class_transformer_1.Type)(() => Rule_1.default), (0, class_transformer_1.Type)(() => Rule_1.default),
__metadata("design:type", Rule_1.default) __metadata("design:type", Array)
], RoleHasRules.prototype, "rule", void 0); ], RoleHasRules.prototype, "rules", void 0);
__decorate([ __decorate([
(0, class_transformer_1.Expose)(), (0, class_transformer_1.Expose)(),
(0, class_validator_1.IsDate)(), (0, class_validator_1.IsDate)(),

View File

@ -6,6 +6,6 @@ export default class Rule extends Resource {
name: string; name: string;
created_at: Date | null; created_at: Date | null;
updated_at: Date | null; updated_at: Date | null;
officeRoleHasRules?: OfficeRoleHasRules[]; office_role_has_rules?: OfficeRoleHasRules[];
roleHasRules?: RoleHasRules[]; role_has_rules?: RoleHasRules[];
} }

4
dist/Notary/Rule.js vendored
View File

@ -48,10 +48,10 @@ __decorate([
(0, class_transformer_1.Expose)(), (0, class_transformer_1.Expose)(),
(0, class_transformer_1.Type)(() => OfficeRoleHasRules_1.default), (0, class_transformer_1.Type)(() => OfficeRoleHasRules_1.default),
__metadata("design:type", Array) __metadata("design:type", Array)
], Rule.prototype, "officeRoleHasRules", void 0); ], Rule.prototype, "office_role_has_rules", void 0);
__decorate([ __decorate([
(0, class_transformer_1.Expose)(), (0, class_transformer_1.Expose)(),
(0, class_transformer_1.Type)(() => RoleHasRules_1.default), (0, class_transformer_1.Type)(() => RoleHasRules_1.default),
__metadata("design:type", Array) __metadata("design:type", Array)
], Rule.prototype, "roleHasRules", void 0); ], Rule.prototype, "role_has_rules", void 0);
exports.default = Rule; exports.default = Rule;

3
dist/Notary/User.js vendored
View File

@ -70,7 +70,8 @@ __decorate([
], User.prototype, "documents", void 0); ], User.prototype, "documents", void 0);
__decorate([ __decorate([
(0, class_transformer_1.Expose)(), (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) __metadata("design:type", Role_1.default)
], User.prototype, "role", void 0); ], User.prototype, "role", void 0);
exports.default = User; exports.default = User;

View File

@ -17,3 +17,7 @@ export { default as OfficeFolder } from "./OfficeFolder";
export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer"; export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer";
export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder"; export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder";
export { default as UserHasNotification } from "./UserHasNotification"; 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";

10
dist/Notary/index.js vendored
View File

@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod }; return (mod && mod.__esModule) ? mod : { "default": mod };
}; };
Object.defineProperty(exports, "__esModule", { value: true }); 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")); const User_1 = __importDefault(require("./User"));
exports.default = User_1.default; exports.default = User_1.default;
var Address_1 = require("../SuperAdmin/Address"); 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; } }); Object.defineProperty(exports, "OfficeFolderHasStakeholder", { enumerable: true, get: function () { return __importDefault(OfficeFolderHasStakeholder_1).default; } });
var UserHasNotification_1 = require("./UserHasNotification"); var UserHasNotification_1 = require("./UserHasNotification");
Object.defineProperty(exports, "UserHasNotification", { enumerable: true, get: function () { return __importDefault(UserHasNotification_1).default; } }); 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; } });

View File

@ -17,3 +17,7 @@ export { default as OfficeFolder } from "./OfficeFolder";
export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer"; export { default as OfficeFolderHasCustomer } from "./OfficeFolderHasCustomer";
export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder"; export { default as OfficeFolderHasStakeholder } from "./OfficeFolderHasStakeholder";
export { default as UserHasNotification } from "./UserHasNotification"; 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";

View File

@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod }; return (mod && mod.__esModule) ? mod : { "default": mod };
}; };
Object.defineProperty(exports, "__esModule", { value: true }); 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")); const User_1 = __importDefault(require("./User"));
exports.default = User_1.default; exports.default = User_1.default;
var Address_1 = require("./Address"); 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; } }); Object.defineProperty(exports, "OfficeFolderHasStakeholder", { enumerable: true, get: function () { return __importDefault(OfficeFolderHasStakeholder_1).default; } });
var UserHasNotification_1 = require("./UserHasNotification"); var UserHasNotification_1 = require("./UserHasNotification");
Object.defineProperty(exports, "UserHasNotification", { enumerable: true, get: function () { return __importDefault(UserHasNotification_1).default; } }); 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; } });

View File

@ -17,4 +17,8 @@ export {default as Office} from "./Office";
export {default as OfficeFolder} from "./OfficeFolder"; export {default as OfficeFolder} from "./OfficeFolder";
export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer"; export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer";
export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder"; export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder";
export {default as UserHasNotification} from "./UserHasNotification"; 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";

View File

@ -24,7 +24,7 @@ export default class OfficeRoleHasRules extends Resource {
@IsNotEmpty({message: "Rule is required"}) @IsNotEmpty({message: "Rule is required"})
@ValidateNested({ groups: ["createRule","updateRule"] }) @ValidateNested({ groups: ["createRule","updateRule"] })
@Type(() => Rule) @Type(() => Rule)
public rule!: Rule; public rules!: Rule[];
@Expose() @Expose()
@IsNotEmpty({message: "Office is required"}) @IsNotEmpty({message: "Office is required"})

View File

@ -35,13 +35,13 @@ export default class Role extends Resource {
@IsNotEmpty({message: "Rules are required"}) @IsNotEmpty({message: "Rules are required"})
@ValidateNested({ groups: ["updateRole"] }) @ValidateNested({ groups: ["updateRole"] })
@Type(() => RoleHasRules) @Type(() => RoleHasRules)
public roleHasRules?: RoleHasRules; public role_has_rules?: RoleHasRules;
@Expose() @Expose()
@IsNotEmpty({message: "Rules are required"}) @IsNotEmpty({message: "Rules are required"})
@ValidateNested({ groups: ["updateRole"] }) @ValidateNested({ groups: ["updateRole"] })
@Type(() => OfficeRoleHasRules) @Type(() => OfficeRoleHasRules)
public officeRoleHasRules?: OfficeRoleHasRules; public office_role_has_rules?: OfficeRoleHasRules;
@Expose() @Expose()
@ValidateNested() @ValidateNested()

View File

@ -23,7 +23,7 @@ export default class RoleHasRules extends Resource {
@IsNotEmpty({message: "Rule is required"}) @IsNotEmpty({message: "Rule is required"})
@ValidateNested({ groups: ["updateRule"] }) @ValidateNested({ groups: ["updateRule"] })
@Type(() => Rule) @Type(() => Rule)
public rule!: Rule; public rules!: Rule[];
@Expose() @Expose()
@IsDate() @IsDate()

View File

@ -26,9 +26,9 @@ export default class Rule extends Resource {
@Expose() @Expose()
@Type(() => OfficeRoleHasRules) @Type(() => OfficeRoleHasRules)
officeRoleHasRules?: OfficeRoleHasRules[]; office_role_has_rules?: OfficeRoleHasRules[];
@Expose() @Expose()
@Type(() => RoleHasRules) @Type(() => RoleHasRules)
roleHasRules?: RoleHasRules[]; role_has_rules?: RoleHasRules[];
} }

View File

@ -45,6 +45,7 @@ export default class User extends Resource {
documents?: Document[]; documents?: Document[];
@Expose() @Expose()
@IsNotEmpty({ groups: ["createUser"] ,message: "Role is required" }) @IsNotEmpty({ groups: ["createUser", "auth"] ,message: "Role is required" })
@Type(() => Role)
public role?: Role; public role?: Role;
} }

View File

@ -17,4 +17,8 @@ export {default as Office} from "./Office";
export {default as OfficeFolder} from "./OfficeFolder"; export {default as OfficeFolder} from "./OfficeFolder";
export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer"; export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer";
export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder"; export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder";
export {default as UserHasNotification} from "./UserHasNotification"; 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";

View File

@ -17,4 +17,8 @@ export {default as Office} from "./Office";
export {default as OfficeFolder} from "./OfficeFolder"; export {default as OfficeFolder} from "./OfficeFolder";
export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer"; export {default as OfficeFolderHasCustomer} from "./OfficeFolderHasCustomer";
export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder"; export {default as OfficeFolderHasStakeholder} from "./OfficeFolderHasStakeholder";
export {default as UserHasNotification} from "./UserHasNotification"; 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";