rez_core 5.0.81 → 5.0.83

package/package.json

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

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

@@ -248,46 +248,49 @@ export class ActionRepository {
     const actionIds = stageActions.map((sa) => sa.action_id);
 
     // Step 2: Fetch all actions with category details
-    const actions = await this.dataSource
-      .createQueryBuilder()
+    const actionRepo = this.reflectionHelper.getRepoService('ActionEntity');
+
+    const actions = await actionRepo
+      .createQueryBuilder("a")
       .select([
-        'a.id AS action_id',
-        'a.name AS action_name',
-        'a.reason_code AS action_reason_code',
-        'a.default_reason_code AS default_reason_code',
-        'a.default_value AS default_value',
-        'a.mode AS mode',
-        'a.action_category AS action_category_id',
-        'ac.reason_code AS category_reason_code',
-        'ac.modalname AS modalname',
-        'ac.logo AS logo',
-        'ac.name AS action_category_name',
-        'a.dependent_action_id AS dependent_action_id',
+        "a.id AS action_id",
+        "a.name AS action_name",
+        "a.reason_code AS action_reason_code",
+        "a.default_reason_code AS default_reason_code",
+        "a.default_value AS default_value",
+        "a.mode AS mode",
+        "a.action_category AS action_category_id",
+        "ac.reason_code AS category_reason_code",
+        "ac.modalname AS modalname",
+        "ac.logo AS logo",
+        "ac.name AS action_category_name",
+        "a.dependent_action_id AS dependent_action_id",
       ])
-      .from('frm_wf_action', 'a')
       .leftJoin(
-        'frm_wf_action_category',
-        'ac',
-        'ac.id::text = a.action_category',
+        "frm_wf_action_category",
+        "ac",
+        "ac.id = a.action_category::bigint"
       )
-      .where('a.organization_id = :orgId', { orgId: organization_id })
-      .andWhere('a.id IN (:...actionIds)', { actionIds })
+      .where("a.organization_id = :orgId", { orgId: organization_id })
+      .andWhere("a.id IN (:...actionIds)", { actionIds })
+      .orderBy("a.sequence", "ASC")
       .getRawMany();
 
     // Step 3: Fetch action_data
-    const actionData = await this.dataSource
-      .createQueryBuilder()
+    const actionDataRepo = this.reflectionHelper.getRepoService('ActionDataEntity');
+
+    const actionData = await actionDataRepo
+      .createQueryBuilder("ad")
       .select([
-        'ad.action_id AS action_id',
-        'ad.is_current AS is_current',
-        'ad.is_mandatory AS is_mandatory',
-        'ad.is_done AS is_done',
+        "ad.action_id AS action_id",
+        "ad.is_current AS is_current",
+        "ad.is_mandatory AS is_mandatory",
+        "ad.is_done AS is_done",
       ])
-      .from('frm_wf_action_data', 'ad')
-      .where('ad.stage_id = :stageId', { stageId: stage_id })
-      .andWhere('ad.action_id IN (:...actionIds)', { actionIds })
-      .andWhere('ad.mapped_entity_id = :mapped_entity_id', { mapped_entity_id })
-      .andWhere('ad.mapped_entity_type = :mapped_entity_type', {
+      .where("ad.stage_id = :stageId", { stageId: stage_id })
+      .andWhere("ad.action_id IN (:...actionIds)", { actionIds })
+      .andWhere("ad.mapped_entity_id = :mapped_entity_id", { mapped_entity_id })
+      .andWhere("ad.mapped_entity_type = :mapped_entity_type", {
         mapped_entity_type,
       })
       .getRawMany();

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 },
     };
   }