rez_core 2.2.96 → 2.2.98

package/package.json

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

package/src/module/workflow/controller/activity-log.controller.ts

@@ -42,11 +42,11 @@ export class ActivityLogController {
   async getAllActivityCategory(
     @Req() req: Request & { user: any },
     @Body('entity_type') mapped_entity_type: string,
-    // @Body('mapped_entity_id') mapped_entity_id: string,
+    @Body('mapped_entity_id') mapped_entity_id: string,
   ) {
     const loggedInUser = req.user.userData;
     const result = this.activityLogService.getAllActivityCategory(
-      // mapped_entity_id,
+      mapped_entity_id,
       mapped_entity_type,
       loggedInUser,
     );

package/src/module/workflow/repository/activity-log.repository.ts

@@ -89,7 +89,7 @@ export class ActivityLogRepository {
   }
 
   async getAllActivityCategory(
-    // mapped_entity_id: number | string,
+    mapped_entity_id: number | string,
     mapped_entity_type: string,
     loggedInUser: any,
   ) {
@@ -102,6 +102,9 @@ export class ActivityLogRepository {
         mapped_entity_type,
       })
       .andWhere('log.organization_id = :organization_id', { organization_id })
+      .andWhere('log.mapped_entity_id = :mapped_entity_id', {
+        mapped_entity_id,
+      })
 
       .getRawMany();
     return result.map((row) => {

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

@@ -42,9 +42,27 @@ export class StageGroupRepository {
     return result;
   }
 
+  async getAllStageGroupByCondition(condition: any) {
+    const result = await this.stageGroupRepository.find({
+      where: {
+        ...condition,
+      },
+      order: {
+        sequence: 'ASC',
+      },
+    });
+
+    if (!result || result.length === 0) {
+      throw new NotFoundException(
+        'No stage groups found for the given workflow ID',
+      );
+    }
+
+    return result;
+  }
+
   async getAllStageGroupAndStageHierarchy(
     workflow_id: number,
-    organization_id: number,
     loggedInUser: any, // required for media service
     lead_id: number,
   ) {
@@ -53,10 +71,12 @@ export class StageGroupRepository {
     }
 
     // Step 1: Get all stage groups
-    const stageGroups = await this.getAllStageGroup(
+    const stageGroups = await this.getAllStageGroupByCondition({
       workflow_id,
-      organization_id,
-    );
+      organization_id: loggedInUser.organization_id,
+      level_id: loggedInUser.level_id,
+    });
+
     if (!stageGroups.length) return [];
 
     // Step 2: Get all stages for these stage groups
@@ -70,7 +90,7 @@ export class StageGroupRepository {
         AND cr_wf_stage.organization_id = ?
       ORDER BY cr_wf_stage.sequence ASC
     `,
-      [...stageGroupIds, organization_id],
+      [...stageGroupIds, loggedInUser.organization_id],
     );
 
     const stageIds = stagesRaw.map((s) => s.id);

package/src/module/workflow/service/activity-log.service.ts

@@ -93,12 +93,12 @@ export class ActivityLogService extends EntityServiceImpl {
   }
 
   async getAllActivityCategory(
-    // mapped_entity_id: number | string,
+    mapped_entity_id: number | string,
     mapped_entity_type: string,
     loggedInUser,
   ) {
     const result = this.activityLogRepository.getAllActivityCategory(
-      // mapped_entity_id,
+      mapped_entity_id,
       mapped_entity_type,
       loggedInUser,
     );

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

@@ -76,7 +76,6 @@ export class StageGroupService extends EntityServiceImpl {
     const stageGroupAndStageHierarchy =
       (await this.stageGroupRepository.getAllStageGroupAndStageHierarchy(
         workflowLevelMapping.workflow_id,
-        loggedInUser.organization_id,
         loggedInUser,
         lead_id,
       )) as Array<{

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

@@ -38,10 +38,10 @@ export class TaskService extends EntityServiceImpl {
 
     try {
       const logData = {
-        mapped_entity_id: entityData.mapped_entity_id,
-        mapped_entity_type: entityData.mapped_entity_type,
+        mapped_entity_id: result.mapped_entity_id,
+        mapped_entity_type: result.mapped_entity_type,
         title: `Task added`,
-        description: `A new task ${entityData.name} was added`,
+        description: `A new task ${result.name} was added`,
         category: ACTIVITY_CATEGORIES.TASK,
         action: 'add',
         appcode: loggedInUser.appcode,
@@ -111,7 +111,7 @@ export class TaskService extends EntityServiceImpl {
         mapped_entity_id: updatedEntity.mapped_entity_id,
         mapped_entity_type: updatedEntity.mapped_entity_type,
         title: `Task edited`,
-        description: `${entityData.name} was edited`,
+        description: `${updatedEntity.code} was edited`,
         category: ACTIVITY_CATEGORIES.TASK,
         action: 'edit',
         appcode: loggedInUser.appcode,
@@ -124,7 +124,7 @@ export class TaskService extends EntityServiceImpl {
           mapped_entity_id: updatedEntity.mapped_entity_id,
           mapped_entity_type: updatedEntity.mapped_entity_type,
           title: `Task completed`,
-          description: `${entityData.name} was marked as completed`,
+          description: `${updatedEntity.code} was marked as completed`,
           category: ACTIVITY_CATEGORIES.TASK,
           action: 'completed',
           appcode: loggedInUser.appcode,

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}