@evara-group/guard 3.0.5 → 3.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/role/dtos/role-query.dto.d.ts +1 -0
- package/dist/modules/role/dtos/role-query.dto.js.map +1 -1
- package/dist/modules/role/role.controller.js +1 -5
- package/dist/modules/role/role.controller.js.map +1 -1
- package/dist/modules/role/role.entity.js.map +1 -1
- package/dist/modules/role/role.service.d.ts +3 -1
- package/dist/modules/role/role.service.js +36 -2
- package/dist/modules/role/role.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +51 -51
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/role/dtos/role-query.dto.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAE/D,MAAa,YAAa,SAAQ,0BAAW;
|
|
1
|
+
{"version":3,"file":"role-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/role/dtos/role-query.dto.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAE/D,MAAa,YAAa,SAAQ,0BAAW;CAE5C;AAFD,oCAEC"}
|
|
@@ -42,11 +42,7 @@ let RoleController = RoleController_1 = class RoleController {
|
|
|
42
42
|
}
|
|
43
43
|
async getAll(req, query) {
|
|
44
44
|
const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
|
|
45
|
-
const [results, count] = await this.roleService.findAndCount(
|
|
46
|
-
skip: pageRequest.page * pageRequest.size,
|
|
47
|
-
take: pageRequest.size,
|
|
48
|
-
order: pageRequest.sort.asOrder(),
|
|
49
|
-
});
|
|
45
|
+
const [results, count] = await this.roleService.findAndCount(query, pageRequest);
|
|
50
46
|
const roleDtos = (0, role_mapper_1.mapRoleToRoleDtoSelective)(results, [
|
|
51
47
|
"id",
|
|
52
48
|
"nameAr",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,2CAewB;AACxB,qCAAkC;AAClC,6CAKyB;AACzB,iDAA6C;AAC7C,yEAAqE;AACrE,uEAA6D;AAC7D,0EAAiE;AACjE,8DAA0D;AAI1D,8CAA0C;AAC1C,4DAAuD;AACvD,4DAAuD;AACvD,0DAAqD;AAGrD,+CAIuB;AAGvB,mEAA+D;AAC/D,yEAAiE;AACjE,+EAAkE;AAClE,uFAAyE;AACzE,2FAA8E;AAC9E,0DAAsD;AACtD,sEAAsE;AAO/D,IAAM,cAAc,sBAApB,MAAM,cAAc;IAGzB,YACmB,WAAwB,EACxB,iBAAoC;QADpC,gBAAW,GAAX,WAAW,CAAa;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAJtC,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAKvD,CAAC;IAeE,AAAN,KAAK,CAAC,MAAM,CACH,GAAY,EACV,KAAmB;QAE5B,MAAM,WAAW,GAAG,IAAI,+BAAW,CACjC,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,EAClB,CAAC,CAAC,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC,EACvB,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CACxE,CAAC;QAEF,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../src/modules/role/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../src/modules/role/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,8DAA0D;AAC1D,uEAA6D;AAGtD,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,wBAAU;CAgCnC,CAAA;AAhCY,oBAAI;AAEf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;oCAC3D;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;oCAC3D;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC1C;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC1C;AASvB;IAPC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,EAAE;QACV,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,IAAI;KACb,CAAC;;kCACY;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;0CAC7C;AAQvB;IANC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,8BAAU,CAAC;IAC5B,IAAA,mBAAS,EAAC;QACT,IAAI,EAAE,kBAAkB;QACxB,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE;QAC3D,iBAAiB,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,oBAAoB,EAAE,IAAI,EAAE;KACzE,CAAC;;yCACyB;eA/BhB,IAAI;IADhB,IAAA,gBAAM,EAAC,OAAO,CAAC;GACH,IAAI,CAgChB"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { Repository, FindOneOptions, FindManyOptions } from "typeorm";
|
|
2
2
|
import { Role } from "./role.entity";
|
|
3
|
+
import { RoleQueryDTO } from "./dtos/role-query.dto";
|
|
4
|
+
import { PageRequest } from "../../core/utils/pagination.entity";
|
|
3
5
|
export declare class RoleService {
|
|
4
6
|
private readonly roleRepository;
|
|
5
7
|
constructor(roleRepository: Repository<Role>);
|
|
6
8
|
findById(id: number): Promise<Role | null>;
|
|
7
9
|
findByFields(options: FindOneOptions<Role>): Promise<Role | null>;
|
|
8
10
|
find(options: FindManyOptions<Role>): Promise<Role[]>;
|
|
9
|
-
findAndCount(
|
|
11
|
+
findAndCount(query: RoleQueryDTO, pageRequest: PageRequest): Promise<[Role[], number]>;
|
|
10
12
|
save(entity: Role, creator?: string): Promise<Role>;
|
|
11
13
|
update(entity: Role, updater?: string): Promise<Role>;
|
|
12
14
|
delete(entity: Role): Promise<Role>;
|
|
@@ -34,8 +34,42 @@ let RoleService = class RoleService {
|
|
|
34
34
|
async find(options) {
|
|
35
35
|
return this.roleRepository.find(options);
|
|
36
36
|
}
|
|
37
|
-
async findAndCount(
|
|
38
|
-
|
|
37
|
+
async findAndCount(query, pageRequest) {
|
|
38
|
+
const qb = this.roleRepository.createQueryBuilder("role");
|
|
39
|
+
qb.innerJoinAndSelect("role.permissions", "permission");
|
|
40
|
+
qb.leftJoinAndSelect("permission.module", "module");
|
|
41
|
+
qb.select([
|
|
42
|
+
"role.id",
|
|
43
|
+
"role.nameAr",
|
|
44
|
+
"role.nameEn",
|
|
45
|
+
"role.descriptionAr",
|
|
46
|
+
"role.descriptionEn",
|
|
47
|
+
"role.isSystemRole",
|
|
48
|
+
"role.createdAt",
|
|
49
|
+
"role.createdBy",
|
|
50
|
+
"role.updatedAt",
|
|
51
|
+
]);
|
|
52
|
+
if (query.moduleId) {
|
|
53
|
+
qb.andWhere("module.id = :moduleId", { moduleId: query.moduleId });
|
|
54
|
+
}
|
|
55
|
+
const sortOrder = pageRequest.sort.asOrder();
|
|
56
|
+
if (sortOrder && Object.keys(sortOrder).length > 0) {
|
|
57
|
+
Object.entries(sortOrder).forEach(([field, direction], index) => {
|
|
58
|
+
if (index === 0) {
|
|
59
|
+
qb.orderBy(`role.${field}`, direction);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
qb.addOrderBy(`role.${field}`, direction);
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
qb.orderBy("module.nameEn", "ASC");
|
|
68
|
+
qb.addOrderBy("role.nameEn", "ASC");
|
|
69
|
+
}
|
|
70
|
+
qb.skip(pageRequest.page * pageRequest.size);
|
|
71
|
+
qb.take(pageRequest.size);
|
|
72
|
+
return qb.getManyAndCount();
|
|
39
73
|
}
|
|
40
74
|
async save(entity, creator) {
|
|
41
75
|
if (creator) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../src/modules/role/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAsE;AACtE,+CAAqC;AACrC,yCAAwD;
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../src/modules/role/role.service.ts"],"names":[],"mappings":"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"}
|