rez_core 2.2.23 → 2.2.25

package/package.json

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

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

@@ -39,11 +39,10 @@ export class ActionCategoryController {
     @Req() req: Request & { user: any },
     @Body('action_cat_code') action_cat_code: string,
   ) {
-    const loggedInUser = req.user.userData;
-    const result = this.actionCategoryService.getReasonCodeByActionCategoryId(
-      loggedInUser,
-      action_cat_code,
-    );
+    const result =
+      this.actionCategoryService.getReasonCodeByActionCategoryId(
+        action_cat_code,
+      );
     return result;
   }
 

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

@@ -23,11 +23,10 @@ export class StageGroupController {
     @Req() req: Request & { user: any },
     @Body() body: { workflow_id: number },
   ) {
-    const { level_id, level_type } = req.user.userData;
+    const { organization_id } = req.user.userData;
     return this.stageGroupService.getAllStageGroup(
       body.workflow_id,
-      level_id,
-      level_type,
+      organization_id,
     );
   }
 }

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

@@ -26,11 +26,10 @@ export class StageController {
     @Req() req: Request & { user: any },
     @Body() body: { stage_group_id: number },
   ) {
-    const { level_id, level_type } = req.user.userData;
+    const { organization_id } = req.user.userData;
     return this.stageGroupService.getAllStage(
       body.stage_group_id,
-      level_id,
-      level_type,
+      organization_id,
     );
   }
 
@@ -40,11 +39,10 @@ export class StageController {
     @Body('workflow_id') workflow_id: number,
     @Req() req: Request & { user: any },
   ) {
-    const { level_id, level_type } = req.user.userData;
+    const { organization_id } = req.user.userData;
     return this.stageGroupService.getStagesWithGroupName(
       workflow_id,
-      level_id,
-      level_type,
+      organization_id,
     );
   }
 }

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

@@ -15,11 +15,7 @@ export class StageGroupRepository {
     private readonly stageGroupRepository: Repository<StageGroup>,
   ) {}
 
-  async getAllStageGroup(
-    workflow_id: number,
-    level_id: string,
-    level_type: string,
-  ) {
+  async getAllStageGroup(workflow_id: number, organization_id: number) {
     if (!workflow_id) {
       throw new BadRequestException('workflow_id is required');
     }
@@ -27,8 +23,7 @@ export class StageGroupRepository {
     const result = await this.stageGroupRepository.find({
       where: {
         workflow_id,
-        level_id,
-        level_type,
+        organization_id,
       },
       order: {
         sequence: 'ASC',

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

@@ -16,11 +16,7 @@ export class StageRepository {
     private readonly stageRepository: Repository<Stage>,
   ) {}
 
-  async getAllStage(
-    stage_group_id: number,
-    level_id: string,
-    level_type: string,
-  ) {
+  async getAllStage(stage_group_id: number, organization_id: number) {
     if (!stage_group_id) {
       throw new BadRequestException('stage_group_id is required');
     }
@@ -28,8 +24,7 @@ export class StageRepository {
     const result = await this.stageRepository.find({
       where: {
         stage_group_id,
-        level_id,
-        level_type,
+        organization_id,
       },
       order: {
         sequence: 'ASC',
@@ -37,9 +32,7 @@ export class StageRepository {
     });
 
     if (!result || result.length === 0) {
-      throw new NotFoundException(
-        'No stage found for the given stage group ID',
-      );
+      return [];
     }
 
     return result;

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

@@ -28,18 +28,14 @@ export class ActionCategoryService extends EntityServiceImpl {
     }));
   }
 
-  async getReasonCodeByActionCategoryId(
-    loggedInUser: UserData,
-    action_cat_code: string,
-  ) {
-    const { organization_id } = loggedInUser;
+  async getReasonCodeByActionCategoryId(action_cat_code: string) {
     const result = await this.dataSource.query(
       `
       SELECT id, reason_code
       FROM cr_wf_action_category
-      WHERE organization_id = ? AND code = ?
+      WHERE code = ?
       `,
-      [organization_id, action_cat_code],
+      [action_cat_code],
     );
 
     return {

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

@@ -16,15 +16,10 @@ export class StageGroupService extends EntityServiceImpl {
   ) {
     super();
   }
-  async getAllStageGroup(
-    workflow_id: number,
-    level_id: string,
-    level_type: string,
-  ) {
+  async getAllStageGroup(workflow_id: number, organization_id: number) {
     return await this.stageGroupRepository.getAllStageGroup(
       workflow_id,
-      level_id,
-      level_type,
+      organization_id,
     );
   }
 

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

@@ -23,15 +23,10 @@ export class StageService extends EntityServiceImpl {
   ) {
     super();
   }
-  async getAllStage(
-    stage_group_id: number,
-    level_id: string,
-    level_type: string,
-  ) {
+  async getAllStage(stage_group_id: number, organization_id: number) {
     return await this.stageRepository.getAllStage(
       stage_group_id,
-      level_id,
-      level_type,
+      organization_id,
     );
   }
 
@@ -75,19 +70,14 @@ export class StageService extends EntityServiceImpl {
     return deleteStage;
   }
 
-  async getStagesWithGroupName(
-    workflow_id: number,
-    level_id: string,
-    level_type: string,
-  ) {
+  async getStagesWithGroupName(workflow_id: number, organization_id: number) {
     if (!workflow_id) {
       throw new BadRequestException('workflow_id is required');
     }
 
     const stageGroups = await this.stageGroupRepository.getAllStageGroup(
       workflow_id,
-      level_id,
-      level_type,
+      organization_id,
     );
 
     const stageGroupIds = stageGroups.map((group) => group.id);
@@ -101,8 +91,7 @@ export class StageService extends EntityServiceImpl {
       try {
         const stages = await this.stageRepository.getAllStage(
           groupId,
-          level_id,
-          level_type,
+          organization_id,
         );
         allStages.push(...stages);
       } catch (err) {