rez_core 6.5.32 → 6.5.34

package/dist/module/user/entity/user-role-mapping.entity.js

@@ -11,7 +11,11 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserRoleMapping = void 0;
 const global_constant_1 = require("../../../constant/global.constant");
+const enterprise_entity_1 = require("../../enterprise/entity/enterprise.entity");
+const app_master_entity_1 = require("../../meta/entity/app-master.entity");
 const typeorm_1 = require("typeorm");
+const user_entity_1 = require("./user.entity");
+const role_entity_1 = require("./role.entity");
 let UserRoleMapping = class UserRoleMapping {
     constructor(user_id, role_id) {
         this.user_id = user_id;
@@ -29,17 +33,36 @@ __decorate([
     __metadata("design:type", String)
 ], UserRoleMapping.prototype, "entity_type", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
+    (0, typeorm_1.Column)({ type: 'bigint' }),
     __metadata("design:type", Number)
 ], UserRoleMapping.prototype, "user_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => user_entity_1.UserData, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'user_id', referencedColumnName: 'id' }),
+    __metadata("design:type", user_entity_1.UserData)
+], UserRoleMapping.prototype, "user", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
     __metadata("design:type", Number)
 ], UserRoleMapping.prototype, "role_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => role_entity_1.Role, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'role_id', referencedColumnName: 'id' }),
+    __metadata("design:type", role_entity_1.Role)
+], UserRoleMapping.prototype, "role", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
 ], UserRoleMapping.prototype, "organization_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'enterprise_id', nullable: true }),
+    __metadata("design:type", Number)
+], UserRoleMapping.prototype, "enterprise_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => enterprise_entity_1.EnterpriseData, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'enterprise_id', referencedColumnName: 'id' }),
+    __metadata("design:type", enterprise_entity_1.EnterpriseData)
+], UserRoleMapping.prototype, "enterpriseData", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
@@ -48,6 +71,15 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", String)
 ], UserRoleMapping.prototype, "appcode", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], UserRoleMapping.prototype, "app_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => app_master_entity_1.AppMaster, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'app_id', referencedColumnName: 'id' }),
+    __metadata("design:type", app_master_entity_1.AppMaster)
+], UserRoleMapping.prototype, "app", void 0);
 __decorate([
     (0, typeorm_1.Column)({ name: 'level_id', type: 'varchar', length: 100, nullable: true }),
     __metadata("design:type", String)

package/dist/module/user/entity/user-role-mapping.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-role-mapping.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-role-mapping.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAoE;AACpE,qCAAiE;AAG1D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAY,OAAe,EAAE,OAAe;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,sCAAoB,CAAC;IAC1C,CAAC;CA4BF,CAAA;AAjCY,0CAAe;AAQ1B;IADC,IAAA,gCAAsB,GAAE;;2CACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACxB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDAChB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC1D;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC1D;0BAhCR,eAAe;IAD3B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,uBAAuB,EAAE,CAAC;;GAC7B,eAAe,CAiC3B"}
+{"version":3,"file":"user-role-mapping.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-role-mapping.entity.ts"],"names":[],"mappings":"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"}

package/dist/module/user/entity/user-session.entity.d.ts

@@ -1,12 +1,10 @@
 export declare class UserSession {
     id: number;
     is_session_loggedout: number;
-    login_id: string;
     login_time: Date;
     logout_time: Date;
     session_key: string;
     user_id: number;
-    access_token: string;
     expiry_date: Date;
     fcm_token: string;
     browser: string;

package/dist/module/user/entity/user-session.entity.js

@@ -27,17 +27,8 @@ __decorate([
     __metadata("design:type", Number)
 ], UserSession.prototype, "is_session_loggedout", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        name: 'login_id',
-        nullable: true,
-        length: 50,
-    }),
-    __metadata("design:type", String)
-], UserSession.prototype, "login_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        name: 'login_time',
-        nullable: true,
+    (0, typeorm_1.CreateDateColumn)({
+        name: 'login_time'
     }),
     __metadata("design:type", Date)
 ], UserSession.prototype, "login_time", void 0);
