rez_core 5.0.85 → 5.0.87

package/dist/module/meta/service/resolver.service.js

@@ -13,20 +13,22 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResolverService = void 0;
-const typeorm_1 = require("typeorm");
 const common_1 = require("@nestjs/common");
 const moment = require("moment");
 const list_master_service_1 = require("../../listmaster/service/list-master.service");
 const core_1 = require("@nestjs/core");
 const attribute_master_repository_1 = require("../repository/attribute-master.repository");
 const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
+const entity_master_repository_1 = require("../repository/entity-master.repository");
+const typeorm_1 = require("typeorm");
 let ResolverService = class ResolverService {
-    constructor(dataSource, listMasterService, moduleRef, attributeMasterRepo, reflectionHelper) {
-        this.dataSource = dataSource;
+    constructor(listMasterService, moduleRef, attributeMasterRepo, reflectionHelper, entityMasterRepo, entityManger) {
         this.listMasterService = listMasterService;
         this.moduleRef = moduleRef;
         this.attributeMasterRepo = attributeMasterRepo;
         this.reflectionHelper = reflectionHelper;
+        this.entityMasterRepo = entityMasterRepo;
+        this.entityManger = entityManger;
     }
     async getMediaDataService() {
         if (!this.mediaDataService) {
@@ -94,18 +96,11 @@ let ResolverService = class ResolverService {
         if (rawValue === null || rawValue === undefined || rawValue === '') {
             return rawValue;
         }
-        const [attr] = await this.dataSource.query(`SELECT *
-       FROM frm_entity_attribute
-       WHERE mapped_entity_type = $1
-         AND organization_id = $2
-         AND attribute_key = $3`, [entityType, loggedInUser.organization_id, attrKey]);
+        const attr = await this.attributeMasterRepo.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(entityType, attrKey, loggedInUser.organization_id);
         if (!attr)
             return rawValue;
         if (attr.data_source_type === 'entity') {
-            const [entityDef] = await this.dataSource.query(`SELECT *
-         FROM frm_entity_master
-         WHERE mapped_entity_type = $1
-           AND organization_id = $2`, [attr.datasource_list, loggedInUser.organization_id]);
+            const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(attr.datasource_list, loggedInUser.organization_id);
             if (!entityDef)
                 return rawValue;
             const tableName = entityDef.db_table_name;
@@ -113,34 +108,34 @@ let ResolverService = class ResolverService {
                 const resolvedValues = [];
                 for (const code of rawValue) {
                     const query = tableName === 'sso_organization'
-                        ? `SELECT *
-                 FROM ${tableName}
+                        ? `SELECT *
+                 FROM ${tableName}
                  WHERE code = $1`
-                        : `SELECT *
-                 FROM ${tableName}
-                 WHERE id = $1
+                        : `SELECT *
+                 FROM ${tableName}
+                 WHERE id = $1
                    AND organization_id = $2`;
                     const params = tableName === 'sso_organization'
                         ? [code]
                         : [code, loggedInUser.organization_id];
-                    const [item] = await this.dataSource.query(query, params);
+                    const [item] = await this.entityManger.query(query, params);
                     resolvedValues.push(item?.[attr.data_source_attribute] ?? code);
                 }
                 return resolvedValues;
             }
             else {
                 const query = tableName === 'sso_organization'
-                    ? `SELECT *
-               FROM ${tableName}
+                    ? `SELECT *
+               FROM ${tableName}
                WHERE id = $1`
-                    : `SELECT *
-               FROM ${tableName}
-               WHERE id = $1
+                    : `SELECT *
+               FROM ${tableName}
+               WHERE id = $1
                  AND organization_id = $2`;
                 const params = tableName === 'sso_organization'
                     ? [rawValue]
                     : [rawValue, loggedInUser.organization_id];
-                const [item] = await this.dataSource.query(query, params);
+                const [item] = await this.entityManger.query(query, params);
                 return item?.[attr.data_source_attribute] ?? rawValue;
             }
         }
@@ -148,7 +143,7 @@ let ResolverService = class ResolverService {
             if (Array.isArray(rawValue)) {
                 const resolvedValues = [];
                 for (const code of rawValue) {
-                    const repo = await this.reflectionHelper.getRepoService('ListMasterItems');
+                    const repo = this.reflectionHelper.getRepoService('ListMasterItems');
                     let item = repo.findOne({
                         where: {
                             id: code,
@@ -180,41 +175,36 @@ let ResolverService = class ResolverService {
             displayValue === '') {
             return displayValue;
         }
-        const [attr] = await this.dataSource.query(`SELECT *
-       FROM frm_entity_attribute
-       WHERE mapped_entity_type = $1
-         AND organization_id = $2
-         AND attribute_key = $3`, [entityType, loggedInUser.organization_id, attrKey]);
+        const attr = await this.attributeMasterRepo.findByMappedEntityTypeAndAttributeKeyAndOrganizationId(entityType, attrKey, loggedInUser.organization_id);
         if (!attr)
             return displayValue;
         if (attr.data_source_type === 'entity') {
-            const [entityDef] = await this.dataSource.query(`SELECT *
-         FROM frm_entity_master
-         WHERE mapped_entity_type = $1
-           AND organization_id = $2`, [attr.datasource_list, loggedInUser.organization_id]);
+            const entityDef = await this.entityMasterRepo.getEntityByMappedEntityType(attr.datasource_list, loggedInUser.organization_id);
             if (!entityDef)
                 return displayValue;
             const tableName = entityDef.db_table_name;
             const query = tableName === 'sso_organization'
-                ? `SELECT id
-             FROM ${tableName}
+                ? `SELECT id
+             FROM ${tableName}
              WHERE ${attr.data_source_attribute} = $1`
-                : `SELECT id
-             FROM ${tableName}
-             WHERE ${attr.data_source_attribute} = $1
+                : `SELECT id
+             FROM ${tableName}
+             WHERE ${attr.data_source_attribute} = $1
                AND organization_id = $2`;
             const params = tableName === 'sso_organization'
                 ? [displayValue]
                 : [displayValue, loggedInUser.organization_id];
-            const [item] = await this.dataSource.query(query, params);
+            const [item] = await this.entityManger.query(query, params);
             return item?.id ?? displayValue;
         }
         else if (attr.data_source_type === 'master') {
-            const [item] = await this.dataSource.query(`SELECT id
-         FROM frm_list_master_items
-         WHERE ${attr.data_source_attribute} = $1
-           AND organization_id = $2
-           AND listtype = $3`, [displayValue, loggedInUser.organization_id, attr.datasource_list]);
+            const listMasterItemsRepo = this.reflectionHelper.getRepoService('ListMasterItems');
+            const item = await listMasterItemsRepo.findOne({
+                where: { [attr.data_source_attribute]: displayValue,
+                    organization_id: loggedInUser.organization_id,
+                    listtype: attr.datasource_list
+                }
+            });
             return item?.id ?? displayValue;
         }
         return displayValue;
@@ -223,11 +213,12 @@ let ResolverService = class ResolverService {
 exports.ResolverService = ResolverService;
 exports.ResolverService = ResolverService = __decorate([
     (0, common_1.Injectable)(),
-    __param(1, (0, common_1.Inject)('ListMasterService')),
-    __metadata("design:paramtypes", [typeorm_1.DataSource,
-        list_master_service_1.ListMasterService,
+    __param(0, (0, common_1.Inject)('ListMasterService')),
+    __metadata("design:paramtypes", [list_master_service_1.ListMasterService,
         core_1.ModuleRef,
         attribute_master_repository_1.AttributeMasterRepository,
-        reflection_helper_service_1.ReflectionHelper])
+        reflection_helper_service_1.ReflectionHelper,
+        entity_master_repository_1.EntityMasterRepository,
+        typeorm_1.EntityManager])
 ], ResolverService);
 //# sourceMappingURL=resolver.service.js.map

package/dist/module/meta/service/resolver.service.js.map

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

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

@@ -1,11 +1,13 @@
 import { DataSource, Repository } from 'typeorm';
 import { MenuData } from '../entity/menu.entity';
+import { ModuleAccess } from '../entity/module-access.entity';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 export declare class MenuRepository extends Repository<MenuData> {
     private readonly dataSource;
     private readonly menuData;
     private readonly reflectionHelper;
-    constructor(dataSource: DataSource, menuData: Repository<MenuData>, reflectionHelper: ReflectionHelper);
+    private readonly moduleAccessRepo;
+    constructor(dataSource: DataSource, menuData: Repository<MenuData>, reflectionHelper: ReflectionHelper, moduleAccessRepo: Repository<ModuleAccess>);
     getUserRoles(userId: number, appcode: string): Promise<number[]>;
     getAccessibleModules(roleIds: number[], appCode: string): Promise<string[]>;
     getMenuItems(moduleCodes: string[], appcode: string, levelType: string): Promise<any[]>;

package/dist/module/module/repository/menu.repository.js

@@ -17,40 +17,38 @@ const common_1 = require("@nestjs/common");
 const typeorm_1 = require("typeorm");
 const menu_entity_1 = require("../entity/menu.entity");
 const module_access_entity_1 = require("../entity/module-access.entity");
-const user_role_mapping_entity_1 = require("../../user/entity/user-role-mapping.entity");
-const role_entity_1 = require("../../user/entity/role.entity");
 const typeorm_2 = require("@nestjs/typeorm");
 const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let MenuRepository = class MenuRepository extends typeorm_1.Repository {
-    constructor(dataSource, menuData, reflectionHelper) {
+    constructor(dataSource, menuData, reflectionHelper, moduleAccessRepo) {
         super(menu_entity_1.MenuData, dataSource.createEntityManager());
         this.dataSource = dataSource;
         this.menuData = menuData;
         this.reflectionHelper = reflectionHelper;
+        this.moduleAccessRepo = moduleAccessRepo;
     }
     async getUserRoles(userId, appcode) {
-        const roles = await this.dataSource
-            .getRepository(user_role_mapping_entity_1.UserRoleMapping)
+        const userRoleMappingRepo = this.reflectionHelper.getRepoService('UserRoleMapping');
+        const roles = await userRoleMappingRepo
             .createQueryBuilder('urm')
             .innerJoin('sso_role', 'role', 'role.id = urm.role_id')
-            .select('urm.role_id')
+            .select('urm.role_id', 'role_id')
             .where('urm.user_id = :userId', { userId })
             .andWhere('role.appcode = :appcode', { appcode })
             .getRawMany();
         return roles.map((r) => r.urm_role_id);
     }
     async getAccessibleModules(roleIds, appCode) {
-        const roleCodes = await this.dataSource
-            .getRepository(role_entity_1.Role)
+        const roleRepo = this.reflectionHelper.getRepoService('Role');
+        const roleCodes = await roleRepo
             .createQueryBuilder('role')
-            .select('role.code')
+            .select('role.code', 'code')
             .where('role.id IN (:...roleIds)', { roleIds })
-            .getMany();
-        const codes = roleCodes.map((role) => role.code);
+            .getRawMany();
+        const codes = roleCodes.map(r => r.code);
         if (codes.length === 0)
             return [];
-        const modules = await this.dataSource
-            .getRepository(module_access_entity_1.ModuleAccess)
+        const modules = await this.moduleAccessRepo
             .createQueryBuilder('moduleAccess')
             .select('moduleAccess.module_code')
             .where('moduleAccess.role_code IN (:...codes)', { codes })
@@ -62,10 +60,10 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async getMenuItems(moduleCodes, appcode, levelType) {
         return await this.menuData
             .createQueryBuilder('menu')
-            .leftJoin('sso_module', 'module', `
-          menu.module_code = module.module_code
-          AND LOWER(menu.appcode) = LOWER(module.appcode)
-          AND menu.level_type = module.level_type
+            .leftJoin('sso_module', 'module', `
+          menu.module_code = module.module_code
+          AND LOWER(menu.appcode) = LOWER(module.appcode)
+          AND menu.level_type = module.level_type
         `)
             .where('menu.module_code IN (:...moduleCodes)', { moduleCodes })
             .andWhere('LOWER(menu.appcode) = LOWER(:appcode)', { appcode })
@@ -84,20 +82,21 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async resolveUserRoles(userId, appcode, levelType, levelId) {
         const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
         if (userId) {
-            const getUserDetails = await this.dataSource.query(`
-            SELECT *
-            from sso_user
-            where id = $1
-        `, [userId]);
-            const getUserUrm = await this.dataSource.query(`
-            SELECT *
-            from sso_user_role_mapping
-            where user_id = $1
-              and appcode = $2
-        `, [userId, appcode]);
+            const userRepo = this.reflectionHelper.getRepoService('UserData');
+            const getUserDetails = await userRepo.findOne({
+                where: {
+                    id: userId,
+                },
+            });
+            const getUserUrm = await repo.findOne({
+                where: {
+                    user_id: userId,
+                    appcode: appcode,
+                },
+            });
             if (getUserDetails.length > 0 &&
                 getUserDetails[0].organization_id === 1) {
-                return [Number(getUserUrm[0].role_id)];
+                return [Number(getUserUrm.role_id)];
             }
         }
         let roles = await repo
@@ -112,11 +111,12 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
         if (roles.length)
             return roles.map((r) => r.urm_role_id);
         if (levelType === 'SCH') {
-            const [sch] = await this.dataSource.query(`
-            SELECT s.brand_id, s.organization_id
-            FROM sso_school s
-            WHERE s.id = $1
-        `, [levelId]);
+            const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+            const sch = await schoolRepo.findOne({
+                where: {
+                    id: levelId,
+                },
+            });
             const brandId = sch?.brand_id;
             const orgId = sch?.organization_id;
             if (brandId) {
@@ -153,8 +153,10 @@ exports.MenuRepository = MenuRepository;
 exports.MenuRepository = MenuRepository = __decorate([
     (0, common_1.Injectable)(),
     __param(1, (0, typeorm_2.InjectRepository)(menu_entity_1.MenuData)),
+    __param(3, (0, typeorm_2.InjectRepository)(module_access_entity_1.ModuleAccess)),
     __metadata("design:paramtypes", [typeorm_1.DataSource,
         typeorm_1.Repository,
-        reflection_helper_service_1.ReflectionHelper])
+        reflection_helper_service_1.ReflectionHelper,
+        typeorm_1.Repository])
 ], MenuRepository);
 //# sourceMappingURL=menu.repository.js.map

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

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

package/dist/module/notification/service/notification.service.js

@@ -67,12 +67,12 @@ let NotificationsService = class NotificationsService {
             isReadFilter = isRead ? '1' : '0';
         }
         let paramIndex = 1;
-        let sql = `
-    SELECT n.*
-    FROM frm_notification n
-    WHERE n.user_id = $${paramIndex}
-      AND n.level_id = $${paramIndex + 1}
-      AND n.level_type = $${paramIndex + 2}
+        let sql = `
+    SELECT n.*
+    FROM frm_notification n
+    WHERE n.user_id = $${paramIndex}
+      AND n.level_id = $${paramIndex + 1}
+      AND n.level_type = $${paramIndex + 2}
   `;
         const params = [
             String(id),
@@ -107,10 +107,10 @@ let NotificationsService = class NotificationsService {
     }
     async markAllAsRead(loggedInUser) {
         const { id, level_id, level_type } = loggedInUser;
-        const query = `
-    UPDATE frm_notification
-    SET is_read = 1
-    WHERE user_id = $1 AND level_id = $2 AND level_type = $3 AND is_read = 0
+        const query = `
+    UPDATE frm_notification
+    SET is_read = 1
+    WHERE user_id = $1 AND level_id = $2 AND level_type = $3 AND is_read = 0
   `;
         const params = [id, level_id, level_type];
         const result = await this.dataSource.query(query, params);

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

@@ -58,27 +58,27 @@ let LoginController = class LoginController {
             try {
                 const actualState = state.replace('gmail_config:', '');
                 const result = await this.integrationService.handleGmailTokensCallback(email, googleAccessToken, googleRefreshToken, actualState);
-                return res.send(`<html><body><script>
-    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
-    window.close();
+                return res.send(`<html><body><script>
+    window.opener.postMessage({ type: 'CONFIG_SUCCESS' }, '*');
+    window.close();
   </script> <p>Configuration successful. You can close this window.</p> </body></html>`);
             }
             catch (error) {
-                return res.send(`
-         <html>
-        <body>
-          <script>
-            if (window.opener) {
-              window.opener.postMessage({ 
-                type: "CONFIG_FAILED", 
-                error: "${error.message || 'Something went wrong'}" 
-              }, "*");
-            }
-            window.close();
-          </script>
-          <p>Configuration failed. Please close this window.</p>
-        </body>
-      </html>
+                return res.send(`
+         <html>
+        <body>
+          <script>
+            if (window.opener) {
+              window.opener.postMessage({ 
+                type: "CONFIG_FAILED", 
+                error: "${error.message || 'Something went wrong'}" 
+              }, "*");
+            }
+            window.close();
+          </script>
+          <p>Configuration failed. Please close this window.</p>
+        </body>
+      </html>
         `);
             }
         }

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

@@ -3,16 +3,19 @@ import { ClockIDGenService } from '../../../utils/service/clockIDGenUtil.service
 import { UserSessionRepository } from '../repository/userSession.repository';
 import { JwtAuthService } from 'src/module/auth/services/jwt.service';
 import { ConfigService } from '@nestjs/config';
-import { UserRoleMappingService } from './user-role-mapping.service';
-import { DataSource } from 'typeorm';
+import { Repository } from 'typeorm';
+import { UserRoleMapping } from '../entity/user-role-mapping.entity';
+import { UserData } from '../entity/user.entity';
+import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
 export declare class UserSessionService {
     private readonly userSessionRepository;
     private readonly jwtAuthService;
     private readonly clockIDGenService;
     private configService;
-    private readonly userRoleMappingService;
-    private readonly dataSource;
-    constructor(userSessionRepository: UserSessionRepository, jwtAuthService: JwtAuthService, clockIDGenService: ClockIDGenService, configService: ConfigService, userRoleMappingService: UserRoleMappingService, dataSource: DataSource);
+    private readonly userDataRepository;
+    private readonly userRoleMappingRepository;
+    private readonly reflectionHelper;
+    constructor(userSessionRepository: UserSessionRepository, jwtAuthService: JwtAuthService, clockIDGenService: ClockIDGenService, configService: ConfigService, userDataRepository: Repository<UserData>, userRoleMappingRepository: Repository<UserRoleMapping>, reflectionHelper: ReflectionHelper);
     createSession(user: any, appcode?: string, accessInfo?: any): Promise<string>;
     findBySessionKey(sessionKey: string): Promise<UserSession | null>;
     updateSession(userSession: UserSession): Promise<void>;

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

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserSessionService = void 0;
 const user_session_entity_1 = require("../entity/user-session.entity");
@@ -16,17 +19,20 @@ const common_1 = require("@nestjs/common");
 const userSession_repository_1 = require("../repository/userSession.repository");
 const jwt_service_1 = require("../../auth/services/jwt.service");
 const config_1 = require("@nestjs/config");
-const user_role_mapping_service_1 = require("./user-role-mapping.service");
 const typeorm_1 = require("typeorm");
 const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
+const user_entity_1 = require("../entity/user.entity");
+const typeorm_2 = require("@nestjs/typeorm");
+const reflection_helper_service_1 = require("../../../utils/service/reflection-helper.service");
 let UserSessionService = class UserSessionService {
-    constructor(userSessionRepository, jwtAuthService, clockIDGenService, configService, userRoleMappingService, dataSource) {
+    constructor(userSessionRepository, jwtAuthService, clockIDGenService, configService, userDataRepository, userRoleMappingRepository, reflectionHelper) {
         this.userSessionRepository = userSessionRepository;
         this.jwtAuthService = jwtAuthService;
         this.clockIDGenService = clockIDGenService;
         this.configService = configService;
-        this.userRoleMappingService = userRoleMappingService;
-        this.dataSource = dataSource;
+        this.userDataRepository = userDataRepository;
+        this.userRoleMappingRepository = userRoleMappingRepository;
+        this.reflectionHelper = reflectionHelper;
     }
     async createSession(user, appcode, accessInfo) {
         const sessionToken = this.clockIDGenService.idGenerator('SES');
@@ -69,16 +75,22 @@ let UserSessionService = class UserSessionService {
             level_type: data.level_type,
             appcode: data.appcode,
         };
-        let getUserDetails;
+        let getUserDetails = null;
         if (currentUser) {
-            getUserDetails = await this.dataSource.query(`
-        SELECT * from sso_user where id = $1
-      `, [currentUser.id]);
+            getUserDetails = await this.userDataRepository.findOne({
+                where: {
+                    id: currentUser.id,
+                }
+            });
         }
-        if (getUserDetails[0].organization_id == 1 && payload.level_type == 'ORG') {
+        if (getUserDetails?.organization_id == 1 && payload.level_type == 'ORG') {
             payload.organization_id = payload.level_id;
         }
-        await this.dataSource.query(`UPDATE sso_user SET last_app_access  = $1 , last_level_type = $2, last_level_id = $3 WHERE id = $4`, [data.appcode, data.level_type, data.level_id, currentUser.id]);
+        await this.userDataRepository.update(currentUser.id, {
+            last_app_access: data.appcode,
+            last_level_type: data.level_type,
+            last_level_id: data.level_id,
+        });
         return {
             success: true,
             accessToken: this.jwtAuthService.generateJwt(payload),
@@ -88,19 +100,17 @@ let UserSessionService = class UserSessionService {
         };
     }
     async checkIfUserHasMapping(userId, appcode, levelType, levelId) {
-        const count = await this.dataSource
-            .getRepository(user_role_mapping_entity_1.UserRoleMapping)
-            .createQueryBuilder('sso_user_role_mapping')
-            .where('sso_user_role_mapping.user_id = :userId', { userId })
-            .andWhere('sso_user_role_mapping.appcode = :appcode', { appcode })
-            .andWhere('sso_user_role_mapping.level_type = :levelType', { levelType })
-            .andWhere('sso_user_role_mapping.level_id = :levelId', { levelId })
+        const count = await this.userRoleMappingRepository
+            .createQueryBuilder("urm")
+            .where("urm.user_id = :userId", { userId })
+            .andWhere("urm.appcode = :appcode", { appcode })
+            .andWhere("urm.level_type = :levelType", { levelType })
+            .andWhere("urm.level_id = :levelId", { levelId })
             .getCount();
         return count > 0;
     }
     async getUserRoleMappingForApp(userId, appcode) {
-        const mapping = await this.dataSource
-            .getRepository(user_role_mapping_entity_1.UserRoleMapping)
+        const mapping = await this.userRoleMappingRepository
             .createQueryBuilder('sso_user_role_mapping')
             .where('sso_user_role_mapping.user_id = :userId', { userId })
             .andWhere('sso_user_role_mapping.appcode = :appcode', { appcode })
@@ -108,12 +118,20 @@ let UserSessionService = class UserSessionService {
         if (!mapping || mapping.level_type !== 'BRN') {
             return mapping;
         }
-        const schools = await this.dataSource.query(`SELECT id FROM sso_school WHERE brand_id = $1 ORDER BY id ASC LIMIT 1`, [mapping.level_id]);
-        if (schools.length) {
+        const schoolRepo = this.reflectionHelper.getRepoService('SSOSchool');
+        const schools = await schoolRepo.findOne({
+            where: {
+                brand_id: mapping.level_id
+            },
+            order: {
+                id: "ASC"
+            }
+        });
+        if (schools) {
             return {
                 ...mapping,
                 level_type: 'SCH',
-                level_id: schools[0].id,
+                level_id: schools.id,
             };
         }
         return null;
@@ -122,11 +140,14 @@ let UserSessionService = class UserSessionService {
 exports.UserSessionService = UserSessionService;
 exports.UserSessionService = UserSessionService = __decorate([
     (0, common_1.Injectable)(),
+    __param(4, (0, typeorm_2.InjectRepository)(user_entity_1.UserData)),
+    __param(5, (0, typeorm_2.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
     __metadata("design:paramtypes", [userSession_repository_1.UserSessionRepository,
         jwt_service_1.JwtAuthService,
         clockIDGenUtil_service_1.ClockIDGenService,
         config_1.ConfigService,
-        user_role_mapping_service_1.UserRoleMappingService,
-        typeorm_1.DataSource])
+        typeorm_1.Repository,
+        typeorm_1.Repository,
+        reflection_helper_service_1.ReflectionHelper])
 ], UserSessionService);
 //# sourceMappingURL=user-session.service.js.map