@evara-group/guard 3.0.7 → 3.0.9

package/dist/modules/module/dtos/create-module.dto.d.ts

@@ -1,5 +1,5 @@
 import { ModuleDTO } from "./module.dto";
-declare const CreateModuleDTO_base: import("@nestjs/common").Type<Omit<ModuleDTO, "id" | "createdAt" | "updatedAt" | "deletedAt">>;
+declare const CreateModuleDTO_base: import("@nestjs/common").Type<Omit<ModuleDTO, "createdAt" | "updatedAt" | "id" | "deletedAt">>;
 export declare class CreateModuleDTO extends CreateModuleDTO_base {
 }
 export {};

package/dist/modules/module/dtos/module.dto.d.ts

@@ -1,5 +1,6 @@
 import { BaseDTO } from "../../../core/utils/base.dto";
 import { PermissionDTO } from "../../../modules/permission/dtos/permission.dto";
+import { RoleDTO } from "../../../modules/role/dtos/role.dto";
 export declare class ModuleDTO extends BaseDTO {
     nameAr: string;
     code: string;
@@ -8,4 +9,5 @@ export declare class ModuleDTO extends BaseDTO {
     descriptionEn?: string;
     isActive: boolean;
     permissions?: PermissionDTO[];
+    roles?: RoleDTO[];
 }

package/dist/modules/module/dtos/module.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.dto.js","sourceRoot":"","sources":["../../../../src/modules/module/dtos/module.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAAmE;AACnE,qDAA8E;AAC9E,2DAAuD;AAGvD,MAAa,SAAU,SAAQ,kBAAO;CAmErC;AAnED,8BAmEC;AA5DC;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,2BAA2B;KACzC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;yCACG;AAQhB;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,iBAAiB;QAC1B,WAAW,EAAE,uBAAuB;KACrC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;uCACC;AAQd;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,iBAAiB;QAC1B,WAAW,EAAE,wBAAwB;KACtC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;yCACG;AAQhB;IANC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,0CAA0C;QACnD,WAAW,EAAE,sBAAsB;KACpC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;gDACU;AAQvB;IANC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,mDAAmD;QAC5D,WAAW,EAAE,wBAAwB;KACtC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;gDACU;AAOvB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,0CAA0C;KACxD,CAAC;IACD,IAAA,2BAAS,GAAE;;2CACO;AAoBnB;IAlBC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE;YACP;gBACE,EAAE,EAAE,CAAC;gBACL,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,cAAc;gBACtB,MAAM,EAAE,aAAa;gBACrB,aAAa,EAAE,4BAA4B;gBAC3C,aAAa,EAAE,0BAA0B;gBACzC,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,sBAAsB;gBACjC,SAAS,EAAE,sBAAsB;gBACjC,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;aACb;SACF;QACD,WAAW,EAAE,gDAAgD;KAC9D,CAAC;;8CAC4B"}
+{"version":3,"file":"module.dto.js","sourceRoot":"","sources":["../../../../src/modules/module/dtos/module.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,6CAAmE;AACnE,qDAA8E;AAC9E,2DAAuD;AAIvD,MAAa,SAAU,SAAQ,kBAAO;CAqErC;AArED,8BAqEC;AA9DC;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,2BAA2B;KACzC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;yCACG;AAQhB;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,iBAAiB;QAC1B,WAAW,EAAE,uBAAuB;KACrC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;uCACC;AAQd;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,iBAAiB;QAC1B,WAAW,EAAE,wBAAwB;KACtC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;yCACG;AAQhB;IANC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,0CAA0C;QACnD,WAAW,EAAE,sBAAsB;KACpC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;gDACU;AAQvB;IANC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,mDAAmD;QAC5D,WAAW,EAAE,wBAAwB;KACtC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;gDACU;AAOvB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,0CAA0C;KACxD,CAAC;IACD,IAAA,2BAAS,GAAE;;2CACO;AAoBnB;IAlBC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE;YACP;gBACE,EAAE,EAAE,CAAC;gBACL,IAAI,EAAE,aAAa;gBACnB,MAAM,EAAE,cAAc;gBACtB,MAAM,EAAE,aAAa;gBACrB,aAAa,EAAE,4BAA4B;gBAC3C,aAAa,EAAE,0BAA0B;gBACzC,QAAQ,EAAE,IAAI;gBACd,SAAS,EAAE,sBAAsB;gBACjC,SAAS,EAAE,sBAAsB;gBACjC,SAAS,EAAE,CAAC;gBACZ,SAAS,EAAE,CAAC;aACb;SACF;QACD,WAAW,EAAE,gDAAgD;KAC9D,CAAC;;8CAC4B"}

package/dist/modules/module/dtos/update-module.dto.d.ts

@@ -1,5 +1,5 @@
 import { ModuleDTO } from "./module.dto";
-declare const UpdateModuleDTO_base: import("@nestjs/common").Type<Partial<Omit<ModuleDTO, "createdBy" | "createdAt" | "updatedBy" | "updatedAt">>>;
+declare const UpdateModuleDTO_base: import("@nestjs/common").Type<Partial<Omit<ModuleDTO, "createdAt" | "updatedAt" | "createdBy" | "updatedBy">>>;
 export declare class UpdateModuleDTO extends UpdateModuleDTO_base {
 }
 export {};

package/dist/modules/module/module.controller.d.ts

@@ -7,6 +7,7 @@ export declare class ModuleController {
     private readonly moduleService;
     logger: Logger;
     constructor(moduleService: ModuleService);
+    getAll(req: Request, query: ModuleQueryDTO): Promise<Partial<ModuleDTO>[]>;
     getAllModules(req: Request, query: ModuleQueryDTO): Promise<Partial<ModuleDTO>[]>;
     getModuleById(id: number): Promise<ModuleDTO>;
 }

package/dist/modules/module/module.controller.js

@@ -29,7 +29,7 @@ let ModuleController = class ModuleController {
         this.moduleService = moduleService;
         this.logger = new common_1.Logger("ModuleController");
     }
-    async getAllModules(req, query) {
+    async getAll(req, query) {
         const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
         const [results, count] = await this.moduleService.findAndCount({
             skip: +pageRequest.page * pageRequest.size,
@@ -42,6 +42,31 @@ let ModuleController = class ModuleController {
             "nameEn",
             "descriptionAr",
             "descriptionEn",
+            "permissions",
+            "isActive",
+            "createdAt",
+            "createdBy",
+        ]);
+        req.res.setHeader("X-Total-Count", count);
+        req.res.setHeader("X-Page", pageRequest.page);
+        req.res.setHeader("X-Has-Next-Page", count > pageRequest.page * pageRequest.size ? "true" : "false");
+        return moduleDtos;
+    }
+    async getAllModules(req, query) {
+        const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
+        const [results, count] = await this.moduleService.findAndCount({
+            skip: pageRequest.page * pageRequest.size,
+            take: pageRequest.size,
+            order: pageRequest.sort.asOrder(),
+            relations: ["permissions"],
+        });
+        const moduleDtos = (0, module_mapper_1.mapModuleToModuleDtoSelective)(results, [
+            "id",
+            "nameAr",
+            "nameEn",
+            "descriptionAr",
+            "descriptionEn",
+            "permissions",
             "isActive",
             "createdAt",
             "createdBy",
@@ -56,8 +81,9 @@ let ModuleController = class ModuleController {
             where: { id },
             relations: ["permissions"],
         });
-        if (!found)
+        if (!found) {
             throw new common_1.NotFoundException(`Module with id ${id} not found`);
+        }
         return (0, module_mapper_1.mapModuleToModuleDtoSelective)(found, [
             "id",
             "nameAr",
@@ -89,9 +115,25 @@ __decorate([
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Object, module_query_dto_1.ModuleQueryDTO]),
     __metadata("design:returntype", Promise)
+], ModuleController.prototype, "getAll", null);
+__decorate([
+    (0, common_1.Get)("tree"),
+    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
+    (0, swagger_1.ApiOperation)({ summary: "Get list of modules (paginated)" }),
+    (0, swagger_1.ApiResponse)({
+        status: 200,
+        description: "List all modules",
+        type: module_dto_1.ModuleDTO,
+        isArray: true,
+    }),
+    __param(0, (0, common_1.Req)()),
+    __param(1, (0, common_1.Query)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, module_query_dto_1.ModuleQueryDTO]),
+    __metadata("design:returntype", Promise)
 ], ModuleController.prototype, "getAllModules", null);
 __decorate([
-    (0, common_1.Get)("/:id"),
+    (0, common_1.Get)(":id"),
     (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
     (0, swagger_1.ApiOperation)({ summary: "Get module by ID" }),
     (0, swagger_1.ApiResponse)({ status: 200, description: "Module found", type: module_dto_1.ModuleDTO }),

package/dist/modules/module/module.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.controller.js","sourceRoot":"","sources":["../../../src/modules/module/module.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"module.controller.js","sourceRoot":"","sources":["../../../src/modules/module/module.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/module/module.mapper.d.ts

@@ -1,5 +1,26 @@
 import { ModuleEntity } from "./module.entity";
 import { ModuleDTO } from "./dtos/module.dto";
 import { BaseDTO } from "../../core/utils/base.dto";
+type Nullable<T> = T | null;
+export type ModuleRowLike = {
+    id?: number;
+    nameAr?: string;
+    nameEn?: string;
+    code?: Nullable<string>;
+    descriptionAr?: Nullable<string>;
+    descriptionEn?: Nullable<string>;
+    isActive?: boolean;
+    permissions?: any;
+    roles?: any;
+    createdAt?: Nullable<Date>;
+    createdBy?: Nullable<string>;
+    updatedAt?: Nullable<Date>;
+    updatedBy?: Nullable<string>;
+    deletedAt?: Nullable<Date>;
+    deletedBy?: Nullable<string>;
+};
 export declare function mapModuleToModuleDtoSelective(module: ModuleEntity, keys?: (keyof ModuleDTO | keyof BaseDTO)[]): Partial<ModuleDTO>;
 export declare function mapModuleToModuleDtoSelective(modules: ModuleEntity[], keys?: (keyof ModuleDTO | keyof BaseDTO)[]): Partial<ModuleDTO>[];
+export declare function mapModuleToModuleDtoSelective(module: ModuleRowLike, keys?: (keyof ModuleDTO | keyof BaseDTO)[]): Partial<ModuleDTO>;
+export declare function mapModuleToModuleDtoSelective(modules: ModuleRowLike[], keys?: (keyof ModuleDTO | keyof BaseDTO)[]): Partial<ModuleDTO>[];
+export {};

package/dist/modules/module/module.mapper.js

@@ -4,11 +4,13 @@ exports.mapModuleToModuleDtoSelective = mapModuleToModuleDtoSelective;
 const allowedModuleDtoKeys = [
     "id",
     "nameAr",
+    "code",
     "nameEn",
     "descriptionAr",
     "descriptionEn",
     "isActive",
     "permissions",
+    "roles",
     "createdAt",
     "updatedAt",
     "createdBy",
@@ -19,11 +21,19 @@ function mapModuleToModuleDtoSelective(moduleOrModules, keys) {
         const dto = {};
         const keysToMap = (keys || allowedModuleDtoKeys).filter((key) => allowedModuleDtoKeys.includes(key));
         keysToMap.forEach((key) => {
-            if (key in module && module[key] !== undefined) {
-                dto[key] = module[key];
+            const value = module[key];
+            if (value !== undefined && value !== null) {
+                dto[key] = value;
             }
-            if (key === "permissions" && module.permissions) {
-                dto.permissions = module.permissions;
+            if (key === "permissions") {
+                const perms = module.permissions;
+                if (perms !== undefined && perms !== null)
+                    dto.permissions = perms;
+            }
+            if (key === "roles") {
+                const roles = module.roles;
+                if (roles !== undefined && roles !== null)
+                    dto.roles = roles;
             }
         });
         return dto;

package/dist/modules/module/module.mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.mapper.js","sourceRoot":"","sources":["../../../src/modules/module/module.mapper.ts"],"names":[],"mappings":";;AAiCA,sEA2BC;AApDD,MAAM,oBAAoB,GAAmD;IAC3E,IAAI;IACJ,QAAQ;IACR,QAAQ;IACR,eAAe;IACf,eAAe;IACf,UAAU;IACV,aAAa;IACb,WAAW;IACX,WAAW;IACX,WAAW;IACX,WAAW;CACZ,CAAC;AAaF,SAAgB,6BAA6B,CAC3C,eAA8C,EAC9C,IAA0C;IAE1C,MAAM,SAAS,GAAG,CAAC,MAAoB,EAAsB,EAAE;QAC7D,MAAM,GAAG,GAAuB,EAAE,CAAC;QAEnC,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAC9D,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,CACnC,CAAC;QAEF,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,IAAI,GAAG,IAAI,MAAM,IAAI,MAAM,CAAC,GAAyB,CAAC,KAAK,SAAS,EAAE,CAAC;gBACpE,GAAW,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,GAAyB,CAAC,CAAC;YACxD,CAAC;YAED,IAAI,GAAG,KAAK,aAAa,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBAC/C,GAAW,CAAC,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC;YAChD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;QACnC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC;QAChC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC"}
+{"version":3,"file":"module.mapper.js","sourceRoot":"","sources":["../../../src/modules/module/module.mapper.ts"],"names":[],"mappings":";;AAmEA,sEAyCC;AA5ED,MAAM,oBAAoB,GAAmD;IAC3E,IAAI;IACJ,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,eAAe;IACf,eAAe;IACf,UAAU;IACV,aAAa;IACb,OAAO;IACP,WAAW;IACX,WAAW;IACX,WAAW;IACX,WAAW;CACZ,CAAC;AAqBF,SAAgB,6BAA6B,CAC3C,eAImB,EACnB,IAA0C;IAE1C,MAAM,SAAS,GAAG,CAChB,MAAoC,EAChB,EAAE;QACtB,MAAM,GAAG,GAAuB,EAAE,CAAC;QAEnC,MAAM,SAAS,GAAG,CAAC,IAAI,IAAI,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAC9D,oBAAoB,CAAC,QAAQ,CAAC,GAAG,CAAC,CACnC,CAAC;QAEF,SAAS,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACxB,MAAM,KAAK,GAAI,MAAc,CAAC,GAAG,CAAC,CAAC;YACnC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBACzC,GAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YAC5B,CAAC;YAED,IAAI,GAAG,KAAK,aAAa,EAAE,CAAC;gBAC1B,MAAM,KAAK,GAAI,MAAc,CAAC,WAAW,CAAC;gBAC1C,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;oBACtC,GAAW,CAAC,WAAW,GAAG,KAAK,CAAC;YACrC,CAAC;YAED,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;gBACpB,MAAM,KAAK,GAAI,MAAc,CAAC,KAAK,CAAC;gBACpC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI;oBAAG,GAAW,CAAC,KAAK,GAAG,KAAK,CAAC;YACxE,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;IAEF,OAAO,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC;QACnC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,SAAS,CAAC;QAChC,CAAC,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;AACjC,CAAC"}

package/dist/modules/module/module.service.d.ts

@@ -1,5 +1,21 @@
 import { Repository, FindOneOptions, FindManyOptions } from "typeorm";
 import { ModuleEntity } from "./module.entity";
+import { RoleQueryDTO } from "../role/dtos/role-query.dto";
+import { PageRequest } from "../../core/utils/pagination.entity";
+export type ModuleWithRolesRow = {
+    id: number;
+    nameAr: string;
+    nameEn: string;
+    code: string | null;
+    descriptionAr: string | null;
+    descriptionEn: string | null;
+    isActive: boolean;
+    createdAt: Date | null;
+    createdBy: string | null;
+    updatedAt: Date | null;
+    updatedBy: string | null;
+    roles: any;
+};
 export declare class ModuleService {
     private readonly moduleRepository;
     constructor(moduleRepository: Repository<ModuleEntity>);
@@ -8,6 +24,7 @@ export declare class ModuleService {
     find(options: FindManyOptions<ModuleEntity>): Promise<ModuleEntity[]>;
     findAndCount(options: FindManyOptions<ModuleEntity>): Promise<[ModuleEntity[], number]>;
     save(entity: ModuleEntity, creator?: string): Promise<ModuleEntity>;
+    findAndCountwithRoles(query: RoleQueryDTO, pageRequest: PageRequest): Promise<[ModuleWithRolesRow[], number]>;
     update(entity: ModuleEntity, updater?: string): Promise<ModuleEntity>;
     delete(entity: ModuleEntity): Promise<ModuleEntity>;
 }

package/dist/modules/module/module.service.js

@@ -44,6 +44,61 @@ let ModuleService = class ModuleService {
         }
         return this.moduleRepository.save(entity);
     }
+    async findAndCountwithRoles(query, pageRequest) {
+        const qb = this.moduleRepository.createQueryBuilder("module");
+        if (query.moduleId) {
+            qb.where("module.id = :moduleId", { moduleId: query.moduleId });
+        }
+        qb.leftJoin("module.permissions", "permission");
+        qb.leftJoin("role_permissions", "rp", 'rp."permission_id" = permission.id');
+        qb.leftJoin("roles", "role", 'role.id = rp."role_id"');
+        qb.addSelect("module.id", "id");
+        qb.addSelect('module."name_Ar"', "nameAr");
+        qb.addSelect("module.code", "code");
+        qb.addSelect('module."description_Ar"', "descriptionAr");
+        qb.addSelect('module."description_En"', "descriptionEn");
+        qb.addSelect('module."is_active"', "isActive");
+        qb.addSelect('module."created_at"', "createdAt");
+        qb.addSelect('module."created_by"', "createdBy");
+        qb.addSelect('module."updated_at"', "updatedAt");
+        qb.addSelect('module."updated_by"', "updatedBy");
+        qb.addSelect(`COALESCE(
+        jsonb_agg(
+          DISTINCT jsonb_build_object(
+            'id', role.id,
+            'nameAr', role."name_Ar",
+            'nameEn', role."name_En",
+            'descriptionAr', role."description_Ar",
+            'descriptionEn', role."description_En",
+            'code', role.code,
+            'isSystemRole', role."is_system_role"
+          )
+        ) FILTER (WHERE role.id IS NOT NULL),
+        '[]'::jsonb
+      )`, "roles");
+        qb.groupBy("module.id");
+        const sortOrder = pageRequest.sort.asOrder();
+        if (sortOrder && Object.keys(sortOrder).length > 0) {
+            Object.entries(sortOrder).forEach(([field, direction], index) => {
+                if (index === 0) {
+                    qb.orderBy(`module.${field}`, direction);
+                }
+                else {
+                    qb.addOrderBy(`module.${field}`, direction);
+                }
+            });
+        }
+        else {
+            qb.orderBy('module."name_En"', "ASC");
+        }
+        qb.skip(pageRequest.page * pageRequest.size);
+        qb.take(pageRequest.size);
+        const rows = (await qb.getRawMany());
+        const total = query.moduleId
+            ? await this.moduleRepository.count({ where: { id: query.moduleId } })
+            : await this.moduleRepository.count();
+        return [rows, total];
+    }
     async update(entity, updater) {
         if (updater) {
             entity.updatedBy = updater;

package/dist/modules/module/module.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.service.js","sourceRoot":"","sources":["../../../src/modules/module/module.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAEA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAsE;AACtE,mDAA+C;AAC/C,yCAAwD;AAGjD,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YAEmB,gBAA0C;QAA1C,qBAAgB,GAAhB,gBAAgB,CAA0B;IAC1D,CAAC;IAGJ,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC;YACnC,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,SAAS,EAAE,CAAC,aAAa,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,YAAY,CAChB,OAAqC;QAErC,OAAO,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,OAAsC;QAC/C,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;IAGD,KAAK,CAAC,YAAY,CAChB,OAAsC;QAEtC,OAAO,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,MAAoB,EAAE,OAAgB;QAC/C,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;YAC3B,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,MAAoB,EAAE,OAAgB;QACjD,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;QAC7B,CAAC;QAED,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,MAAoB;QAC/B,OAAO,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;CAMF,CAAA;AA5DY,sCAAa;wBAAb,aAAa;IADzB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,4BAAY,EAAE,iCAAwB,CAAC,CAAA;qCACtB,oBAAU;GAHpC,aAAa,CA4DzB"}
+{"version":3,"file":"module.service.js","sourceRoot":"","sources":["../../../src/modules/module/module.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/role/dtos/create-role.dto.d.ts

@@ -1,5 +1,5 @@
 import { RoleDTO } from "./role.dto";
-declare const CreateRoleDTO_base: import("@nestjs/common").Type<Omit<RoleDTO, "createdAt" | "updatedAt" | "deletedAt" | "permissions" | "id">>;
+declare const CreateRoleDTO_base: import("@nestjs/common").Type<Omit<RoleDTO, "permissions" | "createdAt" | "updatedAt" | "deletedAt" | "id">>;
 export declare class CreateRoleDTO extends CreateRoleDTO_base {
     permissions: number[];
 }

package/dist/modules/role/dtos/role.dto.d.ts

@@ -8,5 +8,4 @@ export declare class RoleDTO extends BaseDTO {
     descriptionEn?: string;
     isSystemRole: boolean;
     permissions?: PermissionDTO[];
-    moduleCode?: string;
 }

package/dist/modules/role/dtos/role.dto.js

@@ -79,12 +79,4 @@ __decorate([
     (0, class_validator_1.IsOptional)(),
     __metadata("design:type", Array)
 ], RoleDTO.prototype, "permissions", void 0);
-__decorate([
-    (0, swagger_1.ApiPropertyOptional)({
-        example: true,
-        description: "Whether the role is active and assignable",
-    }),
-    (0, class_validator_1.IsOptional)(),
-    __metadata("design:type", String)
-], RoleDTO.prototype, "moduleCode", void 0);
 //# sourceMappingURL=role.dto.js.map

package/dist/modules/role/dtos/role.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.dto.js","sourceRoot":"","sources":["../../../../src/modules/role/dtos/role.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmE;AACnE,qDAA8E;AAC9E,2DAAuD;AAGvD,MAAa,OAAQ,SAAQ,kBAAO;CA+DnC;AA/DD,0BA+DC;AAxDC;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,aAAa;QACtB,WAAW,EAAE,qBAAqB;KACnC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;uCACG;AAQhB;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,sBAAsB;QAC/B,WAAW,EAAE,sBAAsB;KACpC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;uCACG;AAShB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,OAAO;QAChB,WAAW,EAAE,wBAAwB;QACrC,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;qCACC;AAQd;IANC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,uBAAuB;QAChC,WAAW,EAAE,uBAAuB;KACrC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;8CACU;AAQvB;IANC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,sCAAsC;QAC/C,WAAW,EAAE,wBAAwB;KACtC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;8CACU;AAQvB;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,uCAAuC;KACrD,CAAC;IACD,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;;6CACU;AAOvB;IALC,IAAA,6BAAmB,EAAC;QACnB,WAAW,EAAE,mCAAmC;QAChD,OAAO,EAAE,IAAI;KACd,CAAC;IACD,IAAA,4BAAU,GAAE;;4CACiB;AAO9B;IALC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,2CAA2C;KACzD,CAAC;IACD,IAAA,4BAAU,GAAE;;2CACO"}
+{"version":3,"file":"role.dto.js","sourceRoot":"","sources":["../../../../src/modules/role/dtos/role.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmE;AACnE,qDAA8E;AAC9E,2DAAuD;AAGvD,MAAa,OAAQ,SAAQ,kBAAO;CAwDnC;AAxDD,0BAwDC;AAjDC;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,aAAa;QACtB,WAAW,EAAE,qBAAqB;KACnC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;uCACG;AAQhB;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,sBAAsB;QAC/B,WAAW,EAAE,sBAAsB;KACpC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;uCACG;AAShB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,OAAO;QAChB,WAAW,EAAE,wBAAwB;QACrC,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;qCACC;AAQd;IANC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,uBAAuB;QAChC,WAAW,EAAE,uBAAuB;KACrC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;8CACU;AAQvB;IANC,IAAA,6BAAmB,EAAC;QACnB,OAAO,EAAE,sCAAsC;QAC/C,WAAW,EAAE,wBAAwB;KACtC,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;8CACU;AAQvB;IANC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,uCAAuC;KACrD,CAAC;IACD,IAAA,2BAAS,GAAE;IACX,IAAA,4BAAU,GAAE;;6CACU;AAOvB;IALC,IAAA,6BAAmB,EAAC;QACnB,WAAW,EAAE,mCAAmC;QAChD,OAAO,EAAE,IAAI;KACd,CAAC;IACD,IAAA,4BAAU,GAAE;;4CACiB"}

package/dist/modules/role/dtos/update-role.dto.d.ts

@@ -1,5 +1,5 @@
 import { RoleDTO } from "./role.dto";
-declare const UpdateRoleDTO_base: import("@nestjs/common").Type<Partial<Omit<RoleDTO, "createdAt" | "updatedAt" | "deletedAt" | "permissions">>>;
+declare const UpdateRoleDTO_base: import("@nestjs/common").Type<Partial<Omit<RoleDTO, "permissions" | "createdAt" | "updatedAt" | "deletedAt">>>;
 export declare class UpdateRoleDTO extends UpdateRoleDTO_base {
     permissions?: number[];
 }

package/dist/modules/role/role.controller.d.ts

@@ -6,6 +6,7 @@ import { CreateRoleDTO } from "./dtos/create-role.dto";
 import { UpdateRoleDTO } from "./dtos/update-role.dto";
 import { RoleQueryDTO } from "./dtos/role-query.dto";
 import { ModuleService } from "../module/module.service";
+import { ModuleDTO } from "../module/dtos/module.dto";
 export declare class RoleController {
     private readonly roleService;
     private readonly permissionService;
@@ -13,6 +14,7 @@ export declare class RoleController {
     private readonly logger;
     constructor(roleService: RoleService, permissionService: PermissionService, moduleService: ModuleService);
     getAll(req: Request, query: RoleQueryDTO): Promise<Partial<RoleDTO>[]>;
+    getAllWithRoles(req: Request, query: RoleQueryDTO): Promise<Partial<ModuleDTO>[]>;
     getById(id: number): Promise<Partial<RoleDTO>>;
     create(dto: CreateRoleDTO, user: any): Promise<RoleDTO>;
     update(id: number, dto: UpdateRoleDTO, user: any): Promise<RoleDTO>;

package/dist/modules/role/role.controller.js

@@ -35,6 +35,7 @@ const permissions_decorator_1 = require("../../security/decorators/permissions.d
 const user_role_1 = require("../../core/enums/user-role");
 const user_permission_1 = require("../../core/enums/user-permission");
 const module_service_1 = require("../module/module.service");
+const module_mapper_1 = require("../module/module.mapper");
 let RoleController = RoleController_1 = class RoleController {
     constructor(roleService, permissionService, moduleService) {
         this.roleService = roleService;
@@ -44,27 +45,39 @@ let RoleController = RoleController_1 = class RoleController {
     }
     async getAll(req, query) {
         const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
-        let moduleCode = undefined;
-        if (query.moduleId !== undefined) {
-            const module = await this.moduleService.findById(query.moduleId);
-            if (module) {
-                moduleCode = module.code;
-            }
-        }
         const [results, count] = await this.roleService.findAndCount(query, pageRequest);
-        const roleDtos = (0, role_mapper_1.mapRoleToRoleDtoSelective)(results, [
+        const rolesDtos = (0, role_mapper_1.mapRoleToRoleDtoSelective)(results, [
             "id",
             "nameAr",
             "nameEn",
-            "moduleCode",
             "descriptionAr",
             "descriptionEn",
             "isSystemRole",
             "createdAt",
             "createdBy",
-        ], moduleCode);
+            "updatedAt",
+            "updatedBy",
+        ]);
+        header_util_1.HeaderUtil.addPaginationHeaders(req.res, count, pageRequest.page, count > (pageRequest.page + 1) * pageRequest.size);
+        return rolesDtos;
+    }
+    async getAllWithRoles(req, query) {
+        const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
+        const [results, count] = await this.moduleService.findAndCountwithRoles(query, pageRequest);
+        const moduleDtos = (0, module_mapper_1.mapModuleToModuleDtoSelective)(results, [
+            "id",
+            "nameAr",
+            "nameEn",
+            "code",
+            "descriptionAr",
+            "descriptionEn",
+            "isActive",
+            "roles",
+            "createdAt",
+            "createdBy",
+        ]);
         header_util_1.HeaderUtil.addPaginationHeaders(req.res, count, pageRequest.page, count > (pageRequest.page + 1) * pageRequest.size);
-        return roleDtos;
+        return moduleDtos;
     }
     async getById(id) {
         const entity = await this.roleService.findById(id);
@@ -183,11 +196,21 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], RoleController.prototype, "getAll", null);
 __decorate([
-    (0, common_1.Get)("/:id"),
+    (0, common_1.Get)("tree"),
+    (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_LIST),
+    (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
+    (0, swagger_1.ApiOperation)({ summary: "Get paginated list of roles with modules" }),
+    __param(0, (0, common_1.Req)()),
+    __param(1, (0, common_1.Query)()),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", [Object, role_query_dto_1.RoleQueryDTO]),
+    __metadata("design:returntype", Promise)
+], RoleController.prototype, "getAllWithRoles", null);
+__decorate([
+    (0, common_1.Get)(":id"),
     (0, permissions_decorator_1.Permissions)(user_permission_1.UserPermissionEnum.ORGANIZATION_SETTINGS_ROLE_READ),
     (0, roles_decorator_1.Roles)(user_role_1.UserRole.ADMIN, user_role_1.UserRole.USER),
     (0, swagger_1.ApiOperation)({ summary: "Get role by ID" }),
-    (0, swagger_1.ApiResponse)({ status: 200, description: "Role found", type: role_dto_1.RoleDTO }),
     __param(0, (0, common_1.Param)("id", common_1.ParseIntPipe)),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [Number]),

package/dist/modules/role/role.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/role/role.mapper.d.ts

@@ -3,7 +3,7 @@ import { RoleDTO } from "./dtos/role.dto";
 import { CreateRoleDTO } from "./dtos/create-role.dto";
 import { UpdateRoleDTO } from "./dtos/update-role.dto";
 import { Role } from "./role.entity";
-export declare function mapRoleToRoleDtoSelective(role: Role, keys?: (keyof RoleDTO | keyof BaseDTO)[], moduleCode?: string): Partial<RoleDTO>;
-export declare function mapRoleToRoleDtoSelective(roles: Role[], keys?: (keyof RoleDTO | keyof BaseDTO)[], moduleCode?: string): Partial<RoleDTO>[];
+export declare function mapRoleToRoleDtoSelective(role: Role, keys?: (keyof RoleDTO | keyof BaseDTO)[]): Partial<RoleDTO>;
+export declare function mapRoleToRoleDtoSelective(roles: Role[], keys?: (keyof RoleDTO | keyof BaseDTO)[]): Partial<RoleDTO>[];
 export declare const mapCreateRoleDtoToEntity: (dto: CreateRoleDTO) => Role;
 export declare const mapUpdateRoleDtoToEntity: (dto: UpdateRoleDTO) => Role;

package/dist/modules/role/role.mapper.js

@@ -12,13 +12,12 @@ const allowedRoleDtoKeys = [
     "descriptionAr",
     "descriptionEn",
     "isSystemRole",
-    "moduleCode",
     "createdAt",
     "updatedAt",
     "createdBy",
     "updatedBy",
 ];
-function mapRoleToRoleDtoSelective(roleOrRoles, keys, moduleCode) {
+function mapRoleToRoleDtoSelective(roleOrRoles, keys) {
     const mapSingle = (role) => {
         const dto = {};
         const keysToMap = (keys || allowedRoleDtoKeys).filter((key) => allowedRoleDtoKeys.includes(key));
@@ -29,9 +28,6 @@ function mapRoleToRoleDtoSelective(roleOrRoles, keys, moduleCode) {
             if (key === "permissions" && role.permissions) {
                 dto.permissions = role.permissions;
             }
-            if (key === "moduleCode" && moduleCode) {
-                dto.moduleCode = moduleCode;
-            }
         });
         return dto;
     };

package/dist/modules/role/role.mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.mapper.js","sourceRoot":"","sources":["../../../src/modules/role/role.mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"role.mapper.js","sourceRoot":"","sources":["../../../src/modules/role/role.mapper.ts"],"names":[],"mappings":"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"}

package/dist/modules/role/role.module.js

@@ -14,13 +14,14 @@ const role_service_1 = require("./role.service");
 const role_entity_1 = require("./role.entity");
 const common_2 = require("../../common");
 const permission_module_1 = require("../permission/permission.module");
+const module_entity_1 = require("../module/module.entity");
 let RoleModule = class RoleModule {
 };
 exports.RoleModule = RoleModule;
 exports.RoleModule = RoleModule = __decorate([
     (0, common_1.Module)({
         imports: [
-            typeorm_1.TypeOrmModule.forFeature([role_entity_1.Role], common_2.AUTH_DATABASE_CONNECTION),
+            typeorm_1.TypeOrmModule.forFeature([role_entity_1.Role, module_entity_1.ModuleEntity], common_2.AUTH_DATABASE_CONNECTION),
             permission_module_1.PermissionModule,
         ],
         controllers: [role_controller_1.RoleController],

package/dist/modules/role/role.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.module.js","sourceRoot":"","sources":["../../../src/modules/role/role.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,uDAAmD;AACnD,iDAA6C;AAC7C,+CAAqC;AACrC,yCAAwD;AACxD,uEAAmE;AAW5D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IATtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,kBAAI,CAAC,EAAE,iCAAwB,CAAC;YAC1D,oCAAgB;SACjB;QACD,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,OAAO,EAAE,CAAC,0BAAW,EAAE,uBAAa,CAAC;KACtC,CAAC;GACW,UAAU,CAAG"}
+{"version":3,"file":"role.module.js","sourceRoot":"","sources":["../../../src/modules/role/role.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,uDAAmD;AACnD,iDAA6C;AAC7C,+CAAqC;AACrC,yCAAwD;AACxD,uEAAmE;AACnE,2DAAuD;AAWhD,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IATtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,kBAAI,EAAE,4BAAY,CAAC,EAAE,iCAAwB,CAAC;YACxE,oCAAgB;SACjB;QACD,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,CAAC;QACxB,OAAO,EAAE,CAAC,0BAAW,EAAE,uBAAa,CAAC;KACtC,CAAC;GACW,UAAU,CAAG"}