rez_core 2.2.97 → 2.2.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "2.2.97",
+  "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/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/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,