rez_core 5.0.81 → 5.0.82

package/package.json

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

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

@@ -19,6 +19,7 @@ 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';
 
 @Injectable()
 export class WorkflowMetaService extends EntityServiceImpl {
@@ -38,6 +39,8 @@ export class WorkflowMetaService extends EntityServiceImpl {
     private readonly configService: ConfigService,
     @InjectRepository(ActionCategory)
     private readonly actionCategoryRepo: Repository<ActionCategory>,
+    @InjectRepository(StageGroup)
+    private readonly stageGroupRepo: Repository<StageGroup>,
   ) {
     super();
   }
@@ -88,25 +91,25 @@ export class WorkflowMetaService extends EntityServiceImpl {
 
       if (!latestMovement) return null;
 
-      const getGroupName = await this.dataSource.query(
-        `SELECT name FROM frm_wf_stage_group WHERE id = ${latestMovement?.stage_group_id}`,
-      );
+      let stageGroup = await this.stageGroupRepo.findOne({
+        where: {id: latestMovement?.stage_group_id}
+      });
 
       return {
         ...latestMovement,
-        stage_group_name: getGroupName[0]?.name,
+        stage_group_name: stageGroup?.name,
       };
     }
 
     // get group name for the current stage
-    const getGroupName = await this.dataSource.query(
-      `SELECT name FROM frm_wf_stage_group WHERE id = ${currentStage?.stage_group_id}`,
-    );
+    const stageGroup = await this.stageGroupRepo.findOne({
+      where: {id: currentStage?.stage_group_id}
+    });
 
     // Return the found or newly created current stage movement
     return {
       ...currentStage,
-      stage_group_name: getGroupName[0]?.name,
+      stage_group_name: stageGroup?.name,
     };
   }
 
@@ -126,13 +129,15 @@ export class WorkflowMetaService extends EntityServiceImpl {
       return { hasNextStage: false, nextStage: null };
     }
 
-    const groupName = await this.dataSource.query(
-      `SELECT name FROM frm_wf_stage_group WHERE id = ${nextStage?.stage_group_id}`,
-    );
+    const stageGroup = await this.stageGroupRepo.findOne({
+      where: {
+        id: nextStage?.stage_group_id,
+      }
+    })
 
     return {
       hasNextStage: !!nextStage,
-      nextStage: { ...nextStage, stage_group_name: groupName[0]?.name },
+      nextStage: { ...nextStage, stage_group_name: stageGroup?.name },
     };
   }