rez_core 2.0.57 → 2.0.59

package/dist/module/filter/controller/filter.controller.d.ts

@@ -7,14 +7,8 @@ export declare class FilterController {
     applyFilter(body: any, page?: number, size?: number): Promise<{
         success: boolean;
         data: {
-            entity_tabs: ({
-                tab_value: any;
-                tab_value_count: number;
-            } | {
-                tab_value: string;
-                tab_value_count: any;
-            })[];
-            entity_list: import("typeorm").ObjectLiteral[];
+            entity_tabs: any[];
+            entity_list: any[];
             pagination: {
                 total: number;
                 page: number;

package/dist/module/filter/service/filter.service.d.ts

@@ -17,14 +17,8 @@ export declare class FilterService {
     applyFilter(dto: FilterRequestDto): Promise<{
         success: boolean;
         data: {
-            entity_tabs: ({
-                tab_value: any;
-                tab_value_count: number;
-            } | {
-                tab_value: string;
-                tab_value_count: any;
-            })[];
-            entity_list: import("typeorm").ObjectLiteral[];
+            entity_tabs: any[];
+            entity_list: any[];
             pagination: {
                 total: number;
                 page: number;

package/dist/module/filter/service/filter.service.js

@@ -32,27 +32,39 @@ let FilterService = class FilterService {
     async gettab_value_counts(tableName, column, whereClauses) {
         if (!column)
             return [];
-        const qb = this.dataSource
-            .getRepository(tableName)
-            .createQueryBuilder('e')
-            .select(`e.${column}`, 'tab_value')
-            .addSelect('COUNT(*)', 'tab_value_count')
-            .groupBy(`e.${column}`);
-        whereClauses.forEach((clause) => qb.andWhere(clause.query, clause.params));
-        const rows = await qb.getRawMany();
-        const total = rows.reduce((sum, r) => sum + parseInt(r.tab_value_count), 0);
+        let whereSQL = '';
+        const values = [];
+        if (whereClauses.length > 0) {
+            const clauseParts = whereClauses.map((clause) => {
+                let parsedQuery = clause.query.replace(/\be\./g, '');
+                Object.entries(clause.params).forEach(([key, val]) => {
+                    parsedQuery = parsedQuery.replace(new RegExp(`:${key}`, 'g'), '?');
+                    values.push(val);
+                });
+                return parsedQuery;
+            });
+            whereSQL = `WHERE ${clauseParts.join(' AND ')}`;
+        }
+        const rawSQL = `
+  SELECT ${column} AS tab_value, COUNT(*) AS tab_value_count
+  FROM ${tableName}
+  ${whereSQL}
+  GROUP BY ${column}
+`;
+        const rows = await this.dataSource.query(rawSQL, values);
+        const total = rows.reduce((sum, r) => sum + parseInt(r.tab_value_count, 10), 0);
         return [
             { tab_value: 'All', tab_value_count: total },
             ...rows.map((r) => ({
-                tab_value: r.tab_value || 'UNKNOWN',
-                tab_value_count: parseInt(r.tab_value_count),
+                tab_value: r.tab_value ?? 'UNKNOWN',
+                tab_value_count: parseInt(r.tab_value_count, 10),
             })),
         ];
     }
     async applyFilter(dto) {
         const { entity_type, quickFilter, savedFilterCode, attributeFilter, tabs, sortby, } = dto;
-        const entityMeta = await this.entityMasterService.getEntityData(entity_type);
-        const tableName = entityMeta?.db_table_name;
+        const entityMeta = await this.entityTableService.getEntityData(entity_type);
+        const tableName = entityMeta?.data_source;
         if (!tableName)
             throw new common_1.BadRequestException(`Invalid entity_type: ${entity_type}`);
         const getTableMeta = await this.entityTableService.findByEntityTypeAndListTypeAndDisplayType(entity_type, entity_type, 'LIST');
@@ -71,7 +83,7 @@ let FilterService = class FilterService {
             ...(attributeFilter || []).filter((f) => f.filter_value !== ''),
         ];
         const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
-        const allTabs = await this.gettab_value_counts(tableName, tabs?.columnName, baseWhere);
+        const allTabs = await this.gettab_value_counts(getTableMeta.data_source, tabs?.columnName, baseWhere);
         const dataWhere = [...baseWhere];
         if (tabs?.columnName && tabs?.value) {
             const tabAttrMeta = attributeMetaMap[tabs.columnName];
@@ -84,8 +96,13 @@ let FilterService = class FilterService {
                 dataWhere.push(tabCondition);
             }
         }
-        const qb = this.dataSource.getRepository(tableName).createQueryBuilder('e');
-        dataWhere.forEach((clause) => qb.andWhere(clause.query, clause.params));
+        const qb = this.dataSource
+            .createQueryBuilder()
+            .select('e.*')
+            .from(tableName, 'e');
+        dataWhere.forEach((clause) => {
+            qb.andWhere(clause.query, clause.params);
+        });
         if (Array.isArray(sortby)) {
             sortby.forEach(({ sortColum, sortType }) => {
                 qb.addOrderBy(`e.${sortColum}`, sortType.toUpperCase() === 'DSC' ? 'DESC' : 'ASC');
@@ -94,7 +111,16 @@ let FilterService = class FilterService {
         const page = dto.page && dto.page > 0 ? dto.page : 1;
         const size = dto.size && dto.size > 0 ? dto.size : 10;
         qb.skip((page - 1) * size).take(size);
-        const [entity_list, total] = await qb.getManyAndCount();
+        const entity_list = await qb.getRawMany();
+        const countQb = this.dataSource
+            .createQueryBuilder()
+            .select('COUNT(*)', 'count')
+            .from(tableName, 'e');
+        dataWhere.forEach((clause) => {
+            countQb.andWhere(clause.query, clause.params);
+        });
+        const countResult = await countQb.getRawOne();
+        const total = parseInt(countResult.count, 10);
         return {
             success: true,
             data: {
@@ -142,10 +168,12 @@ let FilterService = class FilterService {
     buildCondition(filter, meta) {
         if (!meta)
             return null;
-        const attr = filter.filter_attribute;
+        let attr = filter.filter_attribute;
         const val = filter.filter_value;
         const op = filter.filter_operator;
         const key = `param_${attr}_${Math.random().toString(36).substring(2, 8)}`;
+        if (meta.data_source_type === 'entity')
+            attr = `${attr}_id`;
         switch (meta.data_type) {
             case 'text':
                 return this.buildTextCondition(attr, op, val, key);
@@ -156,7 +184,7 @@ let FilterService = class FilterService {
             case 'select':
                 return this.buildSelectCondition(attr, op, val, key);
             case 'multiselect':
-                return this.buildMultiSelectCondition(attr, val, key);
+                return this.buildMultiSelectCondition(attr, op, val, key);
             default:
                 return null;
         }
@@ -222,18 +250,41 @@ let FilterService = class FilterService {
         switch (op) {
             case 'equal':
                 return { query: `e.${attr} = :${key}`, params: { [key]: val } };
+            case 'not_equal':
+                return { query: `e.${attr} != :${key}`, params: { [key]: val } };
+            case 'empty':
+                return { query: `e.${attr} IS NULL`, params: {} };
+            case 'not_empty':
+                return { query: `e.${attr} IS NOT NULL`, params: {} };
             default:
                 throw new common_1.BadRequestException(`Unsupported operator for select: ${op}`);
         }
     }
-    buildMultiSelectCondition(attr, val, key) {
-        if (!Array.isArray(val)) {
-            throw new common_1.BadRequestException(`Expected array for multiselect: ${attr}`);
+    buildMultiSelectCondition(attr, op, val, key) {
+        if (Array.isArray(val) && val.length === 0) {
+            return { query: '1=1', params: {} };
+        }
+        if ((op === 'equal' || op === 'not_equal') && !Array.isArray(val)) {
+            throw new common_1.BadRequestException(`Value for multi-select must be an array for operator: ${op}`);
+        }
+        switch (op) {
+            case 'equal':
+                return {
+                    query: `e.${attr} IN (:${key})`,
+                    params: { [key]: val },
+                };
+            case 'not_equal':
+                return {
+                    query: `e.${attr} NOT IN (:${key})`,
+                    params: { [key]: val },
+                };
+            case 'empty':
+                return { query: `e.${attr} IS NULL`, params: {} };
+            case 'not_empty':
+                return { query: `e.${attr} IS NOT NULL`, params: {} };
+            default:
+                throw new common_1.BadRequestException(`Unsupported operator for multiselect: ${op}`);
         }
-        return {
-            query: `e.${attr} IN (:...${key})`,
-            params: { [key]: val },
-        };
     }
 };
 exports.FilterService = FilterService;

package/dist/module/filter/service/filter.service.js.map

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

package/dist/module/meta/repository/entity-table.repository.d.ts

@@ -4,5 +4,6 @@ export declare class EntityTableRepository {
     private entityTableRepository;
     constructor(entityTableRepository: Repository<EntityTable>);
     findByEntityTypeAndListType(entityType: string, listType: string): Promise<EntityTable | null>;
+    findByMappedEntityType(mappedEntityType: string): Promise<EntityTable | null>;
     findByEntityTypeAndListTypeAndDisplayType(entityType: string, listType: string, displayType: string): Promise<EntityTable | null>;
 }

package/dist/module/meta/repository/entity-table.repository.js

@@ -27,6 +27,11 @@ let EntityTableRepository = class EntityTableRepository {
         });
         return temp;
     }
+    async findByMappedEntityType(mappedEntityType) {
+        return await this.entityTableRepository.findOne({
+            where: { mapped_entity_type: mappedEntityType, display_type: 'LIST' },
+        });
+    }
     async findByEntityTypeAndListTypeAndDisplayType(entityType, listType, displayType) {
         return await this.entityTableRepository.findOne({
             where: {

package/dist/module/meta/repository/entity-table.repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-table.repository.js","sourceRoot":"","sources":["../../../../src/module/meta/repository/entity-table.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,uEAA4D;AAGrD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,qBAA8C;QAA9C,0BAAqB,GAArB,qBAAqB,CAAyB;IACrD,CAAC;IAEJ,KAAK,CAAC,2BAA2B,CAAC,UAAkB,EAAE,QAAgB;QACpE,MAAM,IAAI,GAAI,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;YACrD,KAAK,EAAE,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE;SAC/D,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,yCAAyC,CAC7C,UAAkB,EAClB,QAAgB,EAChB,WAAmB;QAEnB,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;YAC9C,KAAK,EAAE;gBACL,kBAAkB,EAAE,UAAU;gBAC9B,SAAS,EAAE,QAAQ;gBACnB,YAAY,EAAE,WAAW;aAC1B;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AA1BY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACC,oBAAU;GAHhC,qBAAqB,CA0BjC"}
+{"version":3,"file":"entity-table.repository.js","sourceRoot":"","sources":["../../../../src/module/meta/repository/entity-table.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAqC;AACrC,uEAA4D;AAGrD,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;IAChC,YAEU,qBAA8C;QAA9C,0BAAqB,GAArB,qBAAqB,CAAyB;IACrD,CAAC;IAEJ,KAAK,CAAC,2BAA2B,CAAC,UAAkB,EAAE,QAAgB;QACpE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;YACpD,KAAK,EAAE,EAAE,kBAAkB,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE;SAC/D,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,gBAAwB;QACnD,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;YAC9C,KAAK,EAAE,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,EAAE;SACtE,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,yCAAyC,CAC7C,UAAkB,EAClB,QAAgB,EAChB,WAAmB;QAEnB,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC;YAC9C,KAAK,EAAE;gBACL,kBAAkB,EAAE,UAAU;gBAC9B,SAAS,EAAE,QAAQ;gBACnB,YAAY,EAAE,WAAW;aAC1B;SACF,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAhCY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,iCAAW,CAAC,CAAA;qCACC,oBAAU;GAHhC,qBAAqB,CAgCjC"}

package/dist/module/meta/service/entity-table.service.d.ts

@@ -9,6 +9,7 @@ export declare class EntityTableService {
     private readonly listMasterService;
     private readonly savedFilterRepoService;
     constructor(entityTableRepository: EntityTableRepository, entityTableColumnRepository: EntityTableColumnRepository, listMasterService: ListMasterService, savedFilterRepoService: SavedFilterRepositoryService);
+    getEntityData(mappedEntityType: string | null): Promise<import("../entity/entity-table.entity").EntityTable>;
     findByEntityTypeAndListType(entityType: string, listType: string): Promise<import("../entity/entity-table.entity").EntityTable | null>;
     findByEntityTypeAndListTypeAndDisplayType(entityType: string, listType: string, displayType: string): Promise<import("../entity/entity-table.entity").EntityTable | null>;
     getTableMetaDataForListing(entityType: string, listType: string, userId?: number): Promise<EntityTableDto>;

package/dist/module/meta/service/entity-table.service.js

@@ -26,6 +26,18 @@ let EntityTableService = class EntityTableService {
         this.listMasterService = listMasterService;
         this.savedFilterRepoService = savedFilterRepoService;
     }
+    async getEntityData(mappedEntityType) {
+        if (mappedEntityType) {
+            const tableMaster = await this.entityTableRepository.findByMappedEntityType(mappedEntityType);
+            if (!tableMaster) {
+                throw new Error(`Entity with mappedEntityType "${mappedEntityType}" not found.`);
+            }
+            return tableMaster;
+        }
+        else {
+            throw new Error();
+        }
+    }
     async findByEntityTypeAndListType(entityType, listType) {
         return await this.entityTableRepository.findByEntityTypeAndListType(entityType, listType);
     }
@@ -42,15 +54,17 @@ let EntityTableService = class EntityTableService {
             entityTableDto.column_list =
                 await this.entityTableColumnRepository.findByParentIdAndParentType(entityTable.id, entityTable.entity_type);
             entityTableDto.operation_list = {
-                "text": await this.listMasterService.getDropdownOptions("OPT", {}),
-                "number": await this.listMasterService.getDropdownOptions("OPN", {}),
-                "date": await this.listMasterService.getDropdownOptions("OPD", {}),
-                "select": await this.listMasterService.getDropdownOptions("OPS", {}),
-                "multiselect": await this.listMasterService.getDropdownOptions("OPM", {})
+                text: await this.listMasterService.getDropdownOptions('OPT', {}),
+                number: await this.listMasterService.getDropdownOptions('OPN', {}),
+                date: await this.listMasterService.getDropdownOptions('OPD', {}),
+                select: await this.listMasterService.getDropdownOptions('OPS', {}),
+                multiselect: await this.listMasterService.getDropdownOptions('OPM', {}),
             };
-            entityTableDto.default_filter = await this.savedFilterRepoService.getDefaultFilterByEntityType(entityTable.list_type);
+            entityTableDto.default_filter =
+                await this.savedFilterRepoService.getDefaultFilterByEntityType(entityTable.list_type);
             if (userId) {
-                entityTableDto.saved_filter = await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(userId, entityTable.list_type);
+                entityTableDto.saved_filter =
+                    await this.savedFilterRepoService.getSavedFiltersByUserIdAndEntityType(userId, entityTable.list_type);
             }
         }
         return entityTableDto;

package/dist/module/meta/service/entity-table.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-table.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-table.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAgE;AAChE,mFAA8E;AAC9E,iGAA2F;AAE3F,uEAAiE;AACjE,sFAAsF;AAEtF,6FAAoG;AAG7F,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAC7B,YACU,qBAA4C,EACnC,2BAAwD,EAE1D,iBAAoC,EAEpC,sBAAoD;QAL3D,0BAAqB,GAArB,qBAAqB,CAAuB;QACnC,gCAA2B,GAA3B,2BAA2B,CAA6B;QAE1D,sBAAiB,GAAjB,iBAAiB,CAAmB;QAEpC,2BAAsB,GAAtB,sBAAsB,CAA8B;IAErE,CAAC;IAED,KAAK,CAAC,2BAA2B,CAAC,UAAkB,EAAE,QAAgB;QACpE,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,2BAA2B,CACjE,UAAU,EACV,QAAQ,CACT,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,yCAAyC,CAC7C,UAAkB,EAClB,QAAgB,EAChB,WAAmB;QAEnB,OAAO,MAAM,IAAI,CAAC,qBAAqB,CAAC,yCAAyC,CAC/E,UAAU,EACV,QAAQ,EACR,WAAW,CACZ,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,0BAA0B,CAAC,UAAkB,EAAE,QAAgB,EAAC,MAAe;QACnF,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,QAAQ,EAAE,8BAAY,EAAC,MAAM,CAAC,CAAC;IAChF,CAAC;IAED,KAAK,CAAC,gBAAgB,CACpB,UAAkB,EAClB,QAAgB,EAChB,WAAmB,EACnB,MAAe;QAEf,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,yCAAyC,CACpE,UAAU,EACV,QAAQ,EACR,WAAW,CACZ,CAAC;QAEF,IAAI,cAAc,GAAG,WAA6B,CAAC;QACnD,IAAI,WAAW,EAAE,CAAC;YAChB,cAAc,CAAC,WAAW;gBACxB,MAAM,IAAI,CAAC,2BAA2B,CAAC,2BAA2B,CAChE,WAAW,CAAC,EAAE,EACd,WAAW,CAAC,WAAW,CACxB,CAAC;YACF,cAAc,CAAC,cAAc,GAAG;gBAC9B,MAAM,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,EAAC,EAAE,CAAC;gBACjE,QAAQ,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,EAAC,EAAE,CAAC;gBACnE,MAAM,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,EAAC,EAAE,CAAC;gBACjE,QAAQ,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,EAAC,EAAE,CAAC;gBACnE,aAAa,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,kBAAkB,CAAC,KAAK,EAAC,EAAE,CAAC;aAEzE,CAAC;YACF,cAAc,CAAC,cAAc,GAAE,MAAM,IAAI,CAAC,sBAAsB,CAAC,4BAA4B,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;YACrH,IAAG,MAAM,EAAC,CAAC;gBACX,cAAc,CAAC,YAAY,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,oCAAoC,CAAC,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;YACpI,CAAC;QACL,CAAC;QAID,OAAO,cAAc,CAAC;IACxB,CAAC;CACF,CAAA;AAvEY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,eAAM,EAAC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,uCAAiB,CAAC,CAAC,CAAA;qCAFb,+CAAqB;QACN,4DAA2B;QAEvC,uCAAiB;QAEZ,sDAA4B;GAP1D,kBAAkB,CAuE9B"}
+{"version":3,"file":"entity-table.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/entity-table.service.ts"],"names":[],"mappings":"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"}

package/dist/module/user/controller/login.controller.js

@@ -41,11 +41,8 @@ let LoginController = class LoginController {
         return this.loginService.loginWithGoogle(email, name);
     }
     async switchCurrentLevel(req, data) {
-        const userId = req.user.userData.id;
-        const currentUserLevelType = req.user.userData.level_type;
-        const currentUserLevelId = req.user.userData.level_id;
-        const currentUserOrganization_id = req.user.userData.organization_id;
-        return await this.userSessionService.switchCurrentLevelService(userId, currentUserLevelType, currentUserLevelId, currentUserOrganization_id, data);
+        const currentUser = req.user.userData;
+        return await this.userSessionService.switchCurrentLevelService(currentUser, data);
     }
 };
 exports.LoginController = LoginController;

package/dist/module/user/controller/login.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/login.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"login.controller.js","sourceRoot":"","sources":["../../../../src/module/user/controller/login.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CASwB;AACxB,4DAAwD;AACxD,qFAAgF;AAChF,2DAA2D;AAE3D,0EAAqE;AAG9D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YACU,YAA0B,EAC1B,kBAAsC;QADtC,iBAAY,GAAZ,YAAY,CAAc;QAC1B,uBAAkB,GAAlB,kBAAkB,CAAoB;IAC7C,CAAC;IAGE,AAAN,KAAK,CAAC,KAAK,CAAS,IAAI,EAAS,GAAa;QAC5C,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;QAC9D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;QACjE,OAAO,GAAG,CAAC,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAIK,AAAN,KAAK,CAAC,MAAM,CACH,OAAgC,EAChC,QAAkB;QAEzB,IAAI,WAAW,GAAQ,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC7C,QAAQ;aACL,MAAM,CAAC,mBAAU,CAAC,EAAE,CAAC;aACrB,IAAI,CAAC,MAAM,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;IACpE,CAAC;IAIK,AAAN,KAAK,CAAC,WAAW;IAEjB,CAAC;IAKK,AAAN,KAAK,CAAC,kBAAkB,CAAQ,GAAG;QACjC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAGxC,OAAO,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAIK,AAAN,KAAK,CAAC,kBAAkB,CACf,GAA4B,EAEnC,IAIC;QAED,MAAM,WAAW,GAAG,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC;QAEtC,OAAO,MAAM,IAAI,CAAC,kBAAkB,CAAC,yBAAyB,CAC5D,WAAW,EACX,IAAI,CACL,CAAC;IACJ,CAAC;CACF,CAAA;AA3DY,0CAAe;AAOpB;IADL,IAAA,aAAI,EAAC,OAAO,CAAC;IACD,WAAA,IAAA,aAAI,GAAE,CAAA;IAAQ,WAAA,IAAA,YAAG,GAAE,CAAA;;;;4CAI/B;AAIK;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,aAAI,EAAC,QAAQ,CAAC;IAEZ,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,YAAG,GAAE,CAAA;;;;6CAMP;AAIK;IAFL,IAAA,YAAG,EAAC,QAAQ,CAAC;IACb,IAAA,kBAAS,EAAC,mCAAe,CAAC;;;;kDAG1B;AAKK;IAFL,IAAA,YAAG,EAAC,iBAAiB,CAAC;IACtB,IAAA,kBAAS,EAAC,mCAAe,CAAC;IACD,WAAA,IAAA,YAAG,GAAE,CAAA;;;;yDAK9B;AAIK;IAFL,IAAA,kBAAS,EAAC,wBAAY,CAAC;IACvB,IAAA,aAAI,EAAC,QAAQ,CAAC;IAEZ,WAAA,IAAA,YAAG,GAAE,CAAA;IACL,WAAA,IAAA,aAAI,GAAE,CAAA;;;;yDAaR;0BA1DU,eAAe;IAD3B,IAAA,mBAAU,EAAC,MAAM,CAAC;qCAGO,4BAAY;QACN,yCAAkB;GAHrC,eAAe,CA2D3B"}

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

@@ -16,7 +16,7 @@ export declare class UserSessionService {
     createSession(user: any, appcode?: string, accessInfo?: any): Promise<string>;
     findBySessionKey(sessionKey: string): Promise<UserSession | null>;
     updateSession(userSession: UserSession): Promise<void>;
-    switchCurrentLevelService(userId: number, currentUserLevelType: string, currentUserLevelId: string, currentUserOrgId: number, data: any): Promise<{
+    switchCurrentLevelService(currentUser: any, data: any): Promise<{
         success: boolean;
         access_token: string;
         appcode: string;

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

@@ -60,15 +60,15 @@ let UserSessionService = class UserSessionService {
     async updateSession(userSession) {
         await this.userSessionRepository.saveSession(userSession);
     }
-    async switchCurrentLevelService(userId, currentUserLevelType, currentUserLevelId, currentUserOrgId, data) {
+    async switchCurrentLevelService(currentUser, data) {
         let payload;
         payload = {
-            id: userId,
-            level_id: currentUserLevelId,
-            level_type: currentUserLevelType,
+            ...currentUser,
+            level_id: data.level_id,
+            level_type: data.level_type,
             appcode: data.appcode,
         };
-        await this.dataSource.query(`UPDATE cr_user SET last_app_access = ? WHERE id = ?`, [data.appcode, userId]);
+        await this.dataSource.query(`UPDATE cr_user SET last_app_access = ? WHERE id = ?`, [data.appcode, currentUser.id]);
         return {
             success: true,
             access_token: this.jwtAuthService.generateJwt(payload),

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

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