@evara-group/guard 3.0.20 → 3.0.22

package/dist/modules/role/role.entity.js

@@ -13,6 +13,7 @@ exports.Role = void 0;
 const typeorm_1 = require("typeorm");
 const base_entity_1 = require("../../core/utils/base.entity");
 const permission_entity_1 = require("../permission/permission.entity");
+const user_entity_1 = require("../user/user.entity");
 let Role = class Role extends base_entity_1.BaseEntity {
 };
 exports.Role = Role;
@@ -55,6 +56,15 @@ __decorate([
     }),
     __metadata("design:type", Array)
 ], Role.prototype, "permissions", void 0);
+__decorate([
+    (0, typeorm_1.ManyToMany)(() => user_entity_1.User),
+    (0, typeorm_1.JoinTable)({
+        name: "user_roles",
+        joinColumn: { name: "role_id", referencedColumnName: "id" },
+        inverseJoinColumn: { name: "user_id", referencedColumnName: "id" },
+    }),
+    __metadata("design:type", Array)
+], Role.prototype, "users", void 0);
 exports.Role = Role = __decorate([
     (0, typeorm_1.Entity)("roles")
 ], Role);

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

@@ -1 +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"}
+{"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;CAwCnC,CAAA;AAxCY,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;eAvCJ,IAAI;IADhB,IAAA,gBAAM,EAAC,OAAO,CAAC;GACH,IAAI,CAwChB"}

package/dist/modules/role/role.service.js

@@ -52,6 +52,10 @@ let RoleService = class RoleService {
         if (query.moduleId) {
             qb.andWhere("module.id = :moduleId", { moduleId: query.moduleId });
         }
+        if (query.userId) {
+            qb.innerJoin("role.users", "user");
+            qb.andWhere("user.id = :userId", { userId: query.userId });
+        }
         const sortOrder = pageRequest.sort.asOrder();
         if (sortOrder && Object.keys(sortOrder).length > 0) {
             Object.entries(sortOrder).forEach(([field, direction], index) => {

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

@@ -1 +1 @@
-{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../src/modules/role/role.service.ts"],"names":[],"mappings":"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"}
+{"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;AAnGY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,kBAAI,EAAE,iCAAwB,CAAC,CAAA;qCAChB,oBAAU;GAHlC,WAAW,CAmGvB"}

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

@@ -1,6 +1,7 @@
 import { UserDTO } from "./user.dto";
-declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "roles" | "id" | "createdAt" | "updatedAt" | "deletedAt">>;
+declare const CreateUserDTO_base: import("@nestjs/common").Type<Omit<UserDTO, "id" | "createdAt" | "updatedAt" | "deletedAt" | "roles" | "jobs">>;
 export declare class CreateUserDTO extends CreateUserDTO_base {
-    roles: number[];
+    roles?: number[];
+    jobs?: number[];
 }
 export {};

package/dist/modules/user/dtos/create-user.dto.js

@@ -9,6 +9,7 @@ class CreateUserDTO extends (0, swagger_1.OmitType)(user_dto_1.UserDTO, [
     "updatedAt",
     "deletedAt",
     "roles",
+    "jobs",
 ]) {
 }
 exports.CreateUserDTO = CreateUserDTO;

package/dist/modules/user/dtos/create-user.dto.js.map

@@ -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;CACC,CAAC;CAEV;AARD,sCAQC"}
+{"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;IACP,MAAM;CACE,CAAC;CAGV;AAVD,sCAUC"}

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

@@ -1,5 +1,7 @@
-import { UserDTO } from './user.dto';
-declare const UpdateUserDTO_base: import("@nestjs/common").Type<Partial<UserDTO>>;
+import { UserDTO } from "./user.dto";
+declare const UpdateUserDTO_base: import("@nestjs/common").Type<Partial<Omit<UserDTO, "roles" | "jobs">>>;
 export declare class UpdateUserDTO extends UpdateUserDTO_base {
+    roles?: number[];
+    jobs?: number[];
 }
 export {};

package/dist/modules/user/dtos/update-user.dto.js

@@ -1,9 +1,36 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateUserDTO = void 0;
 const swagger_1 = require("@nestjs/swagger");
 const user_dto_1 = require("./user.dto");
-class UpdateUserDTO extends (0, swagger_1.PartialType)(user_dto_1.UserDTO) {
+const class_validator_1 = require("class-validator");
+const class_transformer_1 = require("class-transformer");
+class UpdateUserDTO extends (0, swagger_1.PartialType)((0, swagger_1.OmitType)(user_dto_1.UserDTO, ["roles", "jobs"])) {
 }
 exports.UpdateUserDTO = UpdateUserDTO;
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: [Number], description: "Role IDs to assign" }),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsArray)(),
+    (0, class_transformer_1.Type)(() => Number),
+    (0, class_validator_1.IsInt)({ each: true }),
+    __metadata("design:type", Array)
+], UpdateUserDTO.prototype, "roles", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ type: [Number], description: "Job IDs to assign" }),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_validator_1.IsArray)(),
+    (0, class_transformer_1.Type)(() => Number),
+    (0, class_validator_1.IsInt)({ each: true }),
+    __metadata("design:type", Array)
+], UpdateUserDTO.prototype, "jobs", void 0);
 //# sourceMappingURL=update-user.dto.js.map

