rez_core 2.2.38 → 2.2.40

package/package.json

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

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

@@ -34,15 +34,11 @@ export class StageGroupController {
 
   @Post('/get-all-stage-groups-and-stages')
   @HttpCode(HttpStatus.OK)
-  async getAllStageGroupAndStageHierarchy(
-    @Req() req: Request & { user: any },
-    @Body() body: { workflow_id: number },
-  ) {
+  async getAllStageGroupAndStageHierarchy(@Req() req: Request & { user: any }) {
     const loggedInUser = req.user.userData;
 
     return this.stageGroupService.getAllStageGroupAndStageHierarchy(
-      body.workflow_id,
-      loggedInUser.organization_id,
+      loggedInUser,
     );
   }
 }

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

@@ -4,7 +4,9 @@ import { StageGroupRepository } from '../repository/stage-group.repository';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { UserData } from 'src/module/user/entity/user.entity';
 import { StageService } from './stage.service';
-import { DataSource } from 'typeorm';
+import { DataSource, Repository } from 'typeorm';
+import { WorkflowLevelMappingEntity } from '../entity/workflow-level-mapping.entity';
+import { InjectRepository } from '@nestjs/typeorm';
 
 @Injectable()
 export class StageGroupService extends EntityServiceImpl {
@@ -13,6 +15,8 @@ export class StageGroupService extends EntityServiceImpl {
     @Inject('StageService')
     private readonly stageService: StageService,
     private readonly dataSource: DataSource,
+    @InjectRepository(WorkflowLevelMappingEntity)
+    private readonly workflowLevelMappingRepo: Repository<WorkflowLevelMappingEntity>,
   ) {
     super();
   }
@@ -23,13 +27,34 @@ export class StageGroupService extends EntityServiceImpl {
     );
   }
 
-  async getAllStageGroupAndStageHierarchy(
-    workflow_id: number,
-    organization_id: number,
-  ) {
+  async getAllStageGroupAndStageHierarchy(loggedInUser: UserData) {
+    // Try finding mapping at user's level
+    let workflowLevelMapping = await this.workflowLevelMappingRepo.findOne({
+      where: {
+        mapped_level_type: loggedInUser.level_type,
+        mapped_level_id: loggedInUser.level_id,
+      },
+    });
+
+    console.log('Workflow Level Mapping:', workflowLevelMapping);
+
+    // If not found, fallback to organization-level mapping
+    if (!workflowLevelMapping) {
+      workflowLevelMapping = await this.workflowLevelMappingRepo.findOne({
+        where: {
+          mapped_level_type: 'ORG',
+          mapped_level_id: String(loggedInUser.organization_id),
+        },
+      });
+      console.log('Fallback Workflow Level Mapping:', workflowLevelMapping);
+    }
+
+    // If still not found, return null
+    if (!workflowLevelMapping) return null;
+
     return await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
-      workflow_id,
-      organization_id,
+      workflowLevelMapping.workflow_id,
+      loggedInUser.organization_id,
     );
   }