rez_core 2.2.25 → 2.2.27

package/package.json

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

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

@@ -7,7 +7,6 @@ import {
 import { InjectRepository } from '@nestjs/typeorm';
 import { DataSource, Repository } from 'typeorm';
 import { ActionEntity } from '../entity/action.entity';
-import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class ActionRepository {
@@ -88,26 +87,6 @@ export class ActionRepository {
       return acc;
     }, {});
 
-    // Step 4: Resolve all default_reason_code values (regardless of default_value)
-    const allDefaultReasonIds = actions
-      .filter((row) => row.default_reason_code)
-      .map((row) => row.default_reason_code);
-
-    let defaultReasonMap = {};
-    if (allDefaultReasonIds.length > 0) {
-      const listItems = await this.dataSource
-        .createQueryBuilder()
-        .select(['id', 'name'])
-        .from('cr_list_master_items', 'li')
-        .where('li.id IN (:...ids)', { ids: allDefaultReasonIds })
-        .getRawMany();
-
-      defaultReasonMap = listItems.reduce((acc, item) => {
-        acc[item.id] = item.name;
-        return acc;
-      }, {});
-    }
-
     // Step 5: Enrich actions
     const enrichedResult = actions.map((row) => {
       const data = actionIdToData[row.action_id];
@@ -124,7 +103,7 @@ export class ActionRepository {
         logo: row.logo,
         name: row.action_category_name,
         reason_code,
-        default_reason_code: defaultReasonMap[row.default_reason_code] || null,
+        default_reason_code: row.default_reason_code,
         is_default: row.default_value === 1,
         is_current: data?.is_current ?? false,
         is_done: data?.is_done ?? false,

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

@@ -60,9 +60,14 @@ export class ActionService extends EntityServiceImpl {
     const stageActionMapping = {
       action_id: action.id,
       stage_id: actionData.stage_id,
+
       entity_type: 'STGM',
     } as any;
 
+    if (entityData?.organization_id) {
+      stageActionMapping.organization_id = entityData.organization_id;
+    }
+
     const stageActionMappingData = await super.createEntity(
       stageActionMapping,
       loggedInUser,
@@ -79,6 +84,10 @@ export class ActionService extends EntityServiceImpl {
           entity_type: 'ARMS',
         } as any;
 
+        if (entityData?.organization_id) {
+          resourceMapping.organization_id = entityData.organization_id;
+        }
+
         await super.createEntity(resourceMapping, loggedInUser);
       }
     }
@@ -93,6 +102,10 @@ export class ActionService extends EntityServiceImpl {
           entity_type: 'ARMS',
         } as any;
 
+        if (entityData?.organization_id) {
+          resourceMapping.organization_id = entityData.organization_id;
+        }
+
         await super.createEntity(resourceMapping, loggedInUser);
       }
     }