package/dist/modules/user/dtos/update-user.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/update-user.dto.ts"],"names":[],"mappings":";;;AAAA,6CAA8C;AAC9C,yCAAqC;AAErC,MAAa,aAAc,SAAQ,IAAA,qBAAW,EAAC,kBAAO,CAAC;CAAG;AAA1D,sCAA0D"}
+{"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,EAAE,MAAM,CAAU,CAAC,CAC9C;CAcA;AAhBD,sCAgBC;AARC;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;AAOjB;IALC,IAAA,6BAAmB,EAAC,EAAE,IAAI,EAAE,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,mBAAmB,EAAE,CAAC;IACzE,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;;2CACN"}

package/dist/modules/user/dtos/user-query.dto.d.ts

@@ -1,3 +1,7 @@
 import { PaginateDTO } from "../../../core/utils/paginate.dto";
 export declare class UserQueryDTO extends PaginateDTO {
+    levelOneId?: number;
+    levelTwoId?: number;
+    levelThreeId?: number;
+    jobId?: number;
 }

package/dist/modules/user/dtos/user-query.dto.js

@@ -1,8 +1,48 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserQueryDTO = void 0;
+const swagger_1 = require("@nestjs/swagger");
 const paginate_dto_1 = require("../../../core/utils/paginate.dto");
+const class_validator_1 = require("class-validator");
+const class_transformer_1 = require("class-transformer");
 class UserQueryDTO extends paginate_dto_1.PaginateDTO {
 }
 exports.UserQueryDTO = UserQueryDTO;
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ description: "Level one id/value" }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Type)(() => Number),
+    __metadata("design:type", Number)
+], UserQueryDTO.prototype, "levelOneId", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ description: "Level two id/value" }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Type)(() => Number),
+    __metadata("design:type", Number)
+], UserQueryDTO.prototype, "levelTwoId", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ description: "Level three id/value" }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Type)(() => Number),
+    __metadata("design:type", Number)
+], UserQueryDTO.prototype, "levelThreeId", void 0);
+__decorate([
+    (0, swagger_1.ApiPropertyOptional)({ description: "Job id/value" }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.IsOptional)(),
+    (0, class_transformer_1.Type)(() => Number),
+    __metadata("design:type", Number)
+], UserQueryDTO.prototype, "jobId", void 0);
 //# sourceMappingURL=user-query.dto.js.map

package/dist/modules/user/dtos/user-query.dto.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-query.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user-query.dto.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAE/D,MAAa,YAAa,SAAQ,0BAAW;CAAG;AAAhD,oCAAgD"}
+{"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,qDAAoD;AACpD,yDAAyC;AAEzC,MAAa,YAAa,SAAQ,0BAAW;CAwB5C;AAxBD,oCAwBC;AAnBC;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;AAMtB;IAJC,IAAA,6BAAmB,EAAC,EAAE,WAAW,EAAE,cAAc,EAAE,CAAC;IACpD,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;IACZ,IAAA,wBAAI,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC;;2CACJ"}

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

@@ -1,5 +1,6 @@
 import { BaseDTO } from "../../../core/utils/base.dto";
 import { RoleDTO } from "../../../modules/role/dtos/role.dto";