@@ -64,15 +55,6 @@ __decorate([
     }),
     __metadata("design:type", Number)
 ], UserSession.prototype, "user_id", void 0);
-__decorate([
-    (0, typeorm_1.Column)({
-        name: 'access_token',
-        nullable: true,
-        type: 'varchar',
-        length: 5000,
-    }),
-    __metadata("design:type", String)
-], UserSession.prototype, "access_token", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         name: 'expiry_date',

package/dist/module/user/entity/user-session.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-session.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-session.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,WAAW,GAAjB,MAAM,WAAW;CAqEvB,CAAA;AArEY,kCAAW;AAEtB;IADC,IAAA,gCAAsB,GAAE;;uCACd;AAOX;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,sBAAsB;QAC5B,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,KAAK;KACZ,CAAC;;yDAC2B;AAO7B;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,UAAU;QAChB,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,EAAE;KACX,CAAC;;6CACe;AAMjB;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,YAAY;QAClB,QAAQ,EAAE,IAAI;KACf,CAAC;8BACU,IAAI;+CAAC;AAMjB;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC;8BACW,IAAI;gDAAC;AAOlB;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,GAAG;KACZ,CAAC;;gDACkB;AAOpB;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,QAAQ;KACf,CAAC;;4CACc;AAQhB;IANC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,cAAc;QACpB,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,IAAI;KACb,CAAC;;iDACmB;AAMrB;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC;8BACW,IAAI;gDAAC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC1B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACjC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACjC;sBApEA,WAAW;IADvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;GACxB,WAAW,CAqEvB"}
+{"version":3,"file":"user-session.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-session.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAmF;AAG5E,IAAM,WAAW,GAAjB,MAAM,WAAW;CAqDvB,CAAA;AArDY,kCAAW;AAEtB;IADC,IAAA,gCAAsB,GAAE;;uCACd;AAOX;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,sBAAsB;QAC5B,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,KAAK;KACZ,CAAC;;yDAC2B;AAK7B;IAHC,IAAA,0BAAgB,EAAC;QAChB,IAAI,EAAE,YAAY;KACnB,CAAC;8BACU,IAAI;+CAAC;AAMjB;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC;8BACW,IAAI;gDAAC;AAOlB;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;QACd,MAAM,EAAE,GAAG;KACZ,CAAC;;gDACkB;AAOpB;IALC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,QAAQ;KACf,CAAC;;4CACc;AAMhB;IAJC,IAAA,gBAAM,EAAC;QACN,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,IAAI;KACf,CAAC;8BACW,IAAI;gDAAC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC1B;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACjC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCACjC;sBApDA,WAAW;IADvB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC;GACxB,WAAW,CAqDvB"}

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

@@ -1,6 +1,17 @@
-import { BaseEntity } from '../../meta/entity/base-entity.entity';
-export declare class UserData extends BaseEntity {
-    constructor();
+import { EnterpriseData } from 'src/module/enterprise/entity/enterprise.entity';
+import { AppMaster } from 'src/module/meta/entity/app-master.entity';
+export declare class UserData {
+    id: number;
+    status: string;
+    code: string;
+    created_by: number;
+    created_date: Date;
+    modified_by: number;
+    modified_date: Date;
+    enterprise_id: number;
+    enterprise: EnterpriseData;
+    level_id: string;
+    level_type: string;
     first_name: string;
     last_name: string;
     password: string;
@@ -11,11 +22,12 @@ export declare class UserData extends BaseEntity {
     is_defaultadmin: number;
     invitation_status: string;
     is_customer: number;
-    organization_id: number;
     is_factory: number;
-    last_app_access: string;
+    last_app_access_id: number;
+    last_app: AppMaster;
     last_level_type: string;
     last_level_id: string;
     date: Date;
     profile_image: string;
+    appcode: string;
 }

package/dist/module/user/entity/user.entity.js

@@ -10,16 +10,58 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserData = void 0;
+const enterprise_entity_1 = require("../../enterprise/entity/enterprise.entity");
+const app_master_entity_1 = require("../../meta/entity/app-master.entity");
 const typeorm_1 = require("typeorm");
-const global_constant_1 = require("../../../constant/global.constant");
-const base_entity_entity_1 = require("../../meta/entity/base-entity.entity");
-let UserData = class UserData extends base_entity_entity_1.BaseEntity {
-    constructor() {
-        super();
-        this.entity_type = global_constant_1.ENTITYTYPE_USER;
-    }
+const class_transformer_1 = require("class-transformer");
+let UserData = class UserData {
 };
 exports.UserData = UserData;
+__decorate([
+    (0, typeorm_1.PrimaryGeneratedColumn)({ type: 'bigint' }),
+    __metadata("design:type", Number)
+], UserData.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'status', type: 'varchar', nullable: true, length: 100 }),
+    __metadata("design:type", String)
+], UserData.prototype, "status", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'code', type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], UserData.prototype, "code", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'created_by', type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], UserData.prototype, "created_by", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)(),
+    __metadata("design:type", Date)
+], UserData.prototype, "created_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'modified_by', type: 'bigint', nullable: true }),
+    __metadata("design:type", Number)
+], UserData.prototype, "modified_by", void 0);
+__decorate([
+    (0, typeorm_1.CreateDateColumn)(),
+    __metadata("design:type", Date)
+], UserData.prototype, "modified_date", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'enterprise_id', type: 'int', nullable: true }),
+    __metadata("design:type", Number)
+], UserData.prototype, "enterprise_id", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(() => enterprise_entity_1.EnterpriseData, { nullable: true, onDelete: 'SET NULL' }),
+    (0, typeorm_1.JoinColumn)({ name: 'enterprise_id', referencedColumnName: 'id' }),
+    __metadata("design:type", enterprise_entity_1.EnterpriseData)
+], UserData.prototype, "enterprise", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'level_id', type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], UserData.prototype, "level_id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'level_type', type: 'varchar', length: 100, nullable: true }),
+    __metadata("design:type", String)
+], UserData.prototype, "level_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', length: 50, nullable: true }),
     __metadata("design:type", String)
