rez_core 7.1.67 → 7.1.69

package/src/module/workflow/workflow/repository/action-category.repository.ts

@@ -10,6 +10,10 @@ export class ActionCategoryRepository {
     private readonly actionCategoryRepository: Repository<ActionCategory>,
   ) { }
 
+  async findById(id: number) {
+    return this.actionCategoryRepository.findOne({ where: { id } });
+  }
+
   async find(options: any) {
     return this.actionCategoryRepository.find(options);
   }

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

@@ -13,10 +13,10 @@ import { ActionDataService } from './action-data.service';
 import { ActivityLogService } from './activity-log.service';
 import { EntityModificationService } from './entity-modification.service';
 import { TaskService } from './task.service';
-import { ActionCategory } from '../entity/action-category.entity';
 import { StageGroup } from '../entity/stage-group.entity';
 import { ActionDataEntity } from '../entity/action-data.entity';
 import { TaskDataEntity } from '../entity/task-data.entity';
+import { ActionCategoryRepository } from '../repository/action-category.repository';
 
 @Injectable()
 export class WorkflowMetaService extends EntityServiceImpl {
@@ -34,8 +34,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
     @Inject('EntityModificationService')
     private readonly modificationService: EntityModificationService,
     private readonly configService: ConfigService,
-    @InjectRepository(ActionCategory)
-    private readonly actionCategoryRepo: Repository<ActionCategory>,
+    private readonly actionCategoryRepo: ActionCategoryRepository,
     @InjectRepository(StageGroup)
     private readonly stageGroupRepo: Repository<StageGroup>,
     @InjectRepository(ActionDataEntity)
@@ -337,11 +336,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
     // check whether first action's action_category is owner_assignment and assignment_type is AUTO_ASSIGN
     const firstAction = actions[0];
 
-    const actionCategory = await this.actionCategoryRepo.findOne({
-      where: {
-        id: Number(firstAction.action_category),
-      },
-    });
+    const actionCategory = await this.actionCategoryRepo.findById(firstAction.action_category);
 
     const listMasterItemsRepo =
       this.reflectionHelper.getRepoService('ListMasterItems');
@@ -454,7 +449,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
       .where('mapped_entity_id = :leadId', { leadId: lead_id })
       .andWhere('mapped_entity_type = :entityType', { entityType: entity_type })
       .andWhere('stage_id = :stageId', { stageId: stage_id })
-      .andWhere("(is_current = 'Y' OR is_current IS NULL)")
+      .andWhere('(is_current = \'Y\' OR is_current IS NULL)')
       .execute();
 
     const leadMeetingRepo =
@@ -467,7 +462,7 @@ export class WorkflowMetaService extends EntityServiceImpl {
       .where('stage_id = :stageId', { stageId: stage_id })
       .andWhere('mapped_entity_id = :leadId', { leadId: lead_id })
       .andWhere('mapped_entity_type = :entityType', { entityType: 'LEAD' })
-      .andWhere("(status = 'scheduled' OR status = 'rescheduled')")
+      .andWhere('(status = \'scheduled\' OR status = \'rescheduled\')')
       .execute();
 
     const taskRows = await this.taskDataEntityRepository.find({

package/src/module/workflow/workflow/workflow.module.ts

@@ -93,8 +93,8 @@ import { ListMasterItems } from '../../listmaster/entity/list-master-items.entit
       ListMasterData,
       ListMasterItems,
     ]),
-    ListMasterModule,
-    EntityModule,
+    forwardRef(() => ListMasterModule),
+    forwardRef(() => EntityModule),
     NotificationModule,
     forwardRef(() => WorkflowAutomationModule),
     UtilsModule,