+import { JobDTO } from "../../../modules/job/dtos/job.dto";
 export declare class UserDTO extends BaseDTO {
     email?: string;
     password?: string;
@@ -12,5 +13,9 @@ export declare class UserDTO extends BaseDTO {
     activated?: boolean;
     imageUrl?: string;
     resetPasswordRequest?: boolean;
+    levelOneId?: number;
+    levelTwoId?: number;
+    levelThreeId?: number;
     roles?: RoleDTO[];
+    jobs?: JobDTO[];
 }

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

@@ -20,12 +20,13 @@ exports.UserDTO = UserDTO;
 __decorate([
     (0, swagger_1.ApiProperty)({
         uniqueItems: true,
-        required: true,
+        required: false,
         example: "email@domain.com",
         description: "User Email",
     }),
+    (0, class_validator_1.ValidateIf)((o) => o.email !== undefined && o.email !== null && o.email !== ""),
     (0, class_validator_1.IsEmail)(),
-    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsOptional)(),
     __metadata("design:type", String)
 ], UserDTO.prototype, "email", void 0);
 __decorate([
@@ -40,7 +41,7 @@ __decorate([
         required: false,
     }),
     (0, class_validator_1.IsString)(),
-    (0, class_validator_1.IsNotEmpty)(),
+    (0, class_validator_1.IsOptional)(),
     __metadata("design:type", String)
 ], UserDTO.prototype, "username", void 0);
 __decorate([
@@ -117,4 +118,34 @@ __decorate([
     }),
     __metadata("design:type", Boolean)
 ], UserDTO.prototype, "resetPasswordRequest", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        example: 1,
+        required: false,
+        description: "Level one id/value",
+    }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", Number)
+], UserDTO.prototype, "levelOneId", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        example: 2,
+        required: false,
+        description: "Level two id/value",
+    }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", Number)
+], UserDTO.prototype, "levelTwoId", void 0);
+__decorate([
+    (0, swagger_1.ApiProperty)({
+        example: 3,
+        required: false,
+        description: "Level three id/value",
+    }),
+    (0, class_validator_1.IsInt)(),
+    (0, class_validator_1.IsOptional)(),
+    __metadata("design:type", Number)
+], UserDTO.prototype, "levelThreeId", void 0);
 //# sourceMappingURL=user.dto.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"user.dto.js","sourceRoot":"","sources":["../../../../src/modules/user/dtos/user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6CAA8C;AAC9C,qDAA4E;AAC5E,yDAA4C;AAC5C,2DAAuD;AAMvD,MAAa,OAAQ,SAAQ,kBAAO;CA0FnC;AA1FD,0BA0FC;AAjFC;IARC,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,IAAI;QACd,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,YAAY;KAC1B,CAAC;IACD,IAAA,yBAAO,GAAE;IACT,IAAA,4BAAU,GAAE;;sCACE;AAIf;IAFC,IAAA,qBAAW,EAAC,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IACnE,IAAA,2BAAO,GAAE;;yCACQ;AASlB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,MAAM;QACf,WAAW,EAAE,UAAU;QACvB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;yCACK;AASlB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,UAAU;QACnB,WAAW,EAAE,WAAW;QACxB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;qCACC;AASd;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,YAAY;QACzB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;0CACM;AASnB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,aAAa;QACtB,WAAW,EAAE,cAAc;QAC3B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;sCACE;AASf;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;2CACO;AAQpB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;6CACS;AAOtB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,iBAAiB;QAC9B,QAAQ,EAAE,KAAK;KAChB,CAAC;;0CACkB;AAOpB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,qBAAqB;QAC9B,WAAW,EAAE,WAAW;QACxB,QAAQ,EAAE,KAAK;KAChB,CAAC;;yCACgB;AAOlB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,iDAAiD;QAC9D,QAAQ,EAAE,KAAK;KAChB,CAAC;;qDAC6B"}
