rez_core 2.1.147 → 2.1.148

package/package.json

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

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

@@ -24,8 +24,8 @@ export class ActionEntity extends BaseEntity {
   @Column({ type: 'varchar', nullable: true })
   reason_code: string;
 
-  @Column({ type: 'varchar', nullable: true })
-  default_reason_code: string;
+  @Column({ type: 'int', nullable: true })
+  default_reason_code: number;
 
   @Column({ default: 0, type: 'boolean' })
   default_value: boolean;

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

@@ -22,6 +22,9 @@ export class ActionCategoryService extends EntityServiceImpl {
       [entity_type, organization_id],
     );
 
-    return result;
+    return result.map((row: any) => ({
+      label: row.name,
+      value: row.id,
+    }));
   }
 }

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

@@ -37,8 +37,6 @@ export class ActionService extends EntityServiceImpl {
     manager?: EntityManager | null,
     appcode?: string,
   ): Promise<any> {
-    console.log('entityData', entityData);
-
     let actionData = entityData as any;
 
     let action = await super.createEntity(
@@ -196,7 +194,7 @@ export class ActionService extends EntityServiceImpl {
     }
     const result = await this.dataSource.query(
       `
-    SELECT name, value 
+    SELECT name, id 
     FROM cr_list_master_items 
     WHERE listtype = ? AND organization_id = ?
     `,
@@ -205,8 +203,8 @@ export class ActionService extends EntityServiceImpl {
 
     // Format as array of key-value pairs
     return result.map((row: any) => ({
-      label: row.value,
-      value: row.name,
+      label: row.name,
+      value: row.id,
     }));
   }
 
@@ -228,88 +226,93 @@ export class ActionService extends EntityServiceImpl {
     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 template_code 
+    SELECT stg_act_mapping_id, template_code 
     FROM cr_wf_action_template_mapping 
-    WHERE stg_act_mapping_id IN (?)
+    WHERE stg_act_mapping_id IN (${mappingIds.map(() => '?').join(',')})
     `,
-      [mappingIds],
+      mappingIds,
     );
 
     const templateCodes = templateMappings.map((tm) => tm.template_code);
 
     // Step 3: Fetch template names from cr_wf_comm_template
-    let templateNameMap: Record<number, string> = {};
+    const templateCodeToName: Record<string, string> = {};
 
     if (templateCodes.length > 0) {
-      const templates = await this.dataSource.query(
-        `
-      SELECT code, name 
-      FROM cr_wf_comm_template 
-      WHERE code IN (?)
-        AND organization_id = ?
-      `,
-        [templateCodes, organization_id],
-      );
-
-      // Map template_code to name
-      const codeToNameMap = templates.reduce((acc, curr) => {
-        acc[curr.code] = curr.name;
-        return acc;
-      }, {});
-
-      // Group template names by mapping_id
-      templateMappings.forEach((tm) => {
-        const mappingId = tm.stg_act_mapping_id;
-        const name = codeToNameMap[tm.template_code];
-        if (name) {
-          if (!templateNameMap[mappingId]) {
-            templateNameMap[mappingId] = name;
-          } else {
-            templateNameMap[mappingId] += `, ${name}`;
-          }
-        }
+      const templates = await this.dataSource
+        .createQueryBuilder()
+        .select(['t.code AS code', 't.name AS name'])
+        .from('cr_wf_comm_template', 't')
+        .where('t.code IN (:...codes)', { codes: templateCodes })
+        .andWhere('t.organization_id = :orgId', { orgId: organization_id })
+        .getRawMany();
+
+      templates.forEach((tpl) => {
+        templateCodeToName[tpl.code] = tpl.name;
       });
     }
 
-    // Step 2: Fetch action details based on those action_ids
-    // Step 4: Fetch action details
-    const result = await this.dataSource.query(
-      `
-    SELECT 
-      a.id,
-      a.name AS action_name,
-      ac.name AS action_category,
-      ar.name AS action_requirement
-    FROM cr_wf_action a
-    LEFT JOIN cr_wf_action_category ac 
-      ON ac.id = a.action_cat_id
-    LEFT JOIN cr_list_master_items ar 
-      ON ar.id = a.action_requirement
-      AND ar.listtype = 'ACRQ'
-      AND ar.organization_id = ?
-    WHERE a.organization_id = ?
-      AND a.id IN (?)
-    `,
-      [organization_id, organization_id, actionIds],
-    );
+    // Step 4: Build map of mapping_id → template names
+    const mappingIdToTemplates: Record<number, string[]> = {};
 
-    // Step 5: Attach templates (comma-separated) to each result row
-    const enrichedResult = result.map((row) => {
-      // Find all mapping_ids where action_id == current row.id
-      const relatedMappingIds = stageActions
-        .filter((sa) => sa.action_id === row.id)
-        .map((sa) => sa.id);
+    for (const tm of templateMappings) {
+      const mappingId = tm.stg_act_mapping_id;
+      const name = templateCodeToName[tm.template_code];
+      if (name) {
+        if (!mappingIdToTemplates[mappingId]) {
+          mappingIdToTemplates[mappingId] = [];
+        }
+        mappingIdToTemplates[mappingId].push(name);
+      }
+    }
+
+    // Step 5: Build action_id → template names using mappingIdToTemplates + stageActions
+    const actionIdToTemplates: Record<number, string[]> = {};
+
+    for (const sa of stageActions) {
+      const mappingId = sa.id;
+      const templates = mappingIdToTemplates[mappingId];
+      if (templates?.length) {
+        if (!actionIdToTemplates[sa.action_id]) {
+          actionIdToTemplates[sa.action_id] = [];
+        }
+        actionIdToTemplates[sa.action_id].push(...templates);
+      }
+    }
 
-      // Collect all template names across those mapping ids
-      const allNames = relatedMappingIds
-        .map((mid) => templateNameMap[mid])
-        .filter(Boolean);
+    // Step 6: Fetch action details
+    const actionResults = await this.dataSource
+      .createQueryBuilder()
+      .select([
+        'a.id AS id',
+        'a.name AS action_name',
+        'ac.name AS action_category',
+        'ar.name AS action_requirement',
+      ])
+      .from('cr_wf_action', 'a')
+      .leftJoin('cr_wf_action_category', 'ac', 'ac.id = a.action_cat_id')
+      .leftJoin(
+        'cr_list_master_items',
+        'ar',
+        `ar.id = 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 })
+      .getRawMany();
+
+    // Step 7: Enrich result with template field
+    const enrichedResult = actionResults.map((row) => {
+      const actionId = Number(row.id); // Ensure numeric ID match
+      const templates = actionIdToTemplates[actionId] || [];
+      const uniqueTemplates = [...new Set(templates)]; // remove duplicates
 
       return {
         ...row,
-        template: allNames.length ? allNames.join(', ') : '',
+        template: uniqueTemplates.join(', '),
       };
     });