rez_core 3.1.24 → 3.1.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "3.1.24",
+  "version": "3.1.26",
   "description": "",
   "author": "",
   "private": false,

package/src/module/workflow/repository/stage-group.repository.ts

@@ -111,7 +111,7 @@ export class StageGroupRepository {
       `
     SELECT stage_id, COUNT(*) AS meeting_count
     FROM crm_lead_meeting
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND lead_id = ?
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
     GROUP BY stage_id
     `,
       [...stageIds, lead_id],
@@ -122,7 +122,7 @@ export class StageGroupRepository {
       `
     SELECT stage_id, COUNT(*) AS send_comm_count
     FROM crm_lead_communication
-    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND lead_id = ?
+    WHERE stage_id IN (${stageIds.map(() => '?').join(',')}) AND mapped_entity_id = ?
     AND type IN ('SEND', 'LOG')
     GROUP BY stage_id
     `,

package/src/module/workflow/service/workflow-meta.service.ts

@@ -1,16 +1,15 @@
-import { log } from 'console';
 import { Inject, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Repository, DataSource } from 'typeorm';
-import { StageMovementData } from '../entity/stage-movement-data.entity';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { UserData } from 'src/module/user/entity/user.entity';
+import { DataSource, Repository } from 'typeorm';
+import { StageMovementData } from '../entity/stage-movement-data.entity';
+import { ACTIVITY_CATEGORIES } from '../repository/activity-log.repository';
 import { StageMovementRepository } from '../repository/stage-movement.repository';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
 import { ActionDataService } from './action-data.service';
-import { TaskService } from './task.service';
-import { ACTIVITY_CATEGORIES } from '../repository/activity-log.repository';
 import { ActivityLogService } from './activity-log.service';
 import { EntityModificationService } from './entity-modification.service';
+import { TaskService } from './task.service';
 
 @Injectable()
 export class WorkflowMetaService extends EntityServiceImpl {
@@ -390,7 +389,8 @@ export class WorkflowMetaService extends EntityServiceImpl {
     await this.dataSource.query(
       `UPDATE crm_lead_meeting SET user_id=?
       WHERE stage_id = ? 
-      AND lead_id = ? 
+      AND mapped_entity_id = ?
+      AND mapped_entity_type = "LEAD" 
       AND (status='scheduled' OR status='rescheduled')
       `,
       [lead_owner, stage_id, lead_id],