+{"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;AAOvD,MAAa,OAAQ,SAAQ,kBAAO;CA0HnC;AA1HD,0BA0HC;AA9GC;IAXC,IAAA,qBAAW,EAAC;QACX,WAAW,EAAE,IAAI;QACjB,QAAQ,EAAE,KAAK;QACf,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,YAAY;KAC1B,CAAC;IACD,IAAA,4BAAU,EACT,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,SAAS,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,KAAK,EAAE,CACnE;IACA,IAAA,yBAAO,GAAE;IACT,IAAA,4BAAU,GAAE;;sCACE;AAIf;IAFC,IAAA,qBAAW,EAAC,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC;IACnE,IAAA,2BAAO,GAAE;;yCACQ;AASlB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,MAAM;QACf,WAAW,EAAE,UAAU;QACvB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;yCACK;AASlB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,UAAU;QACnB,WAAW,EAAE,WAAW;QACxB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;qCACC;AASd;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,IAAI;QACb,WAAW,EAAE,YAAY;QACzB,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;0CACM;AASnB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,aAAa;QACtB,WAAW,EAAE,cAAc;QAC3B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;sCACE;AASf;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;2CACO;AAQpB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,kBAAkB;QAC3B,WAAW,EAAE,aAAa;QAC1B,QAAQ,EAAE,KAAK;KAChB,CAAC;IACD,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;;6CACS;AAOtB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,iBAAiB;QAC9B,QAAQ,EAAE,KAAK;KAChB,CAAC;;0CACkB;AAOpB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,qBAAqB;QAC9B,WAAW,EAAE,WAAW;QACxB,QAAQ,EAAE,KAAK;KAChB,CAAC;;yCACgB;AAOlB;IALC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,iDAAiD;QAC9D,QAAQ,EAAE,KAAK;KAChB,CAAC;;qDAC6B;AAS/B;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,oBAAoB;KAClC,CAAC;IACD,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;;2CACO;AASpB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,oBAAoB;KAClC,CAAC;IACD,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;;2CACO;AASpB;IAPC,IAAA,qBAAW,EAAC;QACX,OAAO,EAAE,CAAC;QACV,QAAQ,EAAE,KAAK;QACf,WAAW,EAAE,sBAAsB;KACpC,CAAC;IACD,IAAA,uBAAK,GAAE;IACP,IAAA,4BAAU,GAAE;;6CACS"}

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

@@ -7,12 +7,14 @@ import type { Request } from "../../core/utils/request";
 import { UserQueryDTO } from "../user/dtos/user-query.dto";
 import { CreateUserDTO } from "./dtos/create-user.dto";
 import { RoleService } from "../role/role.service";
