rez_core 5.0.19 → 5.0.20

package/package.json

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

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

@@ -6,14 +6,20 @@ import {
 } from '@nestjs/common';
 import { StageGroup } from '../entity/stage-group.entity';
 import { InjectRepository } from '@nestjs/typeorm';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, In, Repository } from 'typeorm';
 import { MediaDataService } from 'src/module/meta/service/media-data.service';
+import { Stage } from '../entity/stage.entity';
+import { TaskDataEntity } from '../entity/task-data.entity';
 
 @Injectable()
 export class StageGroupRepository {
   constructor(
     @InjectRepository(StageGroup)
     private readonly stageGroupRepository: Repository<StageGroup>,
+    @InjectRepository(Stage)
+    private readonly stageRepository: Repository<Stage>,
+    @InjectRepository(TaskDataEntity)
+    private readonly taskDataRepo: Repository<TaskDataEntity>,
     private readonly dataSource: DataSource,
     private readonly mediaDataService: MediaDataService,
   ) {}
@@ -83,22 +89,16 @@ export class StageGroupRepository {
     // -------------------------------------------------------------
 
     const stageGroupIds = stageGroups.map((sg) => Number(sg.id));
-    const stageGroupPlaceholders = stageGroupIds
-      .map((_, idx) => `$${idx + 1}`)
-      .join(", ");
-
-    const params_stage = [...stageGroupIds, Number(loggedInUser.organization_id)];
 
-    const stagesRaw = await this.dataSource.query(
-      `
-      SELECT frm_wf_stage.*
-      FROM frm_wf_stage
-      WHERE frm_wf_stage.stage_group_id IN (${stageGroupPlaceholders})
-        AND frm_wf_stage.organization_id = $${stageGroupIds.length + 1}
-      ORDER BY frm_wf_stage.sequence ASC
-    `,
-      params_stage,
-    );
+    const stagesRaw: any[] = await this.stageRepository.find({
+      where: {
+        stage_group_id: In(stageGroupIds),
+        organization_id: loggedInUser.organization_id
+      },
+      order: {
+        sequence: 'ASC',
+      }
+    })
 
     const stageIds = stagesRaw.map((s) => Number(s.id));