@@ -63,15 +105,16 @@ __decorate([
 __decorate([
     (0, typeorm_1.Column)({ type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], UserData.prototype, "organization_id", void 0);
+], UserData.prototype, "is_factory", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'int', nullable: true }),
+    (0, typeorm_1.Column)({ name: 'last_app_access_id', type: 'int', nullable: true }),
     __metadata("design:type", Number)
-], UserData.prototype, "is_factory", void 0);
+], UserData.prototype, "last_app_access_id", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
-    __metadata("design:type", String)
-], UserData.prototype, "last_app_access", void 0);
+    (0, typeorm_1.ManyToOne)(() => app_master_entity_1.AppMaster),
+    (0, typeorm_1.JoinColumn)({ name: 'last_app_access_id' }),
+    __metadata("design:type", app_master_entity_1.AppMaster)
+], UserData.prototype, "last_app", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", String)
@@ -88,8 +131,11 @@ __decorate([
     (0, typeorm_1.Column)({ type: 'varchar', nullable: true }),
     __metadata("design:type", String)
 ], UserData.prototype, "profile_image", void 0);
+__decorate([
+    (0, class_transformer_1.Exclude)(),
+    __metadata("design:type", String)
+], UserData.prototype, "appcode", void 0);
 exports.UserData = UserData = __decorate([
-    (0, typeorm_1.Entity)({ name: 'sso_user' }),
-    __metadata("design:paramtypes", [])
+    (0, typeorm_1.Entity)({ name: 'sso_user' })
 ], UserData);
 //# sourceMappingURL=user.entity.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAyC;AACzC,uEAAoE;AACpE,6EAAkE;AAG3D,IAAM,QAAQ,GAAd,MAAM,QAAS,SAAQ,+BAAU;IACtC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAoDF,CAAA;AAxDY,4BAAQ;AAOnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrC;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACtC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACxC;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACzC;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CACtC;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CAClB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC1B;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDAC9B;AAG1B;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACpB;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAChB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CACrB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpB;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtB;AAGtB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACrB,IAAI;sCAAC;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACtB;mBAvDX,QAAQ;IADpB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC;;GAChB,QAAQ,CAwDpB"}