+import { JobService } from "../job/job.service";
 export declare class UserController {
     private readonly userService;
     private readonly roleService;
+    private readonly jobService;
     logger: Logger;
-    constructor(userService: UserService, roleService: RoleService);
-    getAllUsers(req: Request, query: UserQueryDTO): Promise<UpdateUserDTO[]>;
+    constructor(userService: UserService, roleService: RoleService, jobService: JobService);
+    getAllUsers(req: Request, query: UserQueryDTO): Promise<Partial<UserDTO>[]>;
     getUserById(id: number): Promise<UserDTO>;
     create(createUserDTO: CreateUserDTO, user: User): Promise<UserDTO>;
     update(id: number, userDTO: UpdateUserDTO, authUser: User): Promise<UserDTO>;

package/dist/modules/user/user.controller.js

@@ -31,19 +31,34 @@ const user_permission_1 = require("../../core/enums/user-permission");
 const create_user_dto_1 = require("./dtos/create-user.dto");
 const permission_guard_1 = require("../../security/guards/permission.guard");
 const role_service_1 = require("../role/role.service");
+const job_service_1 = require("../job/job.service");
 let UserController = class UserController {
-    constructor(userService, roleService) {
+    constructor(userService, roleService, jobService) {
         this.userService = userService;
         this.roleService = roleService;
+        this.jobService = jobService;
         this.logger = new common_1.Logger("UsersController");
     }
     async getAllUsers(req, query) {
+        const whereConditions = {};
+        if (query.levelOneId) {
+            whereConditions.levelOneId = query.levelOneId;
+        }
+        if (query.levelTwoId) {
+            whereConditions.levelTwoId = query.levelTwoId;
+        }
+        if (query.levelThreeId) {
+            whereConditions.levelThreeId = query.levelThreeId;
+        }
+        if (query.jobId) {
+            whereConditions.jobs = { id: query.jobId };
+        }
         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.userService.findAndCount({
             skip: +pageRequest.page * pageRequest.size,
             take: +pageRequest.size,
             order: pageRequest.sort.asOrder(),
-            relations: ["roles"],
+            where: whereConditions,
         });
         const userDtos = (0, user_mapper_1.mapUserToUserDtoSelective)(results);
         header_util_1.HeaderUtil.addPaginationHeaders(req.res, count, pageRequest.page, count > pageRequest.page * pageRequest.size);
@@ -57,14 +72,13 @@ let UserController = class UserController {
         return (0, user_mapper_1.mapUserToUserDtoSelective)(user);
     }
     async create(createUserDTO, user) {
-        if (!createUserDTO.email) {
-            throw new common_1.BadRequestException("Email is required");
-        }
-        const existing = await this.userService.findByFields({
-            where: { email: (0, typeorm_1.Equal)(createUserDTO.email) },
-        });
-        if (existing) {
-            throw new common_1.BadRequestException(`User with email ${createUserDTO.email} already exists`);
+        if (createUserDTO.email) {
+            const existing = await this.userService.findByFields({
+                where: { email: (0, typeorm_1.Equal)(createUserDTO.email) },
+            });
+            if (existing) {
+                throw new common_1.BadRequestException(`User with email ${createUserDTO.email} already exists`);
+            }
         }
         if (createUserDTO.roles?.length) {
             const roles = await this.roleService.find({
@@ -74,9 +88,17 @@ let UserController = class UserController {
                 throw new common_1.BadRequestException("One or more roles do not exist");
             }
         }
+        if (createUserDTO.jobs?.length) {
+            const jobs = await this.jobService.find({
+                where: { id: (0, typeorm_1.In)(createUserDTO.jobs) },
+            });
+            if (jobs.length !== createUserDTO.jobs.length) {
+                throw new common_1.BadRequestException("One or more jobs do not exist");
+            }
+        }
         const createUserEntity = (0, user_mapper_1.mapCreateUserDtoToEntity)(createUserDTO);
         const created = await this.userService.save(createUserEntity, user?.email, true);
-        return created;
+        return (0, user_mapper_1.mapUserToUserDtoSelective)(created);
     }
     async update(id, userDTO, authUser) {
         userDTO.id = id;
@@ -94,9 +116,23 @@ let UserController = class UserController {
                 throw new common_1.BadRequestException(`User with email ${userDTO.email} already exists`);
             }
         }
+        if (Array.isArray(userDTO.roles)) {
+            const roleIds = userDTO.roles.map((r) => typeof r === "number" ? r : r?.id);
+            const roles = await this.roleService.find({ where: { id: (0, typeorm_1.In)(roleIds) } });
+            if (roles.length !== roleIds.length) {
+                throw new common_1.BadRequestException("One or more roles do not exist");
+            }
+        }
+        if (Array.isArray(userDTO.jobs)) {
+            const jobIds = userDTO.jobs.map((j) => typeof j === "number" ? j : j?.id);
+            const jobs = await this.jobService.find({ where: { id: (0, typeorm_1.In)(jobIds) } });
+            if (jobs.length !== jobIds.length) {
+                throw new common_1.BadRequestException("One or more jobs do not exist");
+            }
+        }
         const updateUserEntity = (0, user_mapper_1.mapUpdateUserDtoToEntity)(userDTO, existing);
         const updated = await this.userService.update(updateUserEntity, authUser?.email);
-        return updated;
+        return (0, user_mapper_1.mapUserToUserDtoSelective)(updated);
     }
     async delete(id) {
         const existing = await this.userService.findById(id);
@@ -192,6 +228,7 @@ exports.UserController = UserController = __decorate([
     (0, common_1.UseGuards)(jwt_auth_guard_1.AuthGuard, permission_guard_1.PermissionsGuard),
     (0, swagger_1.ApiTags)("users-module"),
     __metadata("design:paramtypes", [user_service_1.UserService,
-        role_service_1.RoleService])
+        role_service_1.RoleService,
+        job_service_1.JobService])
 ], UserController);
 //# sourceMappingURL=user.controller.js.map

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

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

package/dist/modules/user/user.entity.d.ts

@@ -1,6 +1,7 @@
 import "reflect-metadata";
 import { BaseEntity } from "../../core/utils/base.entity";
 import { Role } from "../role/role.entity";
+import { Job } from "../job/job.entity";
 export declare class User extends BaseEntity {
     name?: string;
     shortName?: string;
@@ -14,4 +15,8 @@ export declare class User extends BaseEntity {
     imageUrl?: string;
     resetPasswordRequest?: boolean;
     roles?: Role[];
+    jobs?: Job[];
+    levelOneId?: number;
+    levelTwoId?: number;
+    levelThreeId?: number;
 }

package/dist/modules/user/user.entity.js

@@ -15,6 +15,7 @@ const typeorm_1 = require("typeorm");
 const class_transformer_1 = require("class-transformer");
 const base_entity_1 = require("../../core/utils/base.entity");
 const role_entity_1 = require("../role/role.entity");
+const job_entity_1 = require("../job/job.entity");
 let User = class User extends base_entity_1.BaseEntity {
     constructor() {
         super(...arguments);
@@ -44,12 +45,12 @@ __decorate([
     __metadata("design:type", String)
 ], User.prototype, "emailPrivate", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ unique: true, type: "varchar", nullable: false }),
+    (0, typeorm_1.Column)({ unique: true, type: "varchar", nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "email", void 0);
 __decorate([
     (0, class_transformer_1.Exclude)(),
-    (0, typeorm_1.Column)({ type: "varchar", nullable: false }),
+    (0, typeorm_1.Column)({ type: "varchar", nullable: true }),
     __metadata("design:type", String)
 ], User.prototype, "password", void 0);
 __decorate([
@@ -77,6 +78,27 @@ __decorate([
     }),
     __metadata("design:type", Array)
 ], User.prototype, "roles", void 0);
+__decorate([
+    (0, typeorm_1.ManyToMany)(() => job_entity_1.Job),
+    (0, typeorm_1.JoinTable)({
+        name: "user_jobs",
+        joinColumn: { name: "user_id", referencedColumnName: "id" },
+        inverseJoinColumn: { name: "job_id", referencedColumnName: "id" },
+    }),
+    __metadata("design:type", Array)
+], User.prototype, "jobs", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: "level_one_id", type: "int", nullable: true }),
+    __metadata("design:type", Number)
+], User.prototype, "levelOneId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: "level_two_id", type: "int", nullable: true }),
+    __metadata("design:type", Number)
+], User.prototype, "levelTwoId", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: "level_three_id", type: "int", nullable: true }),
+    __metadata("design:type", Number)
+], User.prototype, "levelThreeId", void 0);
 exports.User = User = __decorate([
     (0, typeorm_1.Entity)("users")
 ], User);

package/dist/modules/user/user.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/modules/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAC1B,qCAA2E;AAC3E,yDAA4C;AAC5C,8DAA0D;AAE1D,qDAA2C;AAGpC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,wBAAU;IAA7B;;QA0BL,cAAS,GAAa,KAAK,CAAC;QAM5B,yBAAoB,GAAa,KAAK,CAAC;IASzC,CAAC;CAAA,CAAA;AAzCY,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,KAAK,EAAE,CAAC;;mCAC5C;AAIf;IAFC,IAAA,2BAAO,GAAE;IACT,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;sCAC3B;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;eAxCJ,IAAI;IADhB,IAAA,gBAAM,EAAC,OAAO,CAAC;GACH,IAAI,CAyChB"}
+{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../src/modules/user/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4BAA0B;AAC1B,qCAA2E;AAC3E,yDAA4C;AAC5C,8DAA0D;AAE1D,qDAA2C;AAC3C,kDAAwC;AAGjC,IAAM,IAAI,GAAV,MAAM,IAAK,SAAQ,wBAAU;IAA7B;;QA0BL,cAAS,GAAa,KAAK,CAAC;QAM5B,yBAAoB,GAAa,KAAK,CAAC;IA0BzC,CAAC;CAAA,CAAA;AA1DY,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;AAQf;IANC,IAAA,oBAAU,EAAC,GAAG,EAAE,CAAC,gBAAG,CAAC;IACrB,IAAA,mBAAS,EAAC;QACT,IAAI,EAAE,WAAW;QACjB,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,oBAAoB,EAAE,IAAI,EAAE;QAC3D,iBAAiB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;KAClE,CAAC;;kCACW;AAGb;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;eAzDX,IAAI;IADhB,IAAA,gBAAM,EAAC,OAAO,CAAC;GACH,IAAI,CA0DhB"}

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

@@ -3,8 +3,8 @@ import { BaseDTO } from "../../core/utils/base.dto";
 import { UpdateUserDTO } from "./dtos/update-user.dto";
 import { User } from "./user.entity";
 import { CreateUserDTO } from "./dtos/create-user.dto";
-export declare function mapUserToUserDtoSelective(user: User, keys?: (keyof UserDTO | keyof BaseDTO)[]): UpdateUserDTO;
-export declare function mapUserToUserDtoSelective(users: User[], keys?: (keyof UserDTO | keyof BaseDTO)[]): UpdateUserDTO[];
+export declare function mapUserToUserDtoSelective(user: User, keys?: (keyof UserDTO | keyof BaseDTO)[]): Partial<UserDTO>;
+export declare function mapUserToUserDtoSelective(users: User[], keys?: (keyof UserDTO | keyof BaseDTO)[]): Partial<UserDTO>[];
 export declare const mapCreateUserDtoToEntity: (dto: CreateUserDTO) => User;
 export declare const mapUpdateUserDtoToEntity: (dto: UpdateUserDTO, user: User) => User;
 export declare function mapUserToUserDtoWithModules(user: User): any;