@evara-group/guard 3.0.22 → 3.0.24
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/core/enums/consume-app-type.d.ts +5 -0
- package/dist/core/enums/consume-app-type.js +10 -0
- package/dist/core/enums/consume-app-type.js.map +1 -0
- package/dist/core/enums/feature-type.d.ts +8 -0
- package/dist/core/enums/feature-type.js +13 -0
- package/dist/core/enums/feature-type.js.map +1 -0
- package/dist/database/config/typeorm.config.js +0 -4
- package/dist/database/config/typeorm.config.js.map +1 -1
- package/dist/database/migrations/1766829929821-CreateFavouritesTable.d.ts +5 -0
- package/dist/database/migrations/1766829929821-CreateFavouritesTable.js +60 -0
- package/dist/database/migrations/1766829929821-CreateFavouritesTable.js.map +1 -0
- package/dist/database/migrations/1770022397569-AlterRoleTable.d.ts +6 -0
- package/dist/database/migrations/1770022397569-AlterRoleTable.js +37 -0
- package/dist/database/migrations/1770022397569-AlterRoleTable.js.map +1 -0
- package/dist/index.d.ts +0 -16
- package/dist/index.js +0 -16
- package/dist/index.js.map +1 -1
- package/dist/modules/app.module.js +0 -5
- package/dist/modules/app.module.js.map +1 -1
- package/dist/modules/favourite/dtos/create-favourite.dto.d.ts +5 -0
- package/dist/modules/favourite/dtos/create-favourite.dto.js +9 -0
- package/dist/modules/favourite/dtos/create-favourite.dto.js.map +1 -0
- package/dist/modules/favourite/dtos/favourite-query.dto.d.ts +8 -0
- package/dist/modules/favourite/dtos/favourite-query.dto.js +55 -0
- package/dist/modules/favourite/dtos/favourite-query.dto.js.map +1 -0
- package/dist/modules/favourite/dtos/favourite.dto.d.ts +10 -0
- package/dist/modules/favourite/dtos/favourite.dto.js +65 -0
- package/dist/modules/favourite/dtos/favourite.dto.js.map +1 -0
- package/dist/modules/favourite/dtos/update-favourite.dto.d.ts +5 -0
- package/dist/modules/favourite/dtos/update-favourite.dto.js +17 -0
- package/dist/modules/favourite/dtos/update-favourite.dto.js.map +1 -0
- package/dist/modules/favourite/favourite.controller.d.ts +15 -0
- package/dist/modules/favourite/favourite.controller.js +159 -0
- package/dist/modules/favourite/favourite.controller.js.map +1 -0
- package/dist/modules/favourite/favourite.entity.d.ts +10 -0
- package/dist/modules/favourite/favourite.entity.js +54 -0
- package/dist/modules/favourite/favourite.entity.js.map +1 -0
- package/dist/modules/favourite/favourite.mapper.d.ts +7 -0
- package/dist/modules/favourite/favourite.mapper.js +44 -0
- package/dist/modules/favourite/favourite.mapper.js.map +1 -0
- package/dist/modules/favourite/favourite.module.d.ts +2 -0
- package/dist/modules/favourite/favourite.module.js +27 -0
- package/dist/modules/favourite/favourite.module.js.map +1 -0
- package/dist/modules/favourite/favourite.service.d.ts +13 -0
- package/dist/modules/favourite/favourite.service.js +98 -0
- package/dist/modules/favourite/favourite.service.js.map +1 -0
- package/dist/modules/job/job.controller.js +4 -3
- package/dist/modules/job/job.controller.js.map +1 -1
- package/dist/modules/job/job.entity.d.ts +0 -3
- package/dist/modules/job/job.entity.js +0 -12
- package/dist/modules/job/job.entity.js.map +1 -1
- package/dist/modules/role/dtos/create-role.dto.d.ts +1 -1
- package/dist/modules/role/dtos/role-query.dto.d.ts +3 -0
- package/dist/modules/role/dtos/role-query.dto.js +22 -0
- package/dist/modules/role/dtos/role-query.dto.js.map +1 -1
- package/dist/modules/role/dtos/role.dto.d.ts +3 -0
- package/dist/modules/role/dtos/role.dto.js +18 -0
- package/dist/modules/role/dtos/role.dto.js.map +1 -1
- package/dist/modules/role/dtos/update-role.dto.d.ts +1 -1
- package/dist/modules/role/role.controller.js +6 -0
- package/dist/modules/role/role.controller.js.map +1 -1
- package/dist/modules/role/role.entity.d.ts +3 -0
- package/dist/modules/role/role.entity.js +12 -0
- package/dist/modules/role/role.entity.js.map +1 -1
- package/dist/modules/role/role.mapper.js +6 -0
- package/dist/modules/role/role.mapper.js.map +1 -1
- package/dist/modules/role/role.service.js +15 -0
- package/dist/modules/role/role.service.js.map +1 -1
- package/dist/modules/user/dtos/create-user.dto.d.ts +1 -2
- package/dist/modules/user/dtos/create-user.dto.js +0 -1
- package/dist/modules/user/dtos/create-user.dto.js.map +1 -1
- package/dist/modules/user/dtos/update-user.dto.d.ts +1 -2
- package/dist/modules/user/dtos/update-user.dto.js +1 -9
- package/dist/modules/user/dtos/update-user.dto.js.map +1 -1
- package/dist/modules/user/dtos/user-query.dto.d.ts +1 -1
- package/dist/modules/user/dtos/user-query.dto.js +10 -4
- package/dist/modules/user/dtos/user-query.dto.js.map +1 -1
- package/dist/modules/user/dtos/user.dto.d.ts +0 -2
- package/dist/modules/user/dtos/user.dto.js.map +1 -1
- package/dist/modules/user/user.controller.d.ts +1 -3
- package/dist/modules/user/user.controller.js +6 -22
- package/dist/modules/user/user.controller.js.map +1 -1
- package/dist/modules/user/user.entity.d.ts +0 -2
- package/dist/modules/user/user.entity.js +0 -10
- package/dist/modules/user/user.entity.js.map +1 -1
- package/dist/modules/user/user.mapper.js +0 -16
- package/dist/modules/user/user.mapper.js.map +1 -1
- package/dist/modules/user/user.module.js +1 -5
- package/dist/modules/user/user.module.js.map +1 -1
- package/dist/modules/user-job/user-job.entity.js +2 -1
- package/dist/modules/user-job/user-job.entity.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -79,4 +79,22 @@ __decorate([
|
|
|
79
79
|
(0, class_validator_1.IsOptional)(),
|
|
80
80
|
__metadata("design:type", Array)
|
|
81
81
|
], RoleDTO.prototype, "permissions", void 0);
|
|
82
|
+
__decorate([
|
|
83
|
+
(0, swagger_1.ApiPropertyOptional)({ description: "Level one id/value" }),
|
|
84
|
+
(0, class_validator_1.IsInt)(),
|
|
85
|
+
(0, class_validator_1.IsOptional)(),
|
|
86
|
+
__metadata("design:type", Number)
|
|
87
|
+
], RoleDTO.prototype, "levelOneId", void 0);
|
|
88
|
+
__decorate([
|
|
89
|
+
(0, swagger_1.ApiPropertyOptional)({ description: "Level two id/value" }),
|
|
90
|
+
(0, class_validator_1.IsInt)(),
|
|
91
|
+
(0, class_validator_1.IsOptional)(),
|
|
92
|
+
__metadata("design:type", Number)
|
|
93
|
+
], RoleDTO.prototype, "levelTwoId", void 0);
|
|
94
|
+
__decorate([
|
|
95
|
+
(0, swagger_1.ApiPropertyOptional)({ description: "Level three id/value" }),
|
|
96
|
+
(0, class_validator_1.IsInt)(),
|
|
97
|
+
(0, class_validator_1.IsOptional)(),
|
|
98
|
+
__metadata("design:type", Number)
|
|
99
|
+
], RoleDTO.prototype, "levelThreeId", void 0);
|
|
82
100
|
//# sourceMappingURL=role.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.dto.js","sourceRoot":"","sources":["../../../../src/modules/role/dtos/role.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmE;AACnE,
|
|
1
|
+
{"version":3,"file":"role.dto.js","sourceRoot":"","sources":["../../../../src/modules/role/dtos/role.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAmE;AACnE,qDAMyB;AACzB,2DAAuD;AAGvD,MAAa,OAAQ,SAAQ,kBAAO;CAuEnC;AAvED,0BAuEC;AAhEC;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;AAK9B;IAHC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC1D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;;2CACO;AAKpB;IAHC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC1D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;;2CACO;AAKpB;IAHC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC;IAC5D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;;6CACS"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { RoleDTO } from "./role.dto";
|
|
2
|
-
declare const UpdateRoleDTO_base: import("@nestjs/common").Type<Partial<Omit<RoleDTO, "
|
|
2
|
+
declare const UpdateRoleDTO_base: import("@nestjs/common").Type<Partial<Omit<RoleDTO, "permissions" | "createdAt" | "updatedAt" | "deletedAt">>>;
|
|
3
3
|
export declare class UpdateRoleDTO extends UpdateRoleDTO_base {
|
|
4
4
|
permissions?: number[];
|
|
5
5
|
}
|
|
@@ -55,6 +55,9 @@ let RoleController = RoleController_1 = class RoleController {
|
|
|
55
55
|
"createdBy",
|
|
56
56
|
"updatedAt",
|
|
57
57
|
"updatedBy",
|
|
58
|
+
"levelOneId",
|
|
59
|
+
"levelTwoId",
|
|
60
|
+
"levelThreeId",
|
|
58
61
|
]);
|
|
59
62
|
header_util_1.HeaderUtil.addPaginationHeaders(req.res, count, pageRequest.page, count > (pageRequest.page + 1) * pageRequest.size);
|
|
60
63
|
return rolesDtos;
|
|
@@ -94,6 +97,9 @@ let RoleController = RoleController_1 = class RoleController {
|
|
|
94
97
|
"createdBy",
|
|
95
98
|
"updatedAt",
|
|
96
99
|
"updatedBy",
|
|
100
|
+
"levelOneId",
|
|
101
|
+
"levelTwoId",
|
|
102
|
+
"levelThreeId",
|
|
97
103
|
]);
|
|
98
104
|
}
|
|
99
105
|
async create(dto, user) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAEA,2CAewB;AACxB,qCAAoD;AACpD,6CAKyB;AACzB,iDAA6C;AAC7C,yEAAqE;AACrE,uEAA6D;AAC7D,0EAAiE;AACjE,8DAA0D;AAI1D,8CAA0C;AAC1C,4DAAuD;AACvD,4DAAuD;AACvD,0DAAqD;AAGrD,+CAIuB;AAGvB,yEAAiE;AACjE,uFAAyE;AACzE,2FAA8E;AAC9E,sEAAsE;AACtE,6DAAyD;AACzD,2DAAwE;AAGxE,6EAA0E;AAQnE,IAAM,cAAc,sBAApB,MAAM,cAAc;IAGzB,YACmB,WAAwB,EACxB,iBAAoC,EACpC,aAA4B;QAF5B,gBAAW,GAAX,WAAW,CAAa;QACxB,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,kBAAa,GAAb,aAAa,CAAe;QAL9B,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAMvD,CAAC;IAcE,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,CAC1D,KAAK,EACL,WAAW,CACZ,CAAC;QAEF,MAAM,SAAS,GAAG,IAAA,uCAAyB,EAAC,OAAO,EAAE;YACnD,IAAI;YACJ,QAAQ;YACR,QAAQ;YACR,eAAe;YACf,eAAe;YACf,cAAc;YACd,WAAW;YACX,WAAW;YACX,WAAW;YACX,WAAW;
|
|
1
|
+
{"version":3,"file":"role.controller.js","sourceRoot":"","sources":["../../../src/modules/role/role.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,6 +65,18 @@ __decorate([
|
|
|
65
65
|
}),
|
|
66
66
|
__metadata("design:type", Array)
|
|
67
67
|
], Role.prototype, "users", void 0);
|
|
68
|
+
__decorate([
|
|
69
|
+
(0, typeorm_1.Column)({ name: "level_one_id", type: "int", nullable: true }),
|
|
70
|
+
__metadata("design:type", Number)
|
|
71
|
+
], Role.prototype, "levelOneId", void 0);
|
|
72
|
+
__decorate([
|
|
73
|
+
(0, typeorm_1.Column)({ name: "level_two_id", type: "int", nullable: true }),
|
|
74
|
+
__metadata("design:type", Number)
|
|
75
|
+
], Role.prototype, "levelTwoId", void 0);
|
|
76
|
+
__decorate([
|
|
77
|
+
(0, typeorm_1.Column)({ name: "level_three_id", type: "int", nullable: true }),
|
|
78
|
+
__metadata("design:type", Number)
|
|
79
|
+
], Role.prototype, "levelThreeId", void 0);
|
|
68
80
|
exports.Role = Role = __decorate([
|
|
69
81
|
(0, typeorm_1.Entity)("roles")
|
|
70
82
|
], Role);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../src/modules/role/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,8DAA0D;AAC1D,uEAA6D;AAC7D,qDAA2C;AAGpC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,wBAAU;
|
|
1
|
+
{"version":3,"file":"role.entity.js","sourceRoot":"","sources":["../../../src/modules/role/role.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAgE;AAChE,8DAA0D;AAC1D,uEAA6D;AAC7D,qDAA2C;AAGpC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,wBAAU;CAiDnC,CAAA;AAjDY,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;AAQ3B;IANC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,kBAAI,CAAC;IACtB,IAAA,mBAAS,EAAC;QACT,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE;QAC3D,iBAAiB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE;KACnE,CAAC;;mCACa;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1C;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1C;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC1C;eAhDX,IAAI;IADhB,IAAA,gBAAM,EAAC,OAAO,CAAC;GACH,IAAI,CAiDhB"}
|
|
@@ -16,6 +16,9 @@ const allowedRoleDtoKeys = [
|
|
|
16
16
|
"updatedAt",
|
|
17
17
|
"createdBy",
|
|
18
18
|
"updatedBy",
|
|
19
|
+
"levelOneId",
|
|
20
|
+
"levelTwoId",
|
|
21
|
+
"levelThreeId",
|
|
19
22
|
];
|
|
20
23
|
function mapRoleToRoleDtoSelective(roleOrRoles, keys) {
|
|
21
24
|
const mapSingle = (role) => {
|
|
@@ -40,6 +43,9 @@ const mapCreateRoleDtoToEntity = (dto) => {
|
|
|
40
43
|
role.nameAr = dto.nameAr;
|
|
41
44
|
role.nameEn = dto.nameEn;
|
|
42
45
|
role.isSystemRole = false;
|
|
46
|
+
role.levelOneId = dto.levelOneId;
|
|
47
|
+
role.levelTwoId = dto.levelTwoId;
|
|
48
|
+
role.levelThreeId = dto.levelThreeId;
|
|
43
49
|
if (dto.descriptionAr !== undefined)
|
|
44
50
|
role.descriptionAr = dto.descriptionAr;
|
|
45
51
|
if (dto.descriptionEn !== undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.mapper.js","sourceRoot":"","sources":["../../../src/modules/role/role.mapper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"role.mapper.js","sourceRoot":"","sources":["../../../src/modules/role/role.mapper.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,6 +56,21 @@ let RoleService = class RoleService {
|
|
|
56
56
|
qb.innerJoin("role.users", "user");
|
|
57
57
|
qb.andWhere("user.id = :userId", { userId: query.userId });
|
|
58
58
|
}
|
|
59
|
+
if (query.levelOneId) {
|
|
60
|
+
qb.andWhere("role.levelOneId = :levelOneId", {
|
|
61
|
+
levelOneId: query.levelOneId,
|
|
62
|
+
});
|
|
63
|
+
}
|
|
64
|
+
if (query.levelTwoId) {
|
|
65
|
+
qb.andWhere("role.levelTwoId = :levelTwoId", {
|
|
66
|
+
levelTwoId: query.levelTwoId,
|
|
67
|
+
});
|
|
68
|
+
}
|
|
69
|
+
if (query.levelThreeId) {
|
|
70
|
+
qb.andWhere("role.levelThreeId = :levelThreeId", {
|
|
71
|
+
levelThreeId: query.levelThreeId,
|
|
72
|
+
});
|
|
73
|
+
}
|
|
59
74
|
const sortOrder = pageRequest.sort.asOrder();
|
|
60
75
|
if (sortOrder && Object.keys(sortOrder).length > 0) {
|
|
61
76
|
Object.entries(sortOrder).forEach(([field, direction], index) => {
|
|
@@ -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;AAKjD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAEmB,cAAgC;QAAhC,mBAAc,GAAd,cAAc,CAAkB;IAChD,CAAC;IAGJ,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YACjC,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,SAAS,EAAE,CAAC,aAAa,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,OAA6B;QAC9C,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,OAA8B;QACvC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAGD,KAAK,CAAC,YAAY,CAChB,KAAmB,EACnB,WAAwB;QAExB,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE1D,EAAE,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QACxD,EAAE,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QAEpD,EAAE,CAAC,MAAM,CAAC;YACR,SAAS;YACT,aAAa;YACb,aAAa;YACb,oBAAoB;YACpB,oBAAoB;YACpB,mBAAmB;YACnB,gBAAgB;YAChB,gBAAgB;YAChB,gBAAgB;SACjB,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACnC,EAAE,CAAC,QAAQ,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7D,CAAC;QAGD,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7C,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC9D,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBAChB,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,EAAE,EAAE,SAA2B,CAAC,CAAC;gBAC3D,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,UAAU,CAAC,QAAQ,KAAK,EAAE,EAAE,SAA2B,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YAEN,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YACnC,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC;QAGD,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QAC7C,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAE1B,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;IAC9B,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,MAAY,EAAE,OAAgB;QACvC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;YAC3B,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,MAAY,EAAE,OAAgB;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,MAAY;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;CACF,CAAA;
|
|
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;AAKjD,IAAM,WAAW,GAAjB,MAAM,WAAW;IACtB,YAEmB,cAAgC;QAAhC,mBAAc,GAAd,cAAc,CAAkB;IAChD,CAAC;IAGJ,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC;YACjC,KAAK,EAAE,EAAE,EAAE,EAAE;YACb,SAAS,EAAE,CAAC,aAAa,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;IAGD,KAAK,CAAC,YAAY,CAAC,OAA6B;QAC9C,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,OAA8B;QACvC,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC3C,CAAC;IAGD,KAAK,CAAC,YAAY,CAChB,KAAmB,EACnB,WAAwB;QAExB,MAAM,EAAE,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QAE1D,EAAE,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;QACxD,EAAE,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,QAAQ,CAAC,CAAC;QAEpD,EAAE,CAAC,MAAM,CAAC;YACR,SAAS;YACT,aAAa;YACb,aAAa;YACb,oBAAoB;YACpB,oBAAoB;YACpB,mBAAmB;YACnB,gBAAgB;YAChB,gBAAgB;YAChB,gBAAgB;SACjB,CAAC,CAAC;QAEH,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,EAAE,CAAC,QAAQ,CAAC,uBAAuB,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrE,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACjB,EAAE,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;YACnC,EAAE,CAAC,QAAQ,CAAC,mBAAmB,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,EAAE,CAAC,QAAQ,CAAC,+BAA+B,EAAE;gBAC3C,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;YACrB,EAAE,CAAC,QAAQ,CAAC,+BAA+B,EAAE;gBAC3C,UAAU,EAAE,KAAK,CAAC,UAAU;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,IAAI,KAAK,CAAC,YAAY,EAAE,CAAC;YACvB,EAAE,CAAC,QAAQ,CAAC,mCAAmC,EAAE;gBAC/C,YAAY,EAAE,KAAK,CAAC,YAAY;aACjC,CAAC,CAAC;QACL,CAAC;QAGD,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAC7C,IAAI,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACnD,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,KAAK,EAAE,EAAE;gBAC9D,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;oBAChB,EAAE,CAAC,OAAO,CAAC,QAAQ,KAAK,EAAE,EAAE,SAA2B,CAAC,CAAC;gBAC3D,CAAC;qBAAM,CAAC;oBACN,EAAE,CAAC,UAAU,CAAC,QAAQ,KAAK,EAAE,EAAE,SAA2B,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YAEN,EAAE,CAAC,OAAO,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YACnC,EAAE,CAAC,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC;QAGD,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QAC7C,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAE1B,OAAO,EAAE,CAAC,eAAe,EAAE,CAAC;IAC9B,CAAC;IAGD,KAAK,CAAC,IAAI,CAAC,MAAY,EAAE,OAAgB;QACvC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;YAC3B,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,MAAY,EAAE,OAAgB;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC;QAC7B,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1C,CAAC;IAGD,KAAK,CAAC,MAAM,CAAC,MAAY;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC5C,CAAC;CACF,CAAA;AArHY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,kBAAI,EAAE,iCAAwB,CAAC,CAAA;qCAChB,oBAAU;GAHlC,WAAW,CAqHvB"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { UserDTO } from "./user.dto";
|
|
2
|
-
declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "
|
|
2
|
+
declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "roles" | "id" | "createdAt" | "updatedAt" | "deletedAt">>;
|
|
3
3
|
export declare class CreateUserDTO extends CreateUserDTO_base {
|
|
4
4
|
roles?: number[];
|
|
5
|
-
jobs?: number[];
|
|
6
5
|
}
|
|
7
6
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/create-user.dto.ts"],"names":[],"mappings":";;;AAAA,6CAAwD;AACxD,yCAAqC;AAErC,MAAa,aAAc,SAAQ,IAAA,kBAAQ,EAAC,kBAAO,EAAE;IACnD,IAAI;IACJ,WAAW;IACX,WAAW;IACX,WAAW;IACX,OAAO;
|
|
1
|
+
{"version":3,"file":"create-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/create-user.dto.ts"],"names":[],"mappings":";;;AAAA,6CAAwD;AACxD,yCAAqC;AAErC,MAAa,aAAc,SAAQ,IAAA,kBAAQ,EAAC,kBAAO,EAAE;IACnD,IAAI;IACJ,WAAW;IACX,WAAW;IACX,WAAW;IACX,OAAO;CACC,CAAC;CAEV;AARD,sCAQC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { UserDTO } from "./user.dto";
|
|
2
|
-
declare const UpdateUserDTO_base: import("@nestjs/common").Type<Partial<Omit<UserDTO, "roles"
|
|
2
|
+
declare const UpdateUserDTO_base: import("@nestjs/common").Type<Partial<Omit<UserDTO, "roles">>>;
|
|
3
3
|
export declare class UpdateUserDTO extends UpdateUserDTO_base {
|
|
4
4
|
roles?: number[];
|
|
5
|
-
jobs?: number[];
|
|
6
5
|
}
|
|
7
6
|
export {};
|
|
@@ -14,7 +14,7 @@ const swagger_1 = require("@nestjs/swagger");
|
|
|
14
14
|
const user_dto_1 = require("./user.dto");
|
|
15
15
|
const class_validator_1 = require("class-validator");
|
|
16
16
|
const class_transformer_1 = require("class-transformer");
|
|
17
|
-
class UpdateUserDTO extends (0, swagger_1.PartialType)((0, swagger_1.OmitType)(user_dto_1.UserDTO, ["roles"
|
|
17
|
+
class UpdateUserDTO extends (0, swagger_1.PartialType)((0, swagger_1.OmitType)(user_dto_1.UserDTO, ["roles"])) {
|
|
18
18
|
}
|
|
19
19
|
exports.UpdateUserDTO = UpdateUserDTO;
|
|
20
20
|
__decorate([
|
|
@@ -25,12 +25,4 @@ __decorate([
|
|
|
25
25
|
(0, class_validator_1.IsInt)({ each: true }),
|
|
26
26
|
__metadata("design:type", Array)
|
|
27
27
|
], UpdateUserDTO.prototype, "roles", void 0);
|
|
28
|
-
__decorate([
|
|
29
|
-
(0, swagger_1.ApiPropertyOptional)({ type: [Number], description: "Job IDs to assign" }),
|
|
30
|
-
(0, class_validator_1.IsOptional)(),
|
|
31
|
-
(0, class_validator_1.IsArray)(),
|
|
32
|
-
(0, class_transformer_1.Type)(() => Number),
|
|
33
|
-
(0, class_validator_1.IsInt)({ each: true }),
|
|
34
|
-
__metadata("design:type", Array)
|
|
35
|
-
], UpdateUserDTO.prototype, "jobs", void 0);
|
|
36
28
|
//# sourceMappingURL=update-user.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/update-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA6E;AAC7E,yCAAqC;AACrC,qDAA6D;AAC7D,yDAAyC;AAEzC,MAAa,aAAc,SAAQ,IAAA,qBAAW,EAC5C,IAAA,kBAAQ,EAAC,kBAAO,EAAE,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"update-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/update-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA6E;AAC7E,yCAAqC;AACrC,qDAA6D;AAC7D,yDAAyC;AAEzC,MAAa,aAAc,SAAQ,IAAA,qBAAW,EAC5C,IAAA,kBAAQ,EAAC,kBAAO,EAAE,CAAC,OAAO,CAAU,CAAC,CACtC;CAOA;AATD,sCASC;AADC;IALC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC1E,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,GAAE;IACT,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IAClB,IAAA,uBAAK,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;;4CACL"}
|
|
@@ -39,10 +39,16 @@ __decorate([
|
|
|
39
39
|
__metadata("design:type", Number)
|
|
40
40
|
], UserQueryDTO.prototype, "levelThreeId", void 0);
|
|
41
41
|
__decorate([
|
|
42
|
-
(0, swagger_1.ApiPropertyOptional)({
|
|
43
|
-
|
|
42
|
+
(0, swagger_1.ApiPropertyOptional)({
|
|
43
|
+
description: "Array of role IDs",
|
|
44
|
+
type: [Number],
|
|
45
|
+
example: [1, 2],
|
|
46
|
+
}),
|
|
44
47
|
(0, class_validator_1.IsOptional)(),
|
|
48
|
+
(0, class_transformer_1.Transform)(({ value }) => (Array.isArray(value) ? value : [value])),
|
|
49
|
+
(0, class_validator_1.IsArray)(),
|
|
50
|
+
(0, class_validator_1.IsInt)({ each: true }),
|
|
45
51
|
(0, class_transformer_1.Type)(() => Number),
|
|
46
|
-
__metadata("design:type",
|
|
47
|
-
], UserQueryDTO.prototype, "
|
|
52
|
+
__metadata("design:type", Array)
|
|
53
|
+
], UserQueryDTO.prototype, "roleId", void 0);
|
|
48
54
|
//# sourceMappingURL=user-query.dto.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user-query.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsD;AACtD,mEAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"user-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user-query.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAAsD;AACtD,mEAA+D;AAC/D,qDAA6D;AAC7D,yDAAoD;AAEpD,MAAa,YAAa,SAAQ,0BAAW;CA8B5C;AA9BD,oCA8BC;AAzBC;IAJC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC1D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;gDACC;AAMpB;IAJC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,oBAAoB,EAAE,CAAC;IAC1D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;gDACC;AAMpB;IAJC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,sBAAsB,EAAE,CAAC;IAC5D,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;kDACG;AAYtB;IAVC,IAAA,6BAAmB,EAAC;QACnB,WAAW,EAAE,mBAAmB;QAChC,IAAI,EAAE,CAAC,MAAM,CAAC;QACd,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;KAChB,CAAC;IACD,IAAA,4BAAU,GAAE;IACZ,IAAA,6BAAS,EAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAClE,IAAA,yBAAO,GAAE;IACT,IAAA,uBAAK,EAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACrB,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;4CACD"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { BaseDTO } from "../../../core/utils/base.dto";
|
|
2
2
|
import { RoleDTO } from "../../../modules/role/dtos/role.dto";
|
|
3
|
-
import { JobDTO } from "../../../modules/job/dtos/job.dto";
|
|
4
3
|
export declare class UserDTO extends BaseDTO {
|
|
5
4
|
email?: string;
|
|
6
5
|
password?: string;
|
|
@@ -17,5 +16,4 @@ export declare class UserDTO extends BaseDTO {
|
|
|
17
16
|
levelTwoId?: number;
|
|
18
17
|
levelThreeId?: number;
|
|
19
18
|
roles?: RoleDTO[];
|
|
20
|
-
jobs?: JobDTO[];
|
|
21
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qDAMyB;AACzB,yDAA4C;AAC5C,2DAAuD;
|
|
1
|
+
{"version":3,"file":"user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user.dto.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,11 @@ import type { Request } from "../../core/utils/request";
|
|
|
7
7
|
import { UserQueryDTO } from "../user/dtos/user-query.dto";
|
|
8
8
|
import { CreateUserDTO } from "./dtos/create-user.dto";
|
|
9
9
|
import { RoleService } from "../role/role.service";
|
|
10
|
-
import { JobService } from "../job/job.service";
|
|
11
10
|
export declare class UserController {
|
|
12
11
|
private readonly userService;
|
|
13
12
|
private readonly roleService;
|
|
14
|
-
private readonly jobService;
|
|
15
13
|
logger: Logger;
|
|
16
|
-
constructor(userService: UserService, roleService: RoleService
|
|
14
|
+
constructor(userService: UserService, roleService: RoleService);
|
|
17
15
|
getAllUsers(req: Request, query: UserQueryDTO): Promise<Partial<UserDTO>[]>;
|
|
18
16
|
getUserById(id: number): Promise<UserDTO>;
|
|
19
17
|
create(createUserDTO: CreateUserDTO, user: User): Promise<UserDTO>;
|
|
@@ -31,12 +31,10 @@ const user_permission_1 = require("../../core/enums/user-permission");
|
|
|
31
31
|
const create_user_dto_1 = require("./dtos/create-user.dto");
|
|
32
32
|
const permission_guard_1 = require("../../security/guards/permission.guard");
|
|
33
33
|
const role_service_1 = require("../role/role.service");
|
|
34
|
-
const job_service_1 = require("../job/job.service");
|
|
35
34
|
let UserController = class UserController {
|
|
36
|
-
constructor(userService, roleService
|
|
35
|
+
constructor(userService, roleService) {
|
|
37
36
|
this.userService = userService;
|
|
38
37
|
this.roleService = roleService;
|
|
39
|
-
this.jobService = jobService;
|
|
40
38
|
this.logger = new common_1.Logger("UsersController");
|
|
41
39
|
}
|
|
42
40
|
async getAllUsers(req, query) {
|
|
@@ -50,8 +48,10 @@ let UserController = class UserController {
|
|
|
50
48
|
if (query.levelThreeId) {
|
|
51
49
|
whereConditions.levelThreeId = query.levelThreeId;
|
|
52
50
|
}
|
|
53
|
-
if (query.
|
|
54
|
-
whereConditions.
|
|
51
|
+
if (query.roleId) {
|
|
52
|
+
whereConditions.roles = {
|
|
53
|
+
id: (0, typeorm_1.In)(query.roleId),
|
|
54
|
+
};
|
|
55
55
|
}
|
|
56
56
|
const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
|
|
57
57
|
const [results, count] = await this.userService.findAndCount({
|
|
@@ -88,14 +88,6 @@ let UserController = class UserController {
|
|
|
88
88
|
throw new common_1.BadRequestException("One or more roles do not exist");
|
|
89
89
|
}
|
|
90
90
|
}
|
|
91
|
-
if (createUserDTO.jobs?.length) {
|
|
92
|
-
const jobs = await this.jobService.find({
|
|
93
|
-
where: { id: (0, typeorm_1.In)(createUserDTO.jobs) },
|
|
94
|
-
});
|
|
95
|
-
if (jobs.length !== createUserDTO.jobs.length) {
|
|
96
|
-
throw new common_1.BadRequestException("One or more jobs do not exist");
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
91
|
const createUserEntity = (0, user_mapper_1.mapCreateUserDtoToEntity)(createUserDTO);
|
|
100
92
|
const created = await this.userService.save(createUserEntity, user?.email, true);
|
|
101
93
|
return (0, user_mapper_1.mapUserToUserDtoSelective)(created);
|
|
@@ -123,13 +115,6 @@ let UserController = class UserController {
|
|
|
123
115
|
throw new common_1.BadRequestException("One or more roles do not exist");
|
|
124
116
|
}
|
|
125
117
|
}
|
|
126
|
-
if (Array.isArray(userDTO.jobs)) {
|
|
127
|
-
const jobIds = userDTO.jobs.map((j) => typeof j === "number" ? j : j?.id);
|
|
128
|
-
const jobs = await this.jobService.find({ where: { id: (0, typeorm_1.In)(jobIds) } });
|
|
129
|
-
if (jobs.length !== jobIds.length) {
|
|
130
|
-
throw new common_1.BadRequestException("One or more jobs do not exist");
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
118
|
const updateUserEntity = (0, user_mapper_1.mapUpdateUserDtoToEntity)(userDTO, existing);
|
|
134
119
|
const updated = await this.userService.update(updateUserEntity, authUser?.email);
|
|
135
120
|
return (0, user_mapper_1.mapUserToUserDtoSelective)(updated);
|
|
@@ -228,7 +213,6 @@ exports.UserController = UserController = __decorate([
|
|
|
228
213
|
(0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, permission_guard_1.PermissionsGuard),
|
|
229
214
|
(0, swagger_1.ApiTags)("users-module"),
|
|
230
215
|
__metadata("design:paramtypes", [user_service_1.UserService,
|
|
231
|
-
role_service_1.RoleService
|
|
232
|
-
job_service_1.JobService])
|
|
216
|
+
role_service_1.RoleService])
|
|
233
217
|
], UserController);
|
|
234
218
|
//# sourceMappingURL=user.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../../src/modules/user/user.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAcwB;AACxB,iDAA6C;AAC7C,6CAKyB;AACzB,oDAAgD;AAChD,+CAAqC;AACrC,qCAAsD;AACtD,yEAAiE;AACjE,kEAA6D;AAC7D,0EAAiE;AACjE,8DAA0D;AAC1D,uFAAyE;AAEzE,gEAA2D;AAC3D,+CAIuB;AACvB,2FAA8E;AAC9E,sEAAsE;AACtE,4DAAuD;AACvD,6EAA0E;AAC1E,uDAAmD;
|
|
1
|
+
{"version":3,"file":"user.controller.js","sourceRoot":"","sources":["../../../src/modules/user/user.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import "reflect-metadata";
|
|
2
2
|
import { BaseEntity } from "../../core/utils/base.entity";
|
|
3
3
|
import { Role } from "../role/role.entity";
|
|
4
|
-
import { Job } from "../job/job.entity";
|
|
5
4
|
export declare class User extends BaseEntity {
|
|
6
5
|
name?: string;
|
|
7
6
|
shortName?: string;
|
|
@@ -15,7 +14,6 @@ export declare class User extends BaseEntity {
|
|
|
15
14
|
imageUrl?: string;
|
|
16
15
|
resetPasswordRequest?: boolean;
|
|
17
16
|
roles?: Role[];
|
|
18
|
-
jobs?: Job[];
|
|
19
17
|
levelOneId?: number;
|
|
20
18
|
levelTwoId?: number;
|
|
21
19
|
levelThreeId?: number;
|
|
@@ -15,7 +15,6 @@ const typeorm_1 = require("typeorm");
|
|
|
15
15
|
const class_transformer_1 = require("class-transformer");
|
|
16
16
|
const base_entity_1 = require("../../core/utils/base.entity");
|
|
17
17
|
const role_entity_1 = require("../role/role.entity");
|
|
18
|
-
const job_entity_1 = require("../job/job.entity");
|
|
19
18
|
let User = class User extends base_entity_1.BaseEntity {
|
|
20
19
|
constructor() {
|
|
21
20
|
super(...arguments);
|
|
@@ -78,15 +77,6 @@ __decorate([
|
|
|
78
77
|
}),
|
|
79
78
|
__metadata("design:type", Array)
|
|
80
79
|
], User.prototype, "roles", void 0);
|
|
81
|
-
__decorate([
|
|
82
|
-
(0, typeorm_1.ManyToMany)(() => job_entity_1.Job),
|
|
83
|
-
(0, typeorm_1.JoinTable)({
|
|
84
|
-
name: "user_jobs",
|
|
85
|
-
joinColumn: { name: "user_id", referencedColumnName: "id" },
|
|
86
|
-
inverseJoinColumn: { name: "job_id", referencedColumnName: "id" },
|
|
87
|
-
}),
|
|
88
|
-
__metadata("design:type", Array)
|
|
89
|
-
], User.prototype, "jobs", void 0);
|
|
90
80
|
__decorate([
|
|
91
81
|
(0, typeorm_1.Column)({ name: "level_one_id", type: "int", nullable: true }),
|
|
92
82
|
__metadata("design:type", Number)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/modules/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAC1B,
|
|
1
|
+
{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/modules/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAC1B,qCAAgE;AAChE,yDAA4C;AAC5C,8DAA0D;AAE1D,qDAA2C;AAGpC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,wBAAU;IAA7B;;QA0BL,cAAS,GAAa,KAAK,CAAC;QAM5B,yBAAoB,GAAa,KAAK,CAAC;IAkBzC,CAAC;CAAA,CAAA;AAlDY,oBAAI;AAEf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kCAC9B;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAC7C;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mCAC7B;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC7C;AAEpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC7C;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mCAC3C;AAIf;IAFC,IAAA,2BAAO,GAAE;IACT,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC1B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC1B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;uCACjC;AAG5B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;sCAC7C;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;;kDACrC;AAQvC;IANC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,kBAAI,CAAC;IACtB,IAAA,mBAAS,EAAC;QACT,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE;QAC3D,iBAAiB,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE;KACnE,CAAC;;mCACa;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1C;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC1C;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CAC1C;eAjDX,IAAI;IADhB,IAAA,gBAAM,EAAC,OAAO,CAAC;GACH,IAAI,CAkDhB"}
|
|
@@ -5,7 +5,6 @@ exports.mapUserToUserDtoSelective = mapUserToUserDtoSelective;
|
|
|
5
5
|
exports.mapUserToUserDtoWithModules = mapUserToUserDtoWithModules;
|
|
6
6
|
const user_entity_1 = require("./user.entity");
|
|
7
7
|
const role_entity_1 = require("../role/role.entity");
|
|
8
|
-
const job_entity_1 = require("../job/job.entity");
|
|
9
8
|
const allowedUserDtoKeys = [
|
|
10
9
|
"id",
|
|
11
10
|
"createdAt",
|
|
@@ -14,7 +13,6 @@ const allowedUserDtoKeys = [
|
|
|
14
13
|
"activated",
|
|
15
14
|
"imageUrl",
|
|
16
15
|
"roles",
|
|
17
|
-
"jobs",
|
|
18
16
|
"name",
|
|
19
17
|
"shortName",
|
|
20
18
|
"emailEvara",
|
|
@@ -63,13 +61,6 @@ const mapCreateUserDtoToEntity = (dto) => {
|
|
|
63
61
|
return role;
|
|
64
62
|
});
|
|
65
63
|
}
|
|
66
|
-
if (dto.jobs?.length) {
|
|
67
|
-
user.jobs = dto.jobs.map((jobId) => {
|
|
68
|
-
const job = new job_entity_1.Job();
|
|
69
|
-
job.id = jobId;
|
|
70
|
-
return job;
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
64
|
return user;
|
|
74
65
|
};
|
|
75
66
|
exports.mapCreateUserDtoToEntity = mapCreateUserDtoToEntity;
|
|
@@ -109,13 +100,6 @@ const mapUpdateUserDtoToEntity = (dto, user) => {
|
|
|
109
100
|
return role;
|
|
110
101
|
});
|
|
111
102
|
}
|
|
112
|
-
if (Array.isArray(dto.jobs)) {
|
|
113
|
-
user.jobs = dto.jobs.map((jobDto) => {
|
|
114
|
-
const job = new job_entity_1.Job();
|
|
115
|
-
job.id = typeof jobDto === "number" ? jobDto : jobDto.id;
|
|
116
|
-
return job;
|
|
117
|
-
});
|
|
118
|
-
}
|
|
119
103
|
return user;
|
|
120
104
|
};
|
|
121
105
|
exports.mapUpdateUserDtoToEntity = mapUpdateUserDtoToEntity;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.mapper.js","sourceRoot":"","sources":["../../../src/modules/user/user.mapper.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"user.mapper.js","sourceRoot":"","sources":["../../../src/modules/user/user.mapper.ts"],"names":[],"mappings":"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"}
|