rez_core 3.1.186 → 3.1.188

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

@@ -67,33 +67,33 @@ let StageGroupRepository = class StageGroupRepository {
         if (!stageGroups.length)
             return [];
         const stageGroupIds = stageGroups.map((sg) => sg.id);
-        const stagesRaw = await this.dataSource.query(`
-      SELECT
-        cr_wf_stage.*
-      FROM cr_wf_stage
-      WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
-        AND cr_wf_stage.organization_id = ?
-      ORDER BY cr_wf_stage.sequence ASC
+        const stagesRaw = await this.dataSource.query(`
+      SELECT
+        cr_wf_stage.*
+      FROM cr_wf_stage
+      WHERE cr_wf_stage.stage_group_id IN (${stageGroupIds.map(() => '?').join(',')})
+        AND cr_wf_stage.organization_id = ?
+      ORDER BY cr_wf_stage.sequence ASC
     `, [...stageGroupIds, loggedInUser.organization_id]);
         const stageIds = stagesRaw.map((s) => s.id);
-        const taskCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS task_count
-    FROM cr_wf_task_data
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND is_system=0 AND mapped_entity_id = ?
-    GROUP BY stage_id
+        const taskCounts = await this.dataSource.query(`
+    SELECT stage_id, COUNT(*) AS task_count
+    FROM cr_wf_task_data
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND is_system=0 AND mapped_entity_id = ?
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
-        const meetingCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS meeting_count
-    FROM crm_lead_meeting
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_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 (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
-        const sendCommCounts = await this.dataSource.query(`
-    SELECT stage_id, COUNT(*) AS send_comm_count
-    FROM crm_lead_communication
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_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 (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
+    AND type IN ('SEND', 'LOG')
+    GROUP BY stage_id
     `, [...stageIds, lead_id]);
         const taskCountMap = new Map(taskCounts.map((row) => [Number(row.stage_id), Number(row.task_count)]));
         const meetingCountMap = new Map(meetingCounts.map((row) => [

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

@@ -107,17 +107,17 @@ let StageMovementRepository = class StageMovementRepository {
         return nextStageGroupFirstStage || null;
     }
     async getAllActionByStageId(stageId) {
-        const result = await this.dataSource.query(`
-    SELECT 
-      a.*, 
-      m.stage_id, 
-      ac.code AS action_category_code,
-      arm.form_id
-    FROM cr_wf_action a
-    LEFT JOIN cr_wf_stage_action_mapping m ON a.id = m.action_id
-    LEFT JOIN cr_wf_action_category ac ON a.action_category = ac.id
-    LEFT JOIN cr_wf_action_resources_mapping arm ON m.id = arm.stg_act_mapping_id
-    WHERE m.stage_id = ?
+        const result = await this.dataSource.query(`
+    SELECT 
+      a.*, 
+      m.stage_id, 
+      ac.code AS action_category_code,
+      arm.form_id
+    FROM cr_wf_action a
+    LEFT JOIN cr_wf_stage_action_mapping m ON a.id = m.action_id
+    LEFT JOIN cr_wf_action_category ac ON a.action_category = ac.id
+    LEFT JOIN cr_wf_action_resources_mapping arm ON m.id = arm.stg_act_mapping_id
+    WHERE m.stage_id = ?
     `, [stageId]);
         return result;
     }

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 cr_wf_stage_group g
-    INNER JOIN cr_wf_stage s ON s.stage_group_id = g.id
-    WHERE g.workflow_id = ? AND g.organization_id = ? AND g.id = ?
-    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 cr_wf_stage_group g
+    INNER JOIN cr_wf_stage s ON s.stage_group_id = g.id
+    WHERE g.workflow_id = ? AND g.organization_id = ? AND g.id = ?
+    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

@@ -19,16 +19,16 @@ let ActionTemplateMappingService = class ActionTemplateMappingService extends en
         this.dataSource = dataSource;
     }
     async getTemplateByMode(stage_id, action_id, mode, loggedInUser) {
-        const stageAction = await this.dataSource.query(`
-      SELECT id FROM cr_wf_stage_action_mapping
-      WHERE stage_id = ? AND action_id = ?
+        const stageAction = await this.dataSource.query(`
+      SELECT id FROM cr_wf_stage_action_mapping
+      WHERE stage_id = ? AND action_id = ?
       `, [stage_id, action_id]);
         if (!stageAction?.length)
             return [];
         const stgActMappingId = stageAction[0].id;
-        const templates = await this.dataSource.query(`
-      SELECT template_code FROM cr_wf_action_resources_mapping
-      WHERE stg_act_mapping_id = ? 
+        const templates = await this.dataSource.query(`
+      SELECT template_code FROM cr_wf_action_resources_mapping
+      WHERE stg_act_mapping_id = ? 
       `, [stgActMappingId]);
         const listMasterItemData = await this.dataSource.query(`SELECT code FROM cr_list_master_items WHERE id = ?`, [mode]);
         if (!listMasterItemData?.length)
@@ -36,10 +36,10 @@ let ActionTemplateMappingService = class ActionTemplateMappingService extends en
         const templateCodes = templates.map((t) => t.template_code);
         if (!templateCodes.length)
             return [];
-        const commTemplates = await this.dataSource.query(`
-  SELECT id, name
-  FROM cr_wf_comm_template
-  WHERE code IN (?) AND mode = ? AND organization_id = ?
+        const commTemplates = await this.dataSource.query(`
+  SELECT id, name
+  FROM cr_wf_comm_template
+  WHERE code IN (?) AND mode = ? AND organization_id = ?
   `, [templateCodes, listMasterItemData[0].code, loggedInUser.organization_id]);
         return commTemplates;
     }

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 cr_wf_action_resources_mapping 
-   WHERE stg_act_mapping_id IN (
-     SELECT id 
-     FROM cr_wf_stage_action_mapping 
-     WHERE action_id = ? AND entity_type = 'WFSA'
+        const result = await this.dataSource.query(`SELECT template_code, form_id 
+   FROM cr_wf_action_resources_mapping 
+   WHERE stg_act_mapping_id IN (
+     SELECT id 
+     FROM cr_wf_stage_action_mapping 
+     WHERE action_id = ? AND entity_type = 'WFSA'
    )`, [actionData.id]);
         const templates = result
             .filter((t) => t.template_code !== null)
@@ -134,7 +134,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 cr_wf_action_template_mapping WHERE stg_act_mapping_id IN (SELECT
+        await this.dataSource.query(`DELETE FROM cr_wf_action_template_mapping WHERE stg_act_mapping_id IN (SELECT
         id FROM cr_wf_stage_action_mapping WHERE action_id = ? AND entity_type = 'WFSA')`, [id]);
         await this.dataSource.query(`DELETE FROM cr_wf_stage_action_mapping WHERE action_id = ? AND entity_type ='WFSA'`, [id]);
         const deleteAction = await super.deleteEntity(entityType, id, loggedInUser);

package/dist/module/workflow/service/comm-template.service.d.ts

@@ -1,9 +1,13 @@
 import { CommTemplateRepository } from '../repository/comm-template.repository';
 import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { UserData } from 'src/module/user/entity/user.entity';
+import { MediaDataService } from '../../meta/service/media-data.service';
+import { FieldMapperService } from '../../mapper/service/field-mapper.service';
 export declare class CommTemplateService extends EntityServiceImpl {
     private readonly commTemplateRepository;
-    constructor(commTemplateRepository: CommTemplateRepository);
+    private readonly mediaService;
+    private readonly fieldMapperService;
+    constructor(commTemplateRepository: CommTemplateRepository, mediaService: MediaDataService, fieldMapperService: FieldMapperService);
     createEntity(entityData: any, loggedInUser: any): Promise<any>;
     updateEntity(entityData: any, loggedInUser: UserData): Promise<any>;
     getEntityData(entityType: string, id: number, loggedInUser: any): Promise<any>;
@@ -13,4 +17,8 @@ export declare class CommTemplateService extends EntityServiceImpl {
         mode: string;
         template: boolean;
     }[]>;
+    getResolvedTemplateMsg(payload: any): Promise<{
+        rich_text: string;
+        subject: string;
+    } | undefined>;
 }

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

@@ -8,15 +8,23 @@ 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.CommTemplateService = void 0;
 const common_1 = require("@nestjs/common");
 const comm_template_repository_1 = require("../repository/comm-template.repository");
 const entity_service_impl_service_1 = require("../../meta/service/entity-service-impl.service");
+const axios_1 = require("axios");
+const media_data_service_1 = require("../../meta/service/media-data.service");
+const field_mapper_service_1 = require("../../mapper/service/field-mapper.service");
 let CommTemplateService = class CommTemplateService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(commTemplateRepository) {
+    constructor(commTemplateRepository, mediaService, fieldMapperService) {
         super();
         this.commTemplateRepository = commTemplateRepository;
+        this.mediaService = mediaService;
+        this.fieldMapperService = fieldMapperService;
     }
     async createEntity(entityData, loggedInUser) {
         const { attachments, ...templateData } = entityData;
@@ -81,10 +89,45 @@ let CommTemplateService = class CommTemplateService extends entity_service_impl_
         }));
         return response;
     }
+    async getResolvedTemplateMsg(payload) {
+        let commTemplate = await this.commTemplateRepository.findByCodeAndLevelIdAndLevelTypeAndAppCode(payload.template_code, payload.level_type, payload.level_id, payload.appcode);
+        let variables;
+        if (commTemplate && !commTemplate.template_id) {
+            if (commTemplate.mapper_id) {
+                variables = await this.fieldMapperService.resolveData(commTemplate.mapper_id, 'LOOKUP', payload.entity_type, payload.entity_id, {});
+            }
+            if (!commTemplate.template_id) {
+                let richText = commTemplate.rich_text;
+                if (!richText) {
+                    if (commTemplate.markup_id) {
+                        let url = await this.mediaService.getMediaDownloadUrl(commTemplate.markup_id, {}, 60000);
+                        if (url) {
+                            let response = await axios_1.default.get(url.signedUrl, { responseType: 'text' });
+                            richText = response.data;
+                        }
+                    }
+                }
+                richText = richText.replace(/\{\{(\w+)\}\}/g, (match, key) => {
+                    const value = variables[key];
+                    return value !== undefined ? String(value) : match;
+                });
+                return {
+                    rich_text: richText,
+                    subject: commTemplate.subject,
+                };
+            }
+        }
+        else {
+            throw new common_1.BadRequestException("Editing is disabled for external templates");
+        }
+    }
 };
 exports.CommTemplateService = CommTemplateService;
 exports.CommTemplateService = CommTemplateService = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [comm_template_repository_1.CommTemplateRepository])
+    __param(2, (0, common_1.Inject)('FieldMapperService')),
+    __metadata("design:paramtypes", [comm_template_repository_1.CommTemplateRepository,
+        media_data_service_1.MediaDataService,
+        field_mapper_service_1.FieldMapperService])
 ], CommTemplateService);
 //# sourceMappingURL=comm-template.service.js.map

package/dist/module/workflow/service/comm-template.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"comm-template.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/comm-template.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qFAAgF;AAChF,gGAAwF;AAKjF,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,+CAAiB;IACxD,YAA6B,sBAA8C;QACzE,KAAK,EAAE,CAAC;QADmB,2BAAsB,GAAtB,sBAAsB,CAAwB;IAE3E,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAe,EAAE,YAAiB;QACnD,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC;QAEpD,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,CACvC,EAAE,GAAG,YAAY,EAAE,IAAI,EAAE,YAAY,CAAC,IAAI,IAAI,SAAS,EAAE,EACzD,YAAY,CACb,CAAC;QAGF,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAC1D,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,WAAW,EAAE,QAAQ,CAAC,EAAE;gBACxB,QAAQ,EAAE,UAAU;gBACpB,eAAe,EAAE,YAAY,CAAC,eAAe;gBAC7C,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,QAAQ,EAAE,YAAY,CAAC,QAAQ;gBAC/B,kBAAkB,EAAE,MAAM;gBAC1B,UAAU,EAAE,YAAY,CAAC,UAAU;aACpC,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,UAAe,EAAE,YAAsB;QACxD,MAAM,EAAE,WAAW,EAAE,GAAG,YAAY,EAAE,GAAG,UAAU,CAAC;QACpD,IACE,YAAY,CAAC,UAAU,KAAK,KAAK;YACjC,YAAY,CAAC,UAAU,KAAK,KAAK,EACjC,CAAC;YACD,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,eAAe,EAAE,GAAG,UAAU,CAAC;YACpE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CACpC;gBACE,GAAG,eAAe;gBAClB,UAAU,EAAE,YAAY,CAAC,UAAU;gBACnC,QAAQ,EAAE,YAAY,CAAC,QAAQ;gBAC/B,IAAI,EAAE,QAAQ;aACf,EACD,YAAY,CACb,CAAC;YACF,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;QAGtE,MAAM,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC;YACvC,WAAW,EAAE,QAAQ,CAAC,EAAE;SACzB,CAAC,CAAC;QAGH,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,MAAM,kBAAkB,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;gBAC1D,WAAW,EAAE,YAAY,CAAC,WAAW;gBACrC,WAAW,EAAE,QAAQ,CAAC,EAAE;gBACxB,QAAQ,EAAE,UAAU;gBACpB,eAAe,EAAE,YAAY,CAAC,eAAe;gBAC7C,OAAO,EAAE,YAAY,CAAC,OAAO;gBAC7B,QAAQ,EAAE,YAAY,CAAC,QAAQ;gBAC/B,UAAU,EAAE,YAAY,CAAC,UAAU;aACpC,CAAC,CAAC,CAAC;YAEJ,MAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,UAAkB,EAClB,EAAU,EACV,YAAY;QAIZ,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CACrE,UAAU,EACV,EAAE,EACF,YAAY,CACb,CAAC;QAEF,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,WAAmB,EACnB,SAAkB,EAClB,YAAa;QAEb,MAAM,gBAAgB,GACpB,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAClD,WAAW,EACX,SAAS,EACT,YAAY,CACb,CAAC;QAEJ,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC/C,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,KAAK,EAAE,IAAI,CAAC,IAAI;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,QAAQ,EAAE,IAAI,CAAC,WAAW;SAC3B,CAAC,CAAC,CAAC;QAEJ,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF,CAAA;AAjHY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAE0C,iDAAsB;GADhE,mBAAmB,CAiH/B"}
+{"version":3,"file":"comm-template.service.js","sourceRoot":"","sources":["../../../../src/module/workflow/service/comm-template.service.ts"],"names":[],"mappings":"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"}

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

@@ -24,17 +24,17 @@ let EntityModificationService = class EntityModificationService extends entity_s
         if (!mapped_entity_type || !mapped_entity_id || !attribute_key) {
             throw new common_1.BadRequestException('Missing required modification data: mapped_entity_type, mapped_entity_id, or attribute_key');
         }
-        const [entityMeta] = await this.dataSource.query(`
-    SELECT db_table_name 
-    FROM cr_entity_master 
-    WHERE mapped_entity_type = ? AND organization_id = ?
+        const [entityMeta] = await this.dataSource.query(`
+    SELECT db_table_name 
+    FROM cr_entity_master 
+    WHERE mapped_entity_type = ? AND organization_id = ?
     `, [mapped_entity_type, organization_id]);
         if (!entityMeta || !entityMeta.db_table_name) {
             throw new common_1.NotFoundException('Entity metadata not found in cr_entity_master');
         }
         const tableName = entityMeta.db_table_name;
-        const [entityRow] = await this.dataSource.query(`
-    SELECT * FROM ${tableName} WHERE id = ?
+        const [entityRow] = await this.dataSource.query(`
+    SELECT * FROM ${tableName} WHERE id = ?
     `, [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

@@ -38,8 +38,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 cr_list_master_items 
+        const statusListMaster = await this.dataSource.query(`SELECT id, name 
+     FROM cr_list_master_items 
      WHERE listtype = 'STS' AND organization_id = ?`, [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 cr_list_master_items 
+            const statusListMaster = await this.dataSource.query(`SELECT id, name 
+       FROM cr_list_master_items 
        WHERE listtype = 'STS' AND organization_id = ?`, [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

@@ -36,10 +36,10 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
     async execute(payload) {
         const { entity, user, config } = payload;
         let toValue = null;
-        const stageRow = await this.dataSource.query(`SELECT stage_id
-       FROM cr_wf_stage_movement_data
-      WHERE mapped_entity_id = ? 
-        AND is_current = 'Y'
+        const stageRow = await this.dataSource.query(`SELECT stage_id
+       FROM cr_wf_stage_movement_data
+      WHERE mapped_entity_id = ? 
+        AND is_current = 'Y'
       LIMIT 1`, [entity.id]);
         const stageId = stageRow.length > 0 ? stageRow[0].stage_id : null;
         if (!stageId) {
@@ -104,13 +104,13 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
         return createdEntity;
     }
     async updateEntity(entityData, loggedInUser, appcode) {
-        const taskStatusQuery = `
-    SELECT name 
-    FROM cr_list_master_items 
-    WHERE id = ? 
-      AND organization_id = ? 
-      AND listtype = 'TKST'
-    LIMIT 1;
+        const taskStatusQuery = `
+    SELECT name 
+    FROM cr_list_master_items 
+    WHERE id = ? 
+      AND organization_id = ? 
+      AND listtype = 'TKST'
+    LIMIT 1;
   `;
         const statusRows = await this.dataSource.query(taskStatusQuery, [
             entityData.status,
@@ -198,33 +198,33 @@ let TaskService = class TaskService extends entity_service_impl_service_1.Entity
             whereClauses.push(`t.is_done = ?`);
             params.push(0);
         }
-        const sql = `
-    SELECT
-      t.*,
-      sg.name AS stage_group_name,
-      s.name AS stage_name,
-      a.name AS action_name,
-      u.name AS created_by_name,
-      u2.name AS task_owner_name,
-      u2.profile_image AS task_owner_profile 
-    FROM cr_wf_task_data t
-    LEFT JOIN cr_wf_stage s ON t.stage_id = s.id
-    LEFT JOIN cr_wf_stage_group sg ON s.stage_group_id = sg.id
-    LEFT JOIN cr_wf_action a ON t.action_id = a.id
-    LEFT JOIN sso_user u ON t.created_by = u.id
-    LEFT JOIN eth_user_profile u2 ON t.task_owner = u2.parent_id
-    WHERE ${whereClauses.join(' AND ')}
-    ORDER BY t.created_date DESC
+        const sql = `
+    SELECT
+      t.*,
+      sg.name AS stage_group_name,
+      s.name AS stage_name,
+      a.name AS action_name,
+      u.name AS created_by_name,
+      u2.name AS task_owner_name,
+      u2.profile_image AS task_owner_profile 
+    FROM cr_wf_task_data t
+    LEFT JOIN cr_wf_stage s ON t.stage_id = s.id
+    LEFT JOIN cr_wf_stage_group sg ON s.stage_group_id = sg.id
+    LEFT JOIN cr_wf_action a ON t.action_id = a.id
+    LEFT JOIN sso_user u ON t.created_by = u.id
+    LEFT JOIN eth_user_profile u2 ON t.task_owner = u2.parent_id
+    WHERE ${whereClauses.join(' AND ')}
+    ORDER BY t.created_date DESC
   `;
         const taskData = await this.dataSource.query(sql, params);
         if (taskData.length === 0) {
             return [];
         }
-        const taskStatusQuery = `
-  SELECT id, name 
-  FROM cr_list_master_items 
-  WHERE organization_id = ? 
-    AND listtype = 'TKST'
+        const taskStatusQuery = `
+  SELECT id, name 
+  FROM cr_list_master_items 
+  WHERE organization_id = ? 
+    AND listtype = 'TKST'
 `;
         const taskAllStatus = await this.dataSource.query(taskStatusQuery, [
             loggedInUser.organization_id,

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 cr_wf_stage_action_mapping sam
-      JOIN cr_wf_action a ON sam.action_id = a.id
-      JOIN cr_wf_action_category ac ON a.action_category = ac.id
-      WHERE sam.stage_id = ?
+        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 cr_wf_stage_action_mapping sam
+      JOIN cr_wf_action a ON sam.action_id = a.id
+      JOIN cr_wf_action_category ac ON a.action_category = ac.id
+      WHERE sam.stage_id = ?
       `, [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 cr_list_master_items
-    WHERE listtype = 'MOD'
-      AND organization_id = ?
+        const modes = await this.dataSource.query(`
+    SELECT id, name
+    FROM cr_list_master_items
+    WHERE listtype = 'MOD'
+      AND organization_id = ?
     `, [organization_id]);
         return modes;
     }

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

@@ -211,9 +211,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 cr_list_master_items 
-   WHERE listtype = "LEST" AND organization_id = ? 
+        const unassignedListMasterItemData = await this.dataSource.query(`SELECT name, id 
+   FROM cr_list_master_items 
+   WHERE listtype = "LEST" AND organization_id = ? 
      AND value IN (?, ?)`, [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;
@@ -225,24 +225,24 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
             status: leadData?.lead_status,
             lead_status: leadData?.lead_status,
         }, loggedInUser);
-        await this.dataSource.query(`UPDATE cr_wf_action_data SET user_id =? 
-      WHERE mapped_entity_id=?
-      AND mapped_entity_type = ?
-      AND stage_id = ?
-      AND (is_current = 'Y' OR is_current IS NULL)
+        await this.dataSource.query(`UPDATE cr_wf_action_data SET user_id =? 
+      WHERE mapped_entity_id=?
+      AND mapped_entity_type = ?
+      AND stage_id = ?
+      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=?
-      WHERE stage_id = ? 
-      AND mapped_entity_id = ?
-      AND mapped_entity_type = "LEAD" 
-      AND (status='scheduled' OR status='rescheduled')
+        await this.dataSource.query(`UPDATE crm_lead_meeting SET user_id=?
+      WHERE stage_id = ? 
+      AND mapped_entity_id = ?
+      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 cr_wf_task_data
-      WHERE mapped_entity_id = ?
-      AND mapped_entity_type = ?
+        const taskRows = await this.dataSource.query(`SELECT id,status FROM cr_wf_task_data
+      WHERE mapped_entity_id = ?
+      AND mapped_entity_type = ?
       AND stage_id = ?`, [lead_id, entity_type, stage_id]);
         for (const task of taskRows) {
-            const statusRows = await this.dataSource.query(`SELECT value FROM cr_list_master_items
+            const statusRows = await this.dataSource.query(`SELECT value FROM cr_list_master_items
         WHERE id = ? AND organization_id = ?`, [task.status, loggedInUser.organization_id]);
             const statusName = statusRows[0]?.value?.toLowerCase() || '';
             if (['todo', 'in_progress'].includes(statusName) ||
@@ -272,49 +272,49 @@ let WorkflowMetaService = class WorkflowMetaService extends entity_service_impl_
     }
     async assignLead(loggedInUser, mapped_entity_id, mapped_entity_type, stage_id, actions) {
         const { organization_id, level_id, level_type } = loggedInUser;
-        const owners = await this.dataSource.query(`
-    SELECT DISTINCT u.id
-    FROM sso_user u
-    JOIN sso_user_role_mapping urm   ON u.id = urm.user_id
-    JOIN sso_role r                  ON urm.role_id = r.id
-    JOIN sso_module_access ma        ON ma.role_code = r.code
-    WHERE urm.organization_id = ?
-      AND urm.level_id = ?
-      AND urm.level_type = ?
-      AND urm.appcode = 'CRM'
-      AND ma.appcode = 'CRM'
-      AND ma.module_code = 'lead_crm_sch'
-      AND ma.access_flag = 1
-      AND ma.action_type = 'LEAD_OWNER'
-    ORDER BY u.id ASC
+        const owners = await this.dataSource.query(`
+    SELECT DISTINCT u.id
+    FROM sso_user u
+    JOIN sso_user_role_mapping urm   ON u.id = urm.user_id
+    JOIN sso_role r                  ON urm.role_id = r.id
+    JOIN sso_module_access ma        ON ma.role_code = r.code
+    WHERE urm.organization_id = ?
+      AND urm.level_id = ?
+      AND urm.level_type = ?
+      AND urm.appcode = 'CRM'
+      AND ma.appcode = 'CRM'
+      AND ma.module_code = 'lead_crm_sch'
+      AND ma.access_flag = 1
+      AND ma.action_type = 'LEAD_OWNER'
+    ORDER BY u.id ASC
     `, [organization_id, Number(level_id), level_type]);
         if (!owners?.length)
             throw new Error('No eligible users found');
         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 = ?
-      AND level_id = ?
-      AND level_type = ?
-      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 = ?
+      AND level_id = ?
+      AND level_type = ?
+      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;
         const nextIdx = (lastIdx + 1) % userIds.length;
         const nextUser = userIds[nextIdx];
-        await this.dataSource.query(`
-    UPDATE crm_lead
-    SET lead_owner = ?
-    WHERE organization_id = ?
-      AND level_id = ?
-      AND level_type = ?
-      AND lead_owner IS NULL
-    ORDER BY created_date ASC
-    LIMIT 1
+        await this.dataSource.query(`
+    UPDATE crm_lead
+    SET lead_owner = ?
+    WHERE organization_id = ?
+      AND level_id = ?
+      AND level_type = ?
+      AND lead_owner IS NULL
+    ORDER BY created_date ASC
+    LIMIT 1
     `, [nextUser, organization_id, Number(level_id), level_type]);
         console.log(`Assigning lead to user ID: ${nextUser}`);
         const firstAction = actions[0];

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

@@ -72,8 +72,8 @@ let WorkflowService = class WorkflowService extends entity_service_impl_service_
                 currentId: workflowId,
             })
                 .execute();
-            await this.dataSource.query(`UPDATE cr_wf_level_mapping
-     SET workflow_id = ?
+            await this.dataSource.query(`UPDATE cr_wf_level_mapping
+     SET workflow_id = ?
      WHERE mapped_level_id = ? AND mapped_level_type = ?`, [workflowId, level_id, level_type]);
         }
         return super.updateEntity(entityData, loggedInUser);

package/dist/module/workflow/workflow.module.js

@@ -70,6 +70,7 @@ const activity_log_service_1 = require("./service/activity-log.service");
 const activity_log_repository_1 = require("./repository/activity-log.repository");
 const activity_log_controller_1 = require("./controller/activity-log.controller");
 const notification_module_1 = require("../notification/notification.module");
+const mapper_module_1 = require("../mapper/mapper.module");
 let WorkflowModule = class WorkflowModule {
 };
 exports.WorkflowModule = WorkflowModule;
@@ -97,6 +98,7 @@ exports.WorkflowModule = WorkflowModule = __decorate([
             entity_module_1.EntityModule,
             listmaster_module_1.ListMasterModule,
             notification_module_1.NotificationModule,
+            mapper_module_1.MapperModule,
         ],
         providers: [
             { provide: 'ActionCategoryService', useClass: action_category_service_1.ActionCategoryService },