rez_core 5.0.86 → 5.0.87

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

@@ -60,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 })
@@ -82,7 +82,7 @@ let MenuRepository = class MenuRepository extends typeorm_1.Repository {
     async resolveUserRoles(userId, appcode, levelType, levelId) {
         const repo = this.reflectionHelper.getRepoService('UserRoleMapping');
         if (userId) {
-            const userRepo = this.reflectionHelper.getRepoService('User');
+            const userRepo = this.reflectionHelper.getRepoService('UserData');
             const getUserDetails = await userRepo.findOne({
                 where: {
                     id: userId,

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

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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"}

package/dist/module/workflow/controller/action-template-mapping.controller.d.ts

@@ -8,5 +8,5 @@ export declare class ActionTemplateMappingController {
         mode: number;
     }, req: Request & {
         user: any;
-    }): Promise<any>;
+    }): Promise<any[]>;
 }

package/dist/module/workflow/repository/action.repository.js

@@ -26,11 +26,11 @@ let ActionRepository = class ActionRepository {
     }
     async getReasonCode(loggedInUser) {
         const { organization_id } = loggedInUser;
-        const result = await this.dataSource.query(`
-          SELECT name, type
-          FROM frm_list_master
-          WHERE organization_id = $1
-            AND source = 'master'
+        const result = await this.dataSource.query(`
+          SELECT name, type
+          FROM frm_list_master
+          WHERE organization_id = $1
+            AND source = 'master'
       `, [organization_id]);
         const formatted = result.map((item) => ({
             label: item.name,
@@ -43,11 +43,11 @@ let ActionRepository = class ActionRepository {
         if (!list_type) {
             throw new common_1.BadRequestException('list_type is required');
         }
-        const result = await this.dataSource.query(`
-          SELECT name, id
-          FROM frm_list_master_items
-          WHERE listtype = $1
-            AND organization_id = $2
+        const result = await this.dataSource.query(`
+          SELECT name, id
+          FROM frm_list_master_items
+          WHERE listtype = $1
+            AND organization_id = $2
       `, [list_type, organization_id]);
         return result.map((row) => ({
             label: row.name,
@@ -119,8 +119,8 @@ let ActionRepository = class ActionRepository {
         ])
             .from('frm_wf_action', 'a')
             .leftJoin('frm_wf_action_category', 'ac', 'ac.id::text = a.action_category')
-            .leftJoin('frm_list_master_items', 'ar', `ar.id::text = a.action_requirement 
-      AND ar.listtype = 'ACRQ' 
+            .leftJoin('frm_list_master_items', 'ar', `ar.id::text = a.action_requirement 
+      AND ar.listtype = 'ACRQ' 
       AND ar.organization_id = :orgId`, { orgId: organization_id })
             .where('a.organization_id = :orgId', { orgId: organization_id })
             .andWhere('a.id::text IN (:...actionIds)', { actionIds })

package/dist/module/workflow/repository/comm-template.repository.js

@@ -43,9 +43,9 @@ let CommTemplateRepository = class CommTemplateRepository {
                 throw new Error('Invalid action_id');
             }
             is_template = actionResult.is_template;
-            await this.dataSource.query(`UPDATE frm_wf_comm_template
-     SET is_template = $1
-     WHERE mapped_entity_type = $2
+            await this.dataSource.query(`UPDATE frm_wf_comm_template
+     SET is_template = $1
+     WHERE mapped_entity_type = $2
        AND organization_id = $3 AND level_id = $4 AND level_type=$5`, [is_template, entity_type, organization_id, level_id, level_type]);
         }
         const whereCondition = {

package/dist/module/workflow/repository/form-master.repository.js

@@ -17,8 +17,8 @@ let FormMasterRepository = class FormMasterRepository {
         this.dataSource = dataSource;
     }
     async getForms(organization_id, source_entity_type) {
-        const forms = await this.dataSource.query(`SELECT fm.id as fm_id, fm.name as fm_form_name
-       FROM frm_entity_view fm
+        const forms = await this.dataSource.query(`SELECT fm.id as fm_id, fm.name as fm_form_name
+       FROM frm_entity_view fm
        WHERE fm.organization_id = $1 AND fm.mapped_entity_type = $2`, [organization_id, source_entity_type]);
         const formatted = forms.map((form) => ({
             label: form.fm_form_name,

package/dist/module/workflow/repository/stage-group.repository.js

@@ -88,28 +88,28 @@ let StageGroupRepository = class StageGroupRepository {
             .map((_, idx) => `$${idx + 1}`)
             .join(", ");
         const params_task = [...stageIds];
-        const taskCounts = await this.dataSource.query(`
-      SELECT stage_id, COUNT(*) AS task_count
-      FROM frm_wf_task_data
-      WHERE stage_id IN (${stagePlaceholders})
-        AND is_system = FALSE
-        AND mapped_entity_id = ${lead_id}
-      GROUP BY stage_id
+        const taskCounts = await this.dataSource.query(`
+      SELECT stage_id, COUNT(*) AS task_count
+      FROM frm_wf_task_data
+      WHERE stage_id IN (${stagePlaceholders})
+        AND is_system = FALSE
+        AND mapped_entity_id = ${lead_id}
+      GROUP BY stage_id
     `, params_task);
-        const meetingCounts = await this.dataSource.query(`
-      SELECT stage_id, COUNT(*) AS meeting_count
-      FROM crm_lead_meeting
-      WHERE stage_id IN (${stagePlaceholders})
-        AND mapped_entity_id = ${lead_id}
-      GROUP BY stage_id
+        const meetingCounts = await this.dataSource.query(`
+      SELECT stage_id, COUNT(*) AS meeting_count
+      FROM crm_lead_meeting
+      WHERE stage_id IN (${stagePlaceholders})
+        AND mapped_entity_id = ${lead_id}
+      GROUP BY stage_id
     `, params_task);
-        const sendCommCounts = await this.dataSource.query(`
-      SELECT stage_id, COUNT(*) AS send_comm_count
-      FROM crm_lead_communication
-      WHERE stage_id IN (${stagePlaceholders})
-        AND mapped_entity_id = ${lead_id}
-        AND type IN ('SEND','LOG')
-      GROUP BY stage_id
+        const sendCommCounts = await this.dataSource.query(`
+      SELECT stage_id, COUNT(*) AS send_comm_count
+      FROM crm_lead_communication
+      WHERE stage_id IN (${stagePlaceholders})
+        AND mapped_entity_id = ${lead_id}
+        AND type IN ('SEND','LOG')
+      GROUP BY stage_id
     `, params_task);
         const taskCountMap = new Map(taskCounts.map((r) => [Number(r.stage_id), Number(r.task_count)]));
         const meetingCountMap = new Map(meetingCounts.map((r) => [Number(r.stage_id), Number(r.meeting_count)]));

package/dist/module/workflow/repository/stage.repository.js

@@ -62,14 +62,14 @@ let StageRepository = class StageRepository {
         if (!stageGroup) {
             return [];
         }
-        const rows = await this.dataSource.query(`
-    SELECT 
-      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
-      s.*
-    FROM frm_wf_stage_group g
-    INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
-    WHERE g.workflow_id = $1 AND g.organization_id = $2 AND g.id = $3
-    ORDER BY g.id, s.id
+        const rows = await this.dataSource.query(`
+    SELECT 
+      g.id as stage_group_id, g.name as stage_group_name, g.workflow_id,
+      s.*
+    FROM frm_wf_stage_group g
+    INNER JOIN frm_wf_stage s ON s.stage_group_id = g.id
+    WHERE g.workflow_id = $1 AND g.organization_id = $2 AND g.id = $3
+    ORDER BY g.id, s.id
     `, [stageGroup.workflow_id, organization_id, stage_group_id]);
         if (!rows || rows.length === 0) {
             return [];

package/dist/module/workflow/repository/stage.repository.js.map

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

package/dist/module/workflow/service/action-template-mapping.service.d.ts

@@ -1,11 +1,10 @@
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { DataSource, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import { ListMasterItems } from '../../listmaster/entity/list-master-items.entity';
 import { CommTemplate } from '../entity/comm-template.entity';
 export declare class ActionTemplateMappingService extends EntityServiceImpl {
-    private readonly dataSource;
     private listMasterItemsRepo;
     private commTemplateRepository;
-    constructor(dataSource: DataSource, listMasterItemsRepo: Repository<ListMasterItems>, commTemplateRepository: Repository<CommTemplate>);
-    getTemplateByMode(stage_id: number, action_id: number, loggedInUser: any, mode?: number): Promise<any>;
+    constructor(listMasterItemsRepo: Repository<ListMasterItems>, commTemplateRepository: Repository<CommTemplate>);
+    getTemplateByMode(stage_id: number, action_id: number, loggedInUser: any, mode?: number): Promise<any[]>;
 }

package/dist/module/workflow/service/action-template-mapping.service.js

@@ -20,19 +20,20 @@ const typeorm_2 = require("@nestjs/typeorm");
 const list_master_items_entity_1 = require("../../listmaster/entity/list-master-items.entity");
 const comm_template_entity_1 = require("../entity/comm-template.entity");
 let ActionTemplateMappingService = class ActionTemplateMappingService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(dataSource, listMasterItemsRepo, commTemplateRepository) {
+    constructor(listMasterItemsRepo, commTemplateRepository) {
         super();
-        this.dataSource = dataSource;
         this.listMasterItemsRepo = listMasterItemsRepo;
         this.commTemplateRepository = commTemplateRepository;
     }
     async getTemplateByMode(stage_id, action_id, loggedInUser, mode) {
         let stageAction = [];
         if (action_id != 0) {
-            stageAction = await this.dataSource.query(`
-      SELECT id FROM frm_wf_stage_action_mapping
-      WHERE action_id = $1
-      `, [action_id]);
+            const stageActionMappingRepo = this.reflectionHelper.getRepoService('StageActionMapping');
+            stageAction = await stageActionMappingRepo.find({
+                where: {
+                    action_id: action_id,
+                },
+            });
         }
         else {
             let modeId = mode;
@@ -42,7 +43,7 @@ let ActionTemplateMappingService = class ActionTemplateMappingService extends en
                         listtype: 'MOD',
                         code: 'email',
                         organization_id: loggedInUser.organization_id,
-                    }
+                    },
                 });
                 modeId = rows?.[0]?.id ?? 0;
             }
@@ -82,41 +83,50 @@ let ActionTemplateMappingService = class ActionTemplateMappingService extends en
             return [];
         const stgActMappingId = stageAction[0].id;
         if (!mode) {
-            const getModeFromAction = await this.dataSource.query(`
-        SELECT mode FROM frm_wf_action
-        WHERE id = $1
-        `, [action_id]);
-            mode = getModeFromAction[0]?.mode;
+            const actionRepo = this.reflectionHelper.getRepoService('ActionEntity');
+            const getModeFromAction = await actionRepo.findOne({
+                where: {
+                    id: action_id,
+                },
+            });
+            mode = getModeFromAction?.mode;
         }
-        const templates = await this.dataSource.query(`
-      SELECT template_code FROM frm_wf_action_resources_mapping
-      WHERE stg_act_mapping_id = $1 
-      `, [stgActMappingId]);
+        const actionResourceMappingRepo = this.reflectionHelper.getRepoService('ActionResourcesMapping');
+        const templates = await actionResourceMappingRepo.find({
+            where: {
+                stg_act_mapping_id: stgActMappingId,
+            },
+        });
         const templateCodes = templates.map((t) => t.template_code);
         if (!templateCodes.length)
             return [];
-        const commTemplates = await this.dataSource.query(`
-  SELECT code as value, name as label , id
-  FROM frm_wf_comm_template
-  WHERE code IN ($1) AND mode = $2 AND organization_id = $3 AND level_type = $4 AND level_id = $5 AND status IN (SELECT id FROM frm_list_master_items WHERE code = 'STATUS_ACTIVE' AND organization_id = $6)
-  `, [
-            templateCodes,
-            mode,
-            loggedInUser.organization_id,
-            loggedInUser.level_type,
-            Number(loggedInUser.level_id),
-            Number(loggedInUser.organization_id),
-        ]);
-        return commTemplates;
+        const commTemplateRepo = this.reflectionHelper.getRepoService('CommTemplate');
+        return await commTemplateRepo
+            .createQueryBuilder('ct')
+            .select([
+            'ct.code AS value',
+            'ct.name AS label',
+            'ct.id AS id',
+        ])
+            .where('ct.code IN (:...codes)', { codes: templateCodes })
+            .andWhere('ct.mode = :mode', { mode })
+            .andWhere('ct.organization_id = :orgId', { orgId: loggedInUser.organization_id })
+            .andWhere('ct.level_type = :levelType', { levelType: loggedInUser.level_type })
+            .andWhere('ct.level_id = :levelId', { levelId: Number(loggedInUser.level_id) })
+            .andWhere(`ct.status IN (
+      SELECT id FROM frm_list_master_items 
+      WHERE code = 'STATUS_ACTIVE' 
+        AND organization_id = :orgId2
+    )`, { orgId2: loggedInUser.organization_id })
+            .getRawMany();
     }
 };
 exports.ActionTemplateMappingService = ActionTemplateMappingService;
 exports.ActionTemplateMappingService = ActionTemplateMappingService = __decorate([
     (0, common_1.Injectable)(),
-    __param(1, (0, typeorm_2.InjectRepository)(list_master_items_entity_1.ListMasterItems)),
-    __param(2, (0, typeorm_2.InjectRepository)(comm_template_entity_1.CommTemplate)),
-    __metadata("design:paramtypes", [typeorm_1.DataSource,
-        typeorm_1.Repository,
+    __param(0, (0, typeorm_2.InjectRepository)(list_master_items_entity_1.ListMasterItems)),
+    __param(1, (0, typeorm_2.InjectRepository)(comm_template_entity_1.CommTemplate)),
+    __metadata("design:paramtypes", [typeorm_1.Repository,
         typeorm_1.Repository])
 ], ActionTemplateMappingService);
 //# sourceMappingURL=action-template-mapping.service.js.map