+{"version":3,"file":"user.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user.entity.ts"],"names":[],"mappings":"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"}

package/dist/module/user/repository/role.repository.d.ts

@@ -6,13 +6,17 @@ export declare class RoleRepository {
     findByCode(code: string): Promise<Role | null>;
     isRoleNameExists(name: string, options?: {
         excludeRoleId?: number;
-        organization_id?: number;
+        enterprise_id?: number;
     }): Promise<boolean>;
     find(data: any): Promise<Role[] | null>;
     isRoleNameWithLevelExists(name: string, options?: {
         excludeRoleId?: number;
-        organization_id?: number;
+        enterprise_id?: number;
         level_type?: string;
         level_id?: number;
     }): Promise<boolean>;
+    findById(id: number): Promise<Role | null>;
+    saveRole(role: Role): Promise<Role>;
+    updateRole(id: number, role: Role): Promise<import("typeorm").UpdateResult>;
+    findRoles(options: any): Promise<Role[]>;
 }

package/dist/module/user/repository/role.repository.js

@@ -33,9 +33,9 @@ let RoleRepository = class RoleRepository {
                 excludeRoleId: options.excludeRoleId,
             });
         }
-        if (options?.organization_id !== undefined) {
-            query.andWhere('role.organization_id = :organization_id', {
-                organization_id: options.organization_id,
+        if (options?.enterprise_id !== undefined) {
+            query.andWhere('role.enterprise_id = :enterprise_id', {
+                enterprise_id: options.enterprise_id,
             });
         }
         const existingRole = await query.getOne();
@@ -59,11 +59,6 @@ let RoleRepository = class RoleRepository {
                 excludeRoleId: options.excludeRoleId,
             });
         }
-        if (options?.organization_id !== undefined) {
-            query.andWhere('role.organization_id = :organization_id', {
-                organization_id: options.organization_id,
-            });
-        }
         if (options?.level_type) {
             query.andWhere('role.level_type = :level_type', {
                 level_type: options.level_type,
@@ -77,6 +72,19 @@ let RoleRepository = class RoleRepository {
         const existingRole = await query.getOne();
         return !!existingRole;
     }
+    async findById(id) {
+        return this.roleRepo.findOne({ where: { id } });
+    }
+    async saveRole(role) {
+        let entity = this.roleRepo.create(role);
+        return await this.roleRepo.save(entity);
+    }
+    async updateRole(id, role) {
+        return await this.roleRepo.update(id, role);
+    }
+    async findRoles(options) {
+        return await this.roleRepo.find(options);
+    }
 };
 exports.RoleRepository = RoleRepository;
 exports.RoleRepository = RoleRepository = __decorate([

package/dist/module/user/repository/role.repository.js.map

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

package/dist/module/user/repository/user-role-mapping.repository.d.ts

@@ -16,4 +16,5 @@ export declare class UserRoleMappingRepository {
     }>;
     findByUserIdAndAppCode(userId: number, appCode: string): Promise<UserRoleMapping | null>;
     findByUserIdAndAppCodeAndLevel(userId: number, appCode: string, levelType: string, levelId: string): Promise<UserRoleMapping | null>;
+    find(options: any): Promise<UserRoleMapping[]>;
 }

package/dist/module/user/repository/user-role-mapping.repository.js

@@ -100,6 +100,9 @@ let UserRoleMappingRepository = class UserRoleMappingRepository {
             },
         });
     }
+    async find(options) {
+        return await this.userRoleMappingRepository.find(options);
+    }
 };
 exports.UserRoleMappingRepository = UserRoleMappingRepository;
 exports.UserRoleMappingRepository = UserRoleMappingRepository = __decorate([

package/dist/module/user/repository/user-role-mapping.repository.js.map

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

package/dist/module/user/repository/user.repository.d.ts

@@ -4,7 +4,9 @@ export declare class UserRepository {
     private userRepository;
     constructor(userRepository: Repository<UserData>);
     findById(userId: number): Promise<UserData | null>;
-    findByEmailId(email: string, organization_id?: number): Promise<UserData | null>;
-    findByMobile(mobile: string, organization_id?: number, appCode?: string): Promise<UserData | null>;
+    findByEmailId(email: string, enterprise_id?: number, getLastApp?: boolean): Promise<UserData | null>;
+    findByMobile(mobile: string, enterprise_id?: number, appCode?: string): Promise<UserData | null>;
     saveUser(user: UserData): Promise<UserData>;
+    updateUser(id: number, user: UserData): Promise<import("typeorm").UpdateResult>;
+    find(options: any): Promise<UserData[]>;
 }

package/dist/module/user/repository/user.repository.js

@@ -24,21 +24,27 @@ let UserRepository = class UserRepository {
     async findById(userId) {
         return this.userRepository.findOne({ where: { id: userId } });
     }
-    async findByEmailId(email, organization_id) {
+    async findByEmailId(email, enterprise_id, getLastApp) {
         if (!email)
             return null;
         const where = { email_id: email };
-        if (organization_id !== undefined) {
-            where.organization_id = organization_id;
+        if (enterprise_id !== undefined) {
+            where.enterprise_id = enterprise_id;
         }
-        return this.userRepository.findOne({ where });
+        const options = { where };
+        if (getLastApp) {
+            options.relations = {
+                last_app: true,
+            };
+        }
+        return this.userRepository.findOne(options);
     }
-    async findByMobile(mobile, organization_id, appCode) {
+    async findByMobile(mobile, enterprise_id, appCode) {
         if (!mobile)
             return null;
         const where = { mobile };
-        if (organization_id !== undefined) {
-            where.organization_id = organization_id;
+        if (enterprise_id !== undefined) {
+            where.enterprise_id = enterprise_id;
         }
         if (appCode !== undefined) {
             where.appcode = appCode;
@@ -48,6 +54,12 @@ let UserRepository = class UserRepository {
     async saveUser(user) {
         return this.userRepository.save(user);
     }
+    async updateUser(id, user) {
+        return await this.userRepository.update(id, user);
+    }
+    async find(options) {
+        return await this.userRepository.find(options);
+    }
 };
 exports.UserRepository = UserRepository;
 exports.UserRepository = UserRepository = __decorate([

package/dist/module/user/repository/user.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;IACvE,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,eAAwB;QAExB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,KAAK,GAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QAC1C,CAAC;QACD,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,eAAwB,EACxB,OAAgB;QAEhB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,KAAK,GAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QAC1C,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AA1CY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAAyB,oBAAU;GAFrD,cAAc,CA0C1B"}
+{"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;IACtE,CAAC;IAEL,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,aAAsB,EACtB,UAAoB;QAEpB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,KAAK,GAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QAEvC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,CAAC;QAED,MAAM,OAAO,GAAQ,EAAE,KAAK,EAAE,CAAC;QAE/B,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,SAAS,GAAG;gBAClB,QAAQ,EAAE,IAAI;aACf,CAAC;QACJ,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,aAAsB,EACtB,OAAgB;QAEhB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,KAAK,GAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,aAAa,GAAG,aAAa,CAAC;QACtC,CAAC;QACD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1B,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;QAC1B,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAU,EAAE,IAAc;QACzC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAY;QACrB,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;CACF,CAAA;AA9DY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAAyB,oBAAU;GAFrD,cAAc,CA8D1B"}

package/dist/module/user/repository/userSession.repository.d.ts

@@ -6,5 +6,6 @@ export declare class UserSessionRepository {
     findBySessionKey(sessionKey: string): Promise<UserSession | null>;
     findActiveSessionByUserId(userId: number): Promise<UserSession | null>;
     saveSession(session: UserSession): Promise<UserSession>;
+    fetchUserFcmToken(user_id: number): Promise<UserSession | null>;
     logoutSession(sessionKey: string): Promise<void>;
 }

package/dist/module/user/repository/userSession.repository.js

@@ -32,6 +32,9 @@ let UserSessionRepository = class UserSessionRepository {
     async saveSession(session) {
         return this.userSessionRepo.save(session);
     }
+    async fetchUserFcmToken(user_id) {
+        return await this.userSessionRepo.findOne({ where: { user_id }, select: ['fcm_token'], order: { login_time: 'DESC' } });
+    }
     async logoutSession(sessionKey) {
         await this.userSessionRepo.update({ session_key: sessionKey }, { is_session_loggedout: 1, logout_time: new Date() });
     }

package/dist/module/user/repository/userSession.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"userSession.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/userSession.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uEAA4D;AAC5D,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,eAAwC;QAAxC,oBAAe,GAAf,eAAe,CAAyB;IAC/C,CAAC;IAEJ,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAClC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAoB;QACpC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAC/B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B,EAAE,oBAAoB,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AA1BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACL,oBAAU;GAH1B,qBAAqB,CA0BjC"}
+{"version":3,"file":"userSession.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/userSession.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,qCAAqC;AACrC,uEAA4D;AAC5D,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,eAAwC;QAAxC,oBAAe,GAAf,eAAe,CAAyB;IAC9C,CAAC;IAEL,KAAK,CAAC,gBAAgB,CAAC,UAAkB;QACvC,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC;IAC9E,CAAC;IAED,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,OAAO,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAClC,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,OAAoB;QACpC,OAAO,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAAe;QACrC,OAAO,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAC1H,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB;QACpC,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAC/B,EAAE,WAAW,EAAE,UAAU,EAAE,EAC3B,EAAE,oBAAoB,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,IAAI,EAAE,EAAE,CACrD,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACL,oBAAU;GAH1B,qBAAqB,CA8BjC"}

package/dist/module/user/service/login.service.d.ts

@@ -1,22 +1,20 @@
 import { ConfigService } from '@nestjs/config';
-import { OrganizationRepository } from 'src/module/enterprise/repository/organization.repository';
-import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
 import { Repository } from 'typeorm';
 import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 import { UserSessionService } from './user-session.service';
 import { UserService } from './user.service';
 import { JwtAuthService } from 'src/module/auth/services/jwt.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
+import { EnterpriseRepository } from 'src/module/enterprise/repository/enterprise.repository';
 export declare class LoginService {
     private readonly userService;
     private userSessionService;
     private configService;
     private readonly userRoleMappingRepository;
-    private readonly organizationRepository;
-    private readonly listMasterService;
+    private readonly enterpriseRepository;
     private readonly jwtAuthService;
     private readonly reflectionHelper;
-    constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, organizationRepository: OrganizationRepository, listMasterService: ListMasterService, jwtAuthService: JwtAuthService, reflectionHelper: ReflectionHelper);
+    constructor(userService: UserService, userSessionService: UserSessionService, configService: ConfigService, userRoleMappingRepository: Repository<UserRoleMapping>, enterpriseRepository: EnterpriseRepository, jwtAuthService: JwtAuthService, reflectionHelper: ReflectionHelper);
     masterKey: string;
     masterIv: string;
     login(data: {