rez_core 5.0.62 → 5.0.65

package/package.json

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

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

@@ -5,7 +5,7 @@ import {
   NotFoundException,
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { DataSource, Repository } from 'typeorm';
+import { DataSource, In, Repository } from 'typeorm';
 import { ActionEntity } from '../entity/action.entity';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
@@ -62,44 +62,42 @@ export class ActionRepository {
   async getActions(loggedInUser: UserData, stage_id: number) {
     const { organization_id } = loggedInUser;
 
-    // Step 1: Get all action_ids for the provided stage_id
-    const stageActions = await this.dataSource.query(
-      `
-    SELECT id, action_id 
-    FROM frm_wf_stage_action_mapping 
-    WHERE stage_id = $1
-    `,
-      [stage_id],
-    );
+    const workflowStageActionRepo = this.reflectionHelper.getRepoService('StageActionMapping');
 
+    // Step 1: Get all action_ids for the provided stage_id
+    const stageActions = await workflowStageActionRepo.find({
+      where: {
+        stage_id: stage_id
+      }
+    })
     if (!stageActions?.length) return [];
 
     const actionIds = stageActions.map((sa) => sa.action_id);
     const mappingIds = stageActions.map((sa) => sa.id);
 
     // Step 2: Get template codes with mapping IDs
-    const templateMappings = await this.dataSource.query(
-      `
-    SELECT stg_act_mapping_id, template_code 
-    FROM frm_wf_action_template_mapping 
-    WHERE stg_act_mapping_id IN (${mappingIds.map(() => '?').join(',')})
-    `,
-      mappingIds,
-    );
+    const workflowActionTemplateMappingRepo = this.reflectionHelper.getRepoService('ActionTemplateMapping');
+
+    const templateMappings = await workflowActionTemplateMappingRepo.find({
+      where: {
+        stg_act_mapping_id: In(mappingIds)
+      }
+    })
 
     const templateCodes = templateMappings.map((tm) => tm.template_code);
 
     // Step 3: Fetch template names from frm_wf_comm_template
     const templateCodeToName: Record<string, string> = {};
 
+    const workflowCommTemplateRepo = this.reflectionHelper.getRepoService('CommTemplate');
+
     if (templateCodes.length > 0) {
-      const templates = await this.dataSource
-        .createQueryBuilder()
-        .select(['t.code AS code', 't.name AS name'])
-        .from('frm_wf_comm_template', 't')
-        .where('t.code IN (:...codes)', { codes: templateCodes })
-        .andWhere('t.organization_id = :orgId', { orgId: organization_id })
-        .getRawMany();
+      const templates = await workflowCommTemplateRepo.find({
+        where: {
+          code: In(templateCodes),
+          organization_id: organization_id
+        }
+      });
 
       templates.forEach((tpl) => {
         templateCodeToName[tpl.code] = tpl.name;
@@ -135,7 +133,9 @@ export class ActionRepository {
     }
 
     // Step 6: Fetch action details
-    const actionResults = await this.dataSource
+    const workflowActionRepo = this.reflectionHelper.getRepoService('ActionEntity');
+
+    const actionResults = await workflowActionRepo
       .createQueryBuilder()
       .select([
         'a.*',
@@ -144,15 +144,15 @@ export class ActionRepository {
         'ar.name AS action_requirement',
       ])
       .from('frm_wf_action', 'a')
-      .leftJoin('frm_wf_action_category', 'ac', 'ac.id = a.action_category')
+      .leftJoin('frm_wf_action_category', 'ac', 'ac.id::text = a.action_category')
       .leftJoin(
         'frm_list_master_items',
         'ar',
-        `ar.id = a.action_requirement AND ar.listtype = 'ACRQ' AND ar.organization_id = :orgId`,
+        `ar.id::text = a.action_requirement AND ar.listtype = 'ACRQ' AND ar.organization_id = :orgId`,
         { orgId: organization_id },
       )
       .where('a.organization_id = :orgId', { orgId: organization_id })
-      .andWhere('a.id IN (:...actionIds)', { actionIds })
+      .andWhere('a.id::text IN (:...actionIds)', { actionIds })
       .getRawMany();
 
     // Step 7: Enrich result with template field

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

@@ -157,12 +157,14 @@ export class PopulateWorkflowService extends EntityServiceImpl {
 
       if (!workflowLevelMappingRepo) continue;
 
-      await workflowLevelMappingRepo.create({
+      const newMapping = workflowLevelMappingRepo.create({
         workflow_id: Number(newWf.id),
         mapped_level_id: organization_id.toString(),
         mapped_level_type: 'ORG',
       });
 
+      await workflowLevelMappingRepo.save(newMapping);
+
       workflowIdMap[id] = newWf.id;
     }