@evara-group/guard 3.0.21 → 3.0.23
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/{1765027603465-CreateUserTable.d.ts → 1770022397569-AlterRoleTable.d.ts} +1 -1
- package/dist/database/migrations/{1768190400000-AddUserLevelsColumns.js → 1770022397569-AlterRoleTable.js} +5 -5
- 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/dtos/job-query.dto.d.ts +4 -3
- package/dist/modules/job/dtos/job-query.dto.js +40 -0
- package/dist/modules/job/dtos/job-query.dto.js.map +1 -1
- package/dist/modules/job/job.controller.js +13 -9
- 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 +6 -13
- package/dist/modules/job/job.entity.js.map +1 -1
- package/dist/modules/module/module.module.js +3 -3
- package/dist/modules/module/module.module.js.map +1 -1
- package/dist/modules/permission/permission.module.js +2 -2
- package/dist/modules/permission/permission.module.js.map +1 -1
- package/dist/modules/role/dtos/role-query.dto.d.ts +4 -0
- package/dist/modules/role/dtos/role-query.dto.js +28 -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/role.controller.js +6 -0
- package/dist/modules/role/role.controller.js.map +1 -1
- package/dist/modules/role/role.entity.d.ts +5 -0
- package/dist/modules/role/role.entity.js +22 -0
- package/dist/modules/role/role.entity.js.map +1 -1
- package/dist/modules/role/role.mapper.js +3 -0
- package/dist/modules/role/role.mapper.js.map +1 -1
- package/dist/modules/role/role.module.js +2 -2
- package/dist/modules/role/role.module.js.map +1 -1
- package/dist/modules/role/role.service.js +19 -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 +4 -0
- package/dist/modules/user/dtos/user-query.dto.js +46 -0
- 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 +18 -21
- 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 +3 -7
- 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
- package/dist/core/database/switch.schema.d.ts +0 -6
- package/dist/core/database/switch.schema.js +0 -39
- package/dist/core/database/switch.schema.js.map +0 -1
- package/dist/core/utils/guard-base.entity.d.ts +0 -10
- package/dist/core/utils/guard-base.entity.js +0 -46
- package/dist/core/utils/guard-base.entity.js.map +0 -1
- package/dist/core/utils/user-populate.d.ts +0 -0
- package/dist/core/utils/user-populate.js +0 -2
- package/dist/core/utils/user-populate.js.map +0 -1
- package/dist/database/migrations/1765027603465-CreateUserTable.js +0 -63
- package/dist/database/migrations/1765027603465-CreateUserTable.js.map +0 -1
- package/dist/database/migrations/1768190400000-AddUserLevelsColumns.d.ts +0 -6
- package/dist/database/migrations/1768190400000-AddUserLevelsColumns.js.map +0 -1
- package/dist/database/seeders/auth.seeder.d.ts +0 -12
- package/dist/database/seeders/auth.seeder.js +0 -338
- package/dist/database/seeders/auth.seeder.js.map +0 -1
- package/dist/dev-server.d.ts +0 -1
- package/dist/dev-server.js +0 -72
- package/dist/dev-server.js.map +0 -1
- package/dist/modules/auth/auth.module-definition.d.ts +0 -2
- package/dist/modules/auth/auth.module-definition.js +0 -11
- package/dist/modules/auth/auth.module-definition.js.map +0 -1
- package/dist/modules/duty/dtos/create-duty.dto.d.ts +0 -5
- package/dist/modules/duty/dtos/create-duty.dto.js +0 -14
- package/dist/modules/duty/dtos/create-duty.dto.js.map +0 -1
- package/dist/modules/duty/dtos/duty-query.dto.d.ts +0 -3
- package/dist/modules/duty/dtos/duty-query.dto.js +0 -8
- package/dist/modules/duty/dtos/duty-query.dto.js.map +0 -1
- package/dist/modules/duty/dtos/duty.dto.d.ts +0 -9
- package/dist/modules/duty/dtos/duty.dto.js +0 -55
- package/dist/modules/duty/dtos/duty.dto.js.map +0 -1
- package/dist/modules/duty/dtos/update-duty.dto.d.ts +0 -5
- package/dist/modules/duty/dtos/update-duty.dto.js +0 -9
- package/dist/modules/duty/dtos/update-duty.dto.js.map +0 -1
- package/dist/modules/duty/duty.controller.d.ts +0 -16
- package/dist/modules/duty/duty.controller.js +0 -186
- package/dist/modules/duty/duty.controller.js.map +0 -1
- package/dist/modules/duty/duty.entity.d.ts +0 -9
- package/dist/modules/duty/duty.entity.js +0 -49
- package/dist/modules/duty/duty.entity.js.map +0 -1
- package/dist/modules/duty/duty.mapper.d.ts +0 -7
- package/dist/modules/duty/duty.mapper.js +0 -45
- package/dist/modules/duty/duty.mapper.js.map +0 -1
- package/dist/modules/duty/duty.module.d.ts +0 -2
- package/dist/modules/duty/duty.module.js +0 -33
- package/dist/modules/duty/duty.module.js.map +0 -1
- package/dist/modules/duty/duty.service.d.ts +0 -13
- package/dist/modules/duty/duty.service.js +0 -60
- package/dist/modules/duty/duty.service.js.map +0 -1
- package/dist/modules/job-duty/job-duty.entity.d.ts +0 -7
- package/dist/modules/job-duty/job-duty.entity.js +0 -33
- package/dist/modules/job-duty/job-duty.entity.js.map +0 -1
- package/dist/modules/user/user.module-definition.d.ts +0 -5
- package/dist/modules/user/user.module-definition.js +0 -9
- package/dist/modules/user/user.module-definition.js.map +0 -1
- package/dist/modules/user-permission/user-permission.controller.d.ts +0 -2
- package/dist/modules/user-permission/user-permission.controller.js +0 -17
- package/dist/modules/user-permission/user-permission.controller.js.map +0 -1
- package/dist/modules/user-role/dtos/create-user-role.dto.d.ts +0 -5
- package/dist/modules/user-role/dtos/create-user-role.dto.js +0 -14
- package/dist/modules/user-role/dtos/create-user-role.dto.js.map +0 -1
- package/dist/modules/user-role/dtos/update-user-role.dto.d.ts +0 -5
- package/dist/modules/user-role/dtos/update-user-role.dto.js +0 -9
- package/dist/modules/user-role/dtos/update-user-role.dto.js.map +0 -1
- package/dist/modules/user-role/dtos/user-role-query.dto.d.ts +0 -3
- package/dist/modules/user-role/dtos/user-role-query.dto.js +0 -8
- package/dist/modules/user-role/dtos/user-role-query.dto.js.map +0 -1
- package/dist/modules/user-role/dtos/user-role.dto.d.ts +0 -7
- package/dist/modules/user-role/dtos/user-role.dto.js +0 -28
- package/dist/modules/user-role/dtos/user-role.dto.js.map +0 -1
- package/dist/modules/user-role/user-role.controller.d.ts +0 -0
- package/dist/modules/user-role/user-role.controller.js +0 -2
- package/dist/modules/user-role/user-role.controller.js.map +0 -1
- package/dist/modules/user-role/user-role.entity.d.ts +0 -0
- package/dist/modules/user-role/user-role.entity.js +0 -2
- package/dist/modules/user-role/user-role.entity.js.map +0 -1
- package/dist/modules/user-role/user-role.mapper.d.ts +0 -0
- package/dist/modules/user-role/user-role.mapper.js +0 -2
- package/dist/modules/user-role/user-role.mapper.js.map +0 -1
- package/dist/modules/user-role/user-role.module.d.ts +0 -0
- package/dist/modules/user-role/user-role.module.js +0 -2
- package/dist/modules/user-role/user-role.module.js.map +0 -1
- package/dist/modules/user-role/user-role.service.d.ts +0 -0
- package/dist/modules/user-role/user-role.service.js +0 -2
- package/dist/modules/user-role/user-role.service.js.map +0 -1
- package/dist/security/decorators/roles.decorator.d.ts +0 -2
- package/dist/security/decorators/roles.decorator.js +0 -7
- package/dist/security/decorators/roles.decorator.js.map +0 -1
- package/dist/security/guards/roles.guard.d.ts +0 -9
- package/dist/security/guards/roles.guard.js +0 -59
- package/dist/security/guards/roles.guard.js.map +0 -1
- package/dist/security/password-util.d.ts +0 -3
- package/dist/security/password-util.js +0 -44
- package/dist/security/password-util.js.map +0 -1
- package/dist/seeders/auth.seeder.d.ts +0 -12
- package/dist/seeders/auth.seeder.js +0 -404
- package/dist/seeders/auth.seeder.js.map +0 -1
- package/dist/seeders/modules.seeder.d.ts +0 -6
- package/dist/seeders/modules.seeder.js +0 -53
- package/dist/seeders/modules.seeder.js.map +0 -1
- package/dist/seeders/orchestrator.seeder.d.ts +0 -6
- package/dist/seeders/orchestrator.seeder.js +0 -32
- package/dist/seeders/orchestrator.seeder.js.map +0 -1
- package/dist/seeders/permissions.seeder.d.ts +0 -6
- package/dist/seeders/permissions.seeder.js +0 -51
- package/dist/seeders/permissions.seeder.js.map +0 -1
- package/dist/seeders/role-permissions.seeder.d.ts +0 -6
- package/dist/seeders/role-permissions.seeder.js +0 -65
- package/dist/seeders/role-permissions.seeder.js.map +0 -1
- package/dist/seeders/roles.seeder.d.ts +0 -6
- package/dist/seeders/roles.seeder.js +0 -57
- package/dist/seeders/roles.seeder.js.map +0 -1
- package/dist/seeders/run.seeder.d.ts +0 -1
- package/dist/seeders/run.seeder.js +0 -82
- package/dist/seeders/run.seeder.js.map +0 -1
- package/dist/seeders/user/data.d.ts +0 -2
- package/dist/seeders/user/data.js +0 -16
- package/dist/seeders/user/data.js.map +0 -1
- package/dist/seeders/user/user-seeder.module.d.ts +0 -2
- package/dist/seeders/user/user-seeder.module.js +0 -24
- package/dist/seeders/user/user-seeder.module.js.map +0 -1
- package/dist/seeders/user/user-seeder.service.d.ts +0 -7
- package/dist/seeders/user/user-seeder.service.js +0 -51
- package/dist/seeders/user/user-seeder.service.js.map +0 -1
- package/dist/seeders/user-roles.seeder.d.ts +0 -6
- package/dist/seeders/user-roles.seeder.js +0 -44
- package/dist/seeders/user-roles.seeder.js.map +0 -1
- package/dist/seeders/users.seeder.d.ts +0 -6
- package/dist/seeders/users.seeder.js +0 -93
- package/dist/seeders/users.seeder.js.map +0 -1
- package/dist/tenant-db/config/tenant-db.config.d.ts +0 -4
- package/dist/tenant-db/config/tenant-db.config.js +0 -18
- package/dist/tenant-db/config/tenant-db.config.js.map +0 -1
- package/dist/tenant-db/context/tenant-db.context.d.ts +0 -11
- package/dist/tenant-db/context/tenant-db.context.js +0 -46
- package/dist/tenant-db/context/tenant-db.context.js.map +0 -1
- package/dist/tenant-db/helpers/tenant-db.helpers.d.ts +0 -13
- package/dist/tenant-db/helpers/tenant-db.helpers.js +0 -42
- package/dist/tenant-db/helpers/tenant-db.helpers.js.map +0 -1
- package/dist/tenant-db/manager/tenant-db.manager.d.ts +0 -20
- package/dist/tenant-db/manager/tenant-db.manager.js +0 -135
- package/dist/tenant-db/manager/tenant-db.manager.js.map +0 -1
- package/dist/tenant-db/middleware/tenant-db.middleware.d.ts +0 -13
- package/dist/tenant-db/middleware/tenant-db.middleware.js +0 -46
- package/dist/tenant-db/middleware/tenant-db.middleware.js.map +0 -1
- package/dist/tenant-db/module/tenant=db-module.d.ts +0 -10
- package/dist/tenant-db/module/tenant=db-module.js +0 -53
- package/dist/tenant-db/module/tenant=db-module.js.map +0 -1
- package/dist/tenant-db/resolvers/tenant.resolver.d.ts +0 -9
- package/dist/tenant-db/resolvers/tenant.resolver.js +0 -42
- package/dist/tenant-db/resolvers/tenant.resolver.js.map +0 -1
- package/dist/tenant-db/service/tenant-db.service.d.ts +0 -14
- package/dist/tenant-db/service/tenant-db.service.js +0 -62
- package/dist/tenant-db/service/tenant-db.service.js.map +0 -1
- package/dist/tenant-db/tenant-cache.d.ts +0 -10
- package/dist/tenant-db/tenant-cache.js +0 -17
- package/dist/tenant-db/tenant-cache.js.map +0 -1
- package/dist/tenant-db/types/tenant-db.types.d.ts +0 -29
- package/dist/tenant-db/types/tenant-db.types.js +0 -3
- package/dist/tenant-db/types/tenant-db.types.js.map +0 -1
|
@@ -31,21 +31,34 @@ 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) {
|
|
41
|
+
const whereConditions = {};
|
|
42
|
+
if (query.levelOneId) {
|
|
43
|
+
whereConditions.levelOneId = query.levelOneId;
|
|
44
|
+
}
|
|
45
|
+
if (query.levelTwoId) {
|
|
46
|
+
whereConditions.levelTwoId = query.levelTwoId;
|
|
47
|
+
}
|
|
48
|
+
if (query.levelThreeId) {
|
|
49
|
+
whereConditions.levelThreeId = query.levelThreeId;
|
|
50
|
+
}
|
|
51
|
+
if (query.roleId) {
|
|
52
|
+
whereConditions.roles = {
|
|
53
|
+
id: (0, typeorm_1.In)(query.roleId),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
43
56
|
const pageRequest = new pagination_entity_1.PageRequest(+(query.page ?? 1), +(query.pageSize ?? 10), query.sortField ? `${query.sortField},${query.sortOrder || "ASC"}` : "");
|
|
44
57
|
const [results, count] = await this.userService.findAndCount({
|
|
45
58
|
skip: +pageRequest.page * pageRequest.size,
|
|
46
59
|
take: +pageRequest.size,
|
|
47
60
|
order: pageRequest.sort.asOrder(),
|
|
48
|
-
|
|
61
|
+
where: whereConditions,
|
|
49
62
|
});
|
|
50
63
|
const userDtos = (0, user_mapper_1.mapUserToUserDtoSelective)(results);
|
|
51
64
|
header_util_1.HeaderUtil.addPaginationHeaders(req.res, count, pageRequest.page, count > pageRequest.page * pageRequest.size);
|
|
@@ -75,14 +88,6 @@ let UserController = class UserController {
|
|
|
75
88
|
throw new common_1.BadRequestException("One or more roles do not exist");
|
|
76
89
|
}
|
|
77
90
|
}
|
|
78
|
-
if (createUserDTO.jobs?.length) {
|
|
79
|
-
const jobs = await this.jobService.find({
|
|
80
|
-
where: { id: (0, typeorm_1.In)(createUserDTO.jobs) },
|
|
81
|
-
});
|
|
82
|
-
if (jobs.length !== createUserDTO.jobs.length) {
|
|
83
|
-
throw new common_1.BadRequestException("One or more jobs do not exist");
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
91
|
const createUserEntity = (0, user_mapper_1.mapCreateUserDtoToEntity)(createUserDTO);
|
|
87
92
|
const created = await this.userService.save(createUserEntity, user?.email, true);
|
|
88
93
|
return (0, user_mapper_1.mapUserToUserDtoSelective)(created);
|
|
@@ -110,13 +115,6 @@ let UserController = class UserController {
|
|
|
110
115
|
throw new common_1.BadRequestException("One or more roles do not exist");
|
|
111
116
|
}
|
|
112
117
|
}
|
|
113
|
-
if (Array.isArray(userDTO.jobs)) {
|
|
114
|
-
const jobIds = userDTO.jobs.map((j) => typeof j === "number" ? j : j?.id);
|
|
115
|
-
const jobs = await this.jobService.find({ where: { id: (0, typeorm_1.In)(jobIds) } });
|
|
116
|
-
if (jobs.length !== jobIds.length) {
|
|
117
|
-
throw new common_1.BadRequestException("One or more jobs do not exist");
|
|
118
|
-
}
|
|
119
|
-
}
|
|
120
118
|
const updateUserEntity = (0, user_mapper_1.mapUpdateUserDtoToEntity)(userDTO, existing);
|
|
121
119
|
const updated = await this.userService.update(updateUserEntity, authUser?.email);
|
|
122
120
|
return (0, user_mapper_1.mapUserToUserDtoSelective)(updated);
|
|
@@ -215,7 +213,6 @@ exports.UserController = UserController = __decorate([
|
|
|
215
213
|
(0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, permission_guard_1.PermissionsGuard),
|
|
216
214
|
(0, swagger_1.ApiTags)("users-module"),
|
|
217
215
|
__metadata("design:paramtypes", [user_service_1.UserService,
|
|
218
|
-
role_service_1.RoleService
|
|
219
|
-
job_service_1.JobService])
|
|
216
|
+
role_service_1.RoleService])
|
|
220
217
|
], UserController);
|
|
221
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,
|
|
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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"}
|
|
@@ -8,25 +8,21 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.UserModule = void 0;
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
|
-
const core_1 = require("@nestjs/core");
|
|
12
11
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
13
12
|
const user_entity_1 = require("./user.entity");
|
|
14
13
|
const user_service_1 = require("./user.service");
|
|
15
14
|
const common_2 = require("../../common");
|
|
16
15
|
const user_controller_1 = require("./user.controller");
|
|
17
16
|
const permission_guard_1 = require("../../security/guards/permission.guard");
|
|
18
|
-
const
|
|
17
|
+
const core_1 = require("@nestjs/core");
|
|
19
18
|
let UserModule = class UserModule {
|
|
20
19
|
};
|
|
21
20
|
exports.UserModule = UserModule;
|
|
22
21
|
exports.UserModule = UserModule = __decorate([
|
|
23
22
|
(0, common_1.Module)({
|
|
24
|
-
imports: [
|
|
25
|
-
typeorm_1.TypeOrmModule.forFeature([user_entity_1.User], common_2.AUTH_DATABASE_CONNECTION),
|
|
26
|
-
(0, common_1.forwardRef)(() => job_module_1.JobModule),
|
|
27
|
-
],
|
|
23
|
+
imports: [typeorm_1.TypeOrmModule.forFeature([user_entity_1.User], common_2.AUTH_DATABASE_CONNECTION)],
|
|
28
24
|
controllers: [user_controller_1.UserController],
|
|
29
|
-
providers: [user_service_1.UserService,
|
|
25
|
+
providers: [user_service_1.UserService, permission_guard_1.PermissionsGuard, core_1.Reflector],
|
|
30
26
|
exports: [user_service_1.UserService, typeorm_1.TypeOrmModule],
|
|
31
27
|
})
|
|
32
28
|
], UserModule);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../src/modules/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../src/modules/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAoD;AACpD,6CAAgD;AAChD,+CAAqC;AACrC,iDAA6C;AAC7C,yCAAwD;AACxD,uDAAmD;AACnD,6EAA0E;AAC1E,uCAAyC;AAWlC,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IANtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE,CAAC,uBAAa,CAAC,UAAU,CAAC,CAAC,kBAAI,CAAC,EAAE,iCAAwB,CAAC,CAAC;QACrE,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,0BAAW,EAAE,mCAAgB,EAAE,gBAAS,CAAC;QACrD,OAAO,EAAE,CAAC,0BAAW,EAAE,uBAAa,CAAC;KACtC,CAAC;GACW,UAAU,CAAG"}
|
|
@@ -8,6 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
+
var _a;
|
|
11
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
13
|
exports.UserJob = void 0;
|
|
13
14
|
const typeorm_1 = require("typeorm");
|
|
@@ -25,7 +26,7 @@ __decorate([
|
|
|
25
26
|
__decorate([
|
|
26
27
|
(0, typeorm_1.ManyToOne)(() => job_entity_1.Job, { onDelete: "CASCADE" }),
|
|
27
28
|
(0, typeorm_1.JoinColumn)({ name: "job_id" }),
|
|
28
|
-
__metadata("design:type", job_entity_1.Job)
|
|
29
|
+
__metadata("design:type", typeof (_a = typeof job_entity_1.Job !== "undefined" && job_entity_1.Job) === "function" ? _a : Object)
|
|
29
30
|
], UserJob.prototype, "job", void 0);
|
|
30
31
|
exports.UserJob = UserJob = __decorate([
|
|
31
32
|
(0, typeorm_1.Entity)("user_jobs")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-job.entity.js","sourceRoot":"","sources":["../../../src/modules/user-job/user-job.entity.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"user-job.entity.js","sourceRoot":"","sources":["../../../src/modules/user-job/user-job.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCAAwD;AACxD,8DAA0D;AAC1D,qDAA2C;AAC3C,kDAAwC;AAGjC,IAAM,OAAO,GAAb,MAAM,OAAQ,SAAQ,wBAAU;CAQtC,CAAA;AARY,0BAAO;AAGlB;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,kBAAI,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC9C,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;8BACzB,kBAAI;qCAAC;AAIZ;IAFC,IAAA,mBAAS,EAAC,GAAG,EAAE,CAAC,gBAAG,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;IAC7C,IAAA,oBAAU,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;kDACzB,gBAAG,oBAAH,gBAAG;oCAAC;kBAPC,OAAO;IADnB,IAAA,gBAAM,EAAC,WAAW,CAAC;GACP,OAAO,CAQnB"}
|