rez_core 5.0.76 → 5.0.77

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

@@ -7,12 +7,14 @@ import { EntityManager, Repository } from 'typeorm';
 import { ModuleAccess } from '../../module/entity/module-access.entity';
 import { ServiceResult } from 'src/dtos/response';
 import { ListMasterService } from 'src/module/listmaster/service/list-master.service';
+import { UserRoleMapping } from '../entity/user-role-mapping.entity';
 export declare class RoleService extends EntityServiceImpl {
     private readonly roleRepository;
     private readonly entityManager;
     private readonly moduleAccessRepo;
     private readonly listMasterService;
-    constructor(roleRepository: RoleRepository, entityManager: EntityManager, moduleAccessRepo: Repository<ModuleAccess>, listMasterService: ListMasterService);
+    private readonly userRoleMappingRepo;
+    constructor(roleRepository: RoleRepository, entityManager: EntityManager, moduleAccessRepo: Repository<ModuleAccess>, listMasterService: ListMasterService, userRoleMappingRepo: Repository<UserRoleMapping>);
     createEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<ServiceResult<BaseEntity>>;
     updateEntity(entityData: BaseEntity, loggedInUser: UserData): Promise<ServiceResult<BaseEntity>>;
     getDefaultRole(data: {

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

@@ -21,13 +21,15 @@ const typeorm_1 = require("typeorm");
 const typeorm_2 = require("@nestjs/typeorm");
 const module_access_entity_1 = require("../../module/entity/module-access.entity");
 const list_master_service_1 = require("../../listmaster/service/list-master.service");
+const user_role_mapping_entity_1 = require("../entity/user-role-mapping.entity");
 let RoleService = class RoleService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(roleRepository, entityManager, moduleAccessRepo, listMasterService) {
+    constructor(roleRepository, entityManager, moduleAccessRepo, listMasterService, userRoleMappingRepo) {
         super();
         this.roleRepository = roleRepository;
         this.entityManager = entityManager;
         this.moduleAccessRepo = moduleAccessRepo;
         this.listMasterService = listMasterService;
+        this.userRoleMappingRepo = userRoleMappingRepo;
     }
     async createEntity(entityData, loggedInUser) {
         const role = entityData;
@@ -76,11 +78,15 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
             if (!existingRole) {
                 return { success: false, error: 'Role not found' };
             }
-            const associatedUsers = await this.entityManager.query(`SELECT map.*
-                                                              FROM sso_user_role_mapping map
-                                                                     JOIN sso_user usr ON map.user_id = usr.id
-                                                              WHERE usr.status = ${resolveStatus.id}
-                                                                and map.role_id = ${existingRole?.id}`);
+            const associatedUsers = await this.userRoleMappingRepo
+                .createQueryBuilder("map")
+                .innerJoin("sso_user", "usr", "map.user_id = usr.id")
+                .where("usr.status::text = :status", { status: String(resolveStatus.id) })
+                .andWhere("map.role_id::text = :roleId", {
+                roleId: String(existingRole?.id),
+            })
+                .select("map")
+                .getRawMany();
             if (associatedUsers.length > 0) {
                 return {
                     success: false,
@@ -138,9 +144,11 @@ exports.RoleService = RoleService = __decorate([
     (0, common_1.Injectable)(),
     __param(2, (0, typeorm_2.InjectRepository)(module_access_entity_1.ModuleAccess)),
     __param(3, (0, common_1.Inject)('ListMasterService')),
+    __param(4, (0, typeorm_2.InjectRepository)(user_role_mapping_entity_1.UserRoleMapping)),
     __metadata("design:paramtypes", [role_repository_1.RoleRepository,
         typeorm_1.EntityManager,
         typeorm_1.Repository,
-        list_master_service_1.ListMasterService])
+        list_master_service_1.ListMasterService,
+        typeorm_1.Repository])
 ], RoleService);
 //# sourceMappingURL=role.service.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,gGAAmF;AAInF,uEAAgF;AAChF,mEAA+D;AAC/D,qCAAoD;AACpD,6CAAmD;AACnD,mFAAwE;AAExE,sFAAsF;AAG/E,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD,YACmB,cAA8B,EAC9B,aAA4B,EAE5B,gBAA0C,EAE1C,iBAAoC;QAErD,KAAK,EAAE,CAAC;QAPS,mBAAc,GAAd,cAAc,CAAgB;QAC9B,kBAAa,GAAb,aAAa,CAAe;QAE5B,qBAAgB,GAAhB,gBAAgB,CAA0B;QAE1C,sBAAiB,GAAjB,iBAAiB,CAAmB;IAGvD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAAsB;QAEtB,MAAM,IAAI,GAAG,UAAkB,CAAC;QAGhC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC,UAAU,IAAI,YAAY,CAAC,UAAU,CAAC;QACnE,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,QAAQ,IAAI,YAAY,CAAC,QAAQ,CAAC;QAC7D,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,OAAO,IAAI,YAAY,CAAC,OAAO,CAAC;QAE1D,IACE,MAAM,IAAI,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC,IAAI,EAAE;YAC7D,eAAe,EAAE,YAAY,EAAE,eAAe,IAAI,SAAS;YAC3D,UAAU,EAAE,UAAU,CAAC,UAAU,IAAI,YAAY,EAAE,UAAU;YAC7D,QAAQ,EACN,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC;gBAC7B,QAAQ,CAAC,YAAY,EAAE,QAAQ,IAAI,EAAE,EAAE,EAAE,CAAC;SAC7C,CAAC,EACF,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,2BAA2B,EAAE,CAAC;QAChE,CAAC;QAED,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB;YACvC,CAAC,CAAC,MAAM,IAAI,CAAC,aAAa,CACtB,iCAAe,EACf,IAAI,CAAC,iBAAiB,EACtB,YAAY,CACb;YACH,CAAC,CAAC,IAAI,CAAC;QAET,IAAI,IAAI,CAAC,iBAAiB,IAAI,CAAC,UAAU,EAAE,CAAC;YAC1C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC;QAC7D,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAC/D,IAAI,UAAU,EAAE,CAAC;YACf,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACzD,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE;aACtC,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAC3B,SAAS,EAAE,SAAS,CAAC,IAAI;gBACzB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CACH,CAAC;YAEF,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;IAC5C,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAAsB;QAEtB,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;YACrB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,uBAAuB,EAAE,CAAC;QAC5D,CAAC;QACD,MAAM,IAAI,GAAG,UAAkB,CAAC;QAEhC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,mBAAmB,CACpE,iCAAe,EACf,YAAY,EAAE,eAAe,IAAI,CAAC,CACnC,CAAC;QAEF,IAAI,UAAU,CAAC,MAAM,IAAI,aAAa,CAAC,EAAE,EAAE,CAAC;YAE1C,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,aAAa,CAC3C,iCAAe,EACf,UAAU,CAAC,EAAE,EACb,YAAY,CACb,CAAC;YAEF,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;YACrD,CAAC;YAED,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;;;mFAGsB,aAAa,CAAC,EAAE;oFACf,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;YAElG,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,8DAA8D;iBACtE,CAAC;YACJ,CAAC;YAED,IAAI,IAAI,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;gBACzB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,+BAA+B;iBACvC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IACE,MAAM,IAAI,CAAC,cAAc,CAAC,gBAAgB,CAAC,UAAU,CAAC,IAAI,EAAE;YAC1D,aAAa,EAAE,UAAU,CAAC,EAAE;YAC5B,eAAe,EAAE,YAAY,EAAE,eAAe;SAC/C,CAAC,EACF,CAAC;YACD,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,2BAA2B;aACnC,CAAC;QACJ,CAAC;QAED,MAAM,EAAE,iBAAiB,EAAE,GAAG,eAAe,EAAE,GAAG,IAAI,CAAC;QACvD,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;QAE5E,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,CACzC,iCAAe,EACf,IAAI,CAAC,iBAAiB,EACtB,YAAY,CACb,CAAC;YAEF,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;oBACL,OAAO,EAAE,KAAK;oBACd,KAAK,EAAE,uBAAuB;iBAC/B,CAAC;YACJ,CAAC;YAED,MAAM,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAE7D,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC;gBACzD,KAAK,EAAE,EAAE,SAAS,EAAE,UAAU,CAAC,IAAI,EAAE;aACtC,CAAC,CAAC;YAEH,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CACvD,IAAI,CAAC,gBAAgB,CAAC,MAAM,CAAC;gBAC3B,SAAS,EAAE,IAAI,CAAC,IAAI;gBACpB,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,WAAW,EAAE,IAAI,CAAC,WAAW;gBAC7B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,UAAU,EAAE,IAAI,CAAC,UAAU;aAC5B,CAAC,CACH,CAAC;YAEF,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QACtD,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAIpB;QACC,OAAO,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;CACF,CAAA;AA9KY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAKR,WAAA,IAAA,0BAAgB,EAAC,mCAAY,CAAC,CAAA;IAE9B,WAAA,IAAA,eAAM,EAAC,mBAAmB,CAAC,CAAA;qCAJK,gCAAc;QACf,uBAAa;QAEV,oBAAU;QAET,uCAAiB;GAP5C,WAAW,CA8KvB"}
+{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}

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

@@ -71,8 +71,8 @@ let UserSessionService = class UserSessionService {
         };
         let getUserDetails;
         if (currentUser) {
-            getUserDetails = await this.dataSource.query(`
-        SELECT * from sso_user where id = $1
+            getUserDetails = await this.dataSource.query(`
+        SELECT * from sso_user where id = $1
       `, [currentUser.id]);
         }
         if (getUserDetails[0].organization_id == 1 && payload.level_type == 'ORG') {

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

@@ -30,17 +30,17 @@ let CommTemplateRepository = class CommTemplateRepository {
         const { organization_id, level_id, level_type } = loggedInUser;
         let is_template;
         if (action_id) {
-            const [actionResult] = await this.dataSource.query(`SELECT is_template 
-       FROM frm_wf_action 
-       WHERE id = $1 AND organization_id = $2 
+            const [actionResult] = await this.dataSource.query(`SELECT is_template 
+       FROM frm_wf_action 
+       WHERE id = $1 AND organization_id = $2 
        LIMIT 1`, [action_id, organization_id]);
             if (!actionResult) {
                 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-movement.repository.js

@@ -107,26 +107,26 @@ let StageMovementRepository = class StageMovementRepository {
         return nextStageGroupFirstStage || null;
     }
     async getAllActionByStageId(stageId) {
-        const result = await this.dataSource.query(`
-          SELECT
-              a.*,
-              m.id AS mapping_id,
-              m.stage_id,
-              ac.code AS action_category_code
-          FROM frm_wf_action a
-                   LEFT JOIN frm_wf_stage_action_mapping m
-                             ON a.id = m.action_id::bigint
-                LEFT JOIN frm_wf_action_category ac
-                ON a.action_category::bigint = ac.id
-          WHERE m.stage_id::bigint = $1
+        const result = await this.dataSource.query(`
+          SELECT
+              a.*,
+              m.id AS mapping_id,
+              m.stage_id,
+              ac.code AS action_category_code
+          FROM frm_wf_action a
+                   LEFT JOIN frm_wf_stage_action_mapping m
+                             ON a.id = m.action_id::bigint
+                LEFT JOIN frm_wf_action_category ac
+                ON a.action_category::bigint = ac.id
+          WHERE m.stage_id::bigint = $1
       `, [Number(stageId)]);
         for (const item of result) {
             if (item.action_category_code === 'SDFM') {
-                const actionData = await this.dataSource.query(`
-        SELECT arm.form_id
-        FROM frm_wf_action_resources_mapping arm
-        WHERE arm.stg_act_mapping_id = $1 and form_id IS NOT NULL
-        LIMIT 1
+                const actionData = await this.dataSource.query(`
+        SELECT arm.form_id
+        FROM frm_wf_action_resources_mapping arm
+        WHERE arm.stg_act_mapping_id = $1 and form_id IS NOT NULL
+        LIMIT 1
         `, [item.mapping_id]);
                 item.form_id = actionData[0]?.form_id || null;
             }

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/service/action-template-mapping.service.js

@@ -29,9 +29,9 @@ let ActionTemplateMappingService = class ActionTemplateMappingService extends en
     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
+            stageAction = await this.dataSource.query(`
+      SELECT id FROM frm_wf_stage_action_mapping
+      WHERE action_id = $1
       `, [action_id]);
         }
         else {
@@ -82,23 +82,23 @@ 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
+            const getModeFromAction = await this.dataSource.query(`
+        SELECT mode FROM frm_wf_action
+        WHERE id = $1
         `, [action_id]);
             mode = getModeFromAction[0]?.mode;
         }
-        const templates = await this.dataSource.query(`
-      SELECT template_code FROM frm_wf_action_resources_mapping
-      WHERE stg_act_mapping_id = $1 
+        const templates = await this.dataSource.query(`
+      SELECT template_code FROM frm_wf_action_resources_mapping
+      WHERE stg_act_mapping_id = $1 
       `, [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)
+        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,

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

@@ -25,12 +25,12 @@ let ActionService = class ActionService extends entity_service_impl_service_1.En
         if (!actionData) {
             return null;
         }
-        const result = await this.dataSource.query(`SELECT template_code, form_id 
-   FROM frm_wf_action_resources_mapping 
-   WHERE stg_act_mapping_id IN (
-     SELECT id 
-     FROM frm_wf_stage_action_mapping 
-     WHERE action_id = $1 AND entity_type = 'WFSA'
+        const result = await this.dataSource.query(`SELECT template_code, form_id 
+   FROM frm_wf_action_resources_mapping 
+   WHERE stg_act_mapping_id IN (
+     SELECT id 
+     FROM frm_wf_stage_action_mapping 
+     WHERE action_id = $1 AND entity_type = 'WFSA'
    )`, [actionData.id]);
         const templates = result
             .filter((t) => t.template_code !== null)
@@ -136,7 +136,7 @@ let ActionService = class ActionService extends entity_service_impl_service_1.En
         return action;
     }
     async deleteEntity(entityType, id, loggedInUser) {
-        await this.dataSource.query(`DELETE FROM frm_wf_action_template_mapping WHERE stg_act_mapping_id IN (SELECT
+        await this.dataSource.query(`DELETE FROM frm_wf_action_template_mapping WHERE stg_act_mapping_id IN (SELECT
         id FROM frm_wf_stage_action_mapping WHERE action_id = $1 AND entity_type = 'WFSA')`, [id]);
         await this.dataSource.query(`DELETE FROM frm_wf_stage_action_mapping WHERE action_id = $1 AND entity_type ='WFSA'`, [id]);
         const deleteAction = await super.deleteEntity(entityType, id, loggedInUser);

package/dist/module/workflow/service/entity-modification.service.js

@@ -29,8 +29,8 @@ let EntityModificationService = class EntityModificationService extends entity_s
             throw new common_1.NotFoundException('Entity metadata not found in frm_entity_master');
         }
         const tableName = entityMeta.db_table_name;
-        const [entityRow] = await this.dataSource.query(`
-    SELECT * FROM ${tableName} WHERE id = $1
+        const [entityRow] = await this.dataSource.query(`
+    SELECT * FROM ${tableName} WHERE id = $1
     `, [mapped_entity_id]);
         if (!entityRow) {
             throw new common_1.NotFoundException(`No record found in ${tableName} with ID ${mapped_entity_id}`);

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

@@ -42,8 +42,8 @@ let StageGroupService = class StageGroupService extends entity_service_impl_serv
     }
     async getAllStageGroup(workflow_id, organization_id) {
         const allStageGroup = await this.stageGroupRepository.getAllStageGroup(workflow_id, organization_id);
-        const statusListMaster = await this.dataSource.query(`SELECT id, name 
-     FROM frm_list_master_items 
+        const statusListMaster = await this.dataSource.query(`SELECT id, name 
+     FROM frm_list_master_items 
      WHERE listtype = 'STS' AND organization_id = $1`, [organization_id]);
         const statusMap = new Map(statusListMaster.map((s) => [String(s.id), s.name]));
         for (const stage of allStageGroup) {

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

@@ -35,8 +35,8 @@ let StageService = StageService_1 = class StageService extends entity_service_im
     async getAllStage(payload, organization_id, show_previous) {
         if (!show_previous) {
             const allStages = await this.stageRepository.getAllStage(payload.stage_group_id, organization_id);
-            const statusListMaster = await this.dataSource.query(`SELECT id, name 
-       FROM frm_list_master_items 
+            const statusListMaster = await this.dataSource.query(`SELECT id, name 
+       FROM frm_list_master_items 
        WHERE listtype = 'STS' AND organization_id = $1`, [organization_id]);
             const statusMap = new Map(statusListMaster.map((s) => [String(s.id), s.name]));
             for (const stage of allStages) {

package/dist/module/workflow/service/task.service.js

@@ -101,24 +101,24 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
         return createdEntity;
     }
     async updateEntity(entityData, loggedInUser, appcode) {
-        const taskStatusQuery = `
-    SELECT name 
-    FROM frm_list_master_items 
-    WHERE id = $1 
-      AND organization_id = $2 
-      AND listtype = 'TKST'
-    LIMIT 1;
+        const taskStatusQuery = `
+    SELECT name 
+    FROM frm_list_master_items 
+    WHERE id = $1 
+      AND organization_id = $2 
+      AND listtype = 'TKST'
+    LIMIT 1;
   `;
         const statusRows = await this.dataSource.query(taskStatusQuery, [
             entityData.status,
             loggedInUser.organization_id,
         ]);
-        const oldStatusQuery = `
-    SELECT * 
-    FROM frm_wf_task_data
-    WHERE id = $1
-      AND organization_id = $2
-    LIMIT 1;
+        const oldStatusQuery = `
+    SELECT * 
+    FROM frm_wf_task_data
+    WHERE id = $1
+      AND organization_id = $2
+    LIMIT 1;
   `;
         const [oldRow] = await this.dataSource.query(oldStatusQuery, [
             entityData.id,
@@ -225,11 +225,11 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
             });
         }
         if (overdue) {
-            qb.andWhere(`
-        (
-          t.due_date < CURRENT_DATE
-          OR (t.due_date = CURRENT_DATE AND t.due_time < CURRENT_TIME)
-        )
+            qb.andWhere(`
+        (
+          t.due_date < CURRENT_DATE
+          OR (t.due_date = CURRENT_DATE AND t.due_time < CURRENT_TIME)
+        )
       `).andWhere('t.is_done::text = :is_done', { is_done: '0' });
         }
         qb.orderBy('t.created_date', 'DESC');

package/dist/module/workflow/service/workflow-list-master.service.js

@@ -19,16 +19,16 @@ let WorkflowListMasterService = class WorkflowListMasterService extends entity_s
         this.dataSource = dataSource;
     }
     async getActionCategoryListByStageId(stageId) {
-        const results = await this.dataSource.query(`
-      SELECT 
-      ac.name AS name,
-      ac.logo AS logo,
-        ac.modalName AS modalName,
-        a.action_requirement AS actionRequirement
-      FROM frm_wf_stage_action_mapping sam
-      JOIN frm_wf_action a ON sam.action_id = a.id
-      JOIN frm_wf_action_category ac ON a.action_category = ac.id
-      WHERE sam.stage_id = $1
+        const results = await this.dataSource.query(`
+      SELECT 
+      ac.name AS name,
+      ac.logo AS logo,
+        ac.modalName AS modalName,
+        a.action_requirement AS actionRequirement
+      FROM frm_wf_stage_action_mapping sam
+      JOIN frm_wf_action a ON sam.action_id = a.id
+      JOIN frm_wf_action_category ac ON a.action_category = ac.id
+      WHERE sam.stage_id = $1
       `, [stageId]);
         return results.map((item) => ({
             name: item.name,
@@ -44,11 +44,11 @@ let WorkflowListMasterService = class WorkflowListMasterService extends entity_s
     }
     async getModes(loggedInUser) {
         const { organization_id } = loggedInUser;
-        const modes = await this.dataSource.query(`
-    SELECT id, name
-    FROM frm_list_master_items
-    WHERE listtype = 'MOD'
-      AND organization_id = $1
+        const modes = await this.dataSource.query(`
+    SELECT id, name
+    FROM frm_list_master_items
+    WHERE listtype = 'MOD'
+      AND organization_id = $1
     `, [organization_id]);
         return modes;
     }

package/dist/module/workflow/service/workflow-meta.service.js

@@ -223,9 +223,9 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
             action_id: entityData.action_id,
         }, loggedInUser);
         const leadData = await this.getEntityData('LEAD', lead_id, loggedInUser);
-        const unassignedListMasterItemData = await this.dataSource.query(`SELECT name, id 
-   FROM frm_list_master_items 
-   WHERE listtype = "LEST" AND organization_id = $1 
+        const unassignedListMasterItemData = await this.dataSource.query(`SELECT name, id 
+   FROM frm_list_master_items 
+   WHERE listtype = "LEST" AND organization_id = $1 
      AND value IN ($2, $3)`, [loggedInUser.organization_id, 'unassigned', 'active']);
         const unassignedId = unassignedListMasterItemData.find((item) => item.name.toLowerCase() === 'unassigned')?.id;
         const activeId = unassignedListMasterItemData.find((item) => item.name.toLowerCase() === 'active')?.id;
@@ -237,24 +237,24 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
             status: leadData?.lead_status,
             lead_status: leadData?.lead_status,
         }, loggedInUser);
-        await this.dataSource.query(`UPDATE frm_wf_action_data SET user_id =$1 
-      WHERE mapped_entity_id=$2
-      AND mapped_entity_type = $3
-      AND stage_id = $4
-      AND (is_current = 'Y' OR is_current IS NULL)
+        await this.dataSource.query(`UPDATE frm_wf_action_data SET user_id =$1 
+      WHERE mapped_entity_id=$2
+      AND mapped_entity_type = $3
+      AND stage_id = $4
+      AND (is_current = 'Y' OR is_current IS NULL)
       `, [lead_owner, lead_id, entity_type, stage_id]);
-        await this.dataSource.query(`UPDATE crm_lead_meeting SET user_id=$1
-      WHERE stage_id = $2 
-      AND mapped_entity_id = $3
-      AND mapped_entity_type = "LEAD" 
-      AND (status='scheduled' OR status='rescheduled')
+        await this.dataSource.query(`UPDATE crm_lead_meeting SET user_id=$1
+      WHERE stage_id = $2 
+      AND mapped_entity_id = $3
+      AND mapped_entity_type = "LEAD" 
+      AND (status='scheduled' OR status='rescheduled')
       `, [lead_owner, stage_id, lead_id]);
-        const taskRows = await this.dataSource.query(`SELECT id,status FROM frm_wf_task_data
-      WHERE mapped_entity_id = $1
-      AND mapped_entity_type = $2
+        const taskRows = await this.dataSource.query(`SELECT id,status FROM frm_wf_task_data
+      WHERE mapped_entity_id = $1
+      AND mapped_entity_type = $2
       AND stage_id = $3`, [lead_id, entity_type, stage_id]);
         for (const task of taskRows) {
-            const statusRows = await this.dataSource.query(`SELECT value FROM frm_list_master_items
+            const statusRows = await this.dataSource.query(`SELECT value FROM frm_list_master_items
         WHERE id = $1 AND organization_id = $2`, [task.status, loggedInUser.organization_id]);
             const statusName = statusRows[0]?.value?.toLowerCase() || '';
             if (['todo', 'in_progress'].includes(statusName) ||
@@ -314,15 +314,15 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
             console.log('No eligible owners found for lead assignment.');
         const userIds = owners?.map((o) => Number(o.id));
         const placeholders = userIds.map(() => '?').join(',');
-        const lastRow = await this.dataSource.query(`
-    SELECT lead_owner
-    FROM crm_lead
-    WHERE organization_id = $1
-      AND level_id = $2
-      AND level_type = $3
-      AND lead_owner IN (${placeholders})
-    ORDER BY created_date DESC
-    LIMIT 1
+        const lastRow = await this.dataSource.query(`
+    SELECT lead_owner
+    FROM crm_lead
+    WHERE organization_id = $1
+      AND level_id = $2
+      AND level_type = $3
+      AND lead_owner IN (${placeholders})
+    ORDER BY created_date DESC
+    LIMIT 1
     `, [organization_id, Number(level_id), level_type, ...userIds]);
         const lastAssigned = lastRow.length ? Number(lastRow[0].lead_owner) : null;
         const lastIdx = lastAssigned != null ? userIds.indexOf(lastAssigned) : -1;

package/dist/module/workflow-automation/service/schedule-handler.service.js

@@ -67,21 +67,21 @@ let ScheduleHandlerService = ScheduleHandlerService_1 = class ScheduleHandlerSer
         const fixedTime = scheduleJson.fixedTime;
         let comparisonDateCondition = '';
         if (executionDateName.includes('after')) {
-            comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE() + INTERVAL ${executionUnits} DAY
-    AND ${executionDataOrTime} < CURDATE() + INTERVAL ${executionUnits + 1} DAY
+            comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE() + INTERVAL ${executionUnits} DAY
+    AND ${executionDataOrTime} < CURDATE() + INTERVAL ${executionUnits + 1} DAY
   `;
         }
         else if (executionDateName.includes('before')) {
-            comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE() - INTERVAL ${executionUnits + 1} DAY
-    AND ${executionDataOrTime} < CURDATE() - INTERVAL ${executionUnits} DAY
+            comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE() - INTERVAL ${executionUnits + 1} DAY
+    AND ${executionDataOrTime} < CURDATE() - INTERVAL ${executionUnits} DAY
   `;
         }
         else if (executionDateName.includes('same')) {
-            comparisonDateCondition = `
-    ${executionDataOrTime} >= CURDATE()
-    AND ${executionDataOrTime} < CURDATE() + INTERVAL 1 DAY
+            comparisonDateCondition = `
+    ${executionDataOrTime} >= CURDATE()
+    AND ${executionDataOrTime} < CURDATE() + INTERVAL 1 DAY
   `;
         }
         const qb = this.dataSource