tango-app-api-task 3.4.1-activitylog-12 → 3.4.1-activitylog-14

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.4.1-activitylog-12",
+    "version": "3.4.1-activitylog-14",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -2330,7 +2330,6 @@ export async function approveTask( req, res ) {
         let url = JSON.parse( process.env.LAMBDAURL );
 
         let searchResponse = await fetch( url.approveTask, requestOptions );
-        console.log( 'logData', logData );
         let logData= {
           'client_id': taskDetails[0].client_id,
           'createAt': new Date(),
@@ -4320,7 +4319,7 @@ async function assignUsers( data ) {
           userName: store.spocDetails?.[0]?.name,
           userEmail: store.spocDetails?.[0]?.email,
           clusterName: clusterDetails?.[0]?.clusterName,
-          id: clusterDetails?.[0]?._id,
+          id: [ clusterDetails?.[0]?._id ],
         };
         return userData;
       } ) );
@@ -4335,7 +4334,7 @@ async function assignUsers( data ) {
           userName: user.userName,
           userEmail: user.email,
           teamName: teamDetails?.[0]?.teamName,
-          id: teamDetails?.[0]?._id,
+          id: [ teamDetails?.[0]?._id ],
         };
         return userData;
       } );
@@ -4403,6 +4402,7 @@ export async function taskAssign( req, res ) {
         uniqueArr = uniqueArr.reduce( ( acc, obj ) => {
           if ( acc[obj.storeName] ) {
             acc[obj.storeName].clusterName += ',' + obj.clusterName;
+            acc[obj.storeName].id.push( ...obj.id );
           } else {
             acc[obj.storeName] = { ...obj };
           }
@@ -4414,6 +4414,7 @@ export async function taskAssign( req, res ) {
         uniqueArr = uniqueArr.reduce( ( acc, obj ) => {
           if ( acc[obj.userEmail] ) {
             acc[obj.userEmail].teamName += ','+ obj.teamName;
+            acc[obj.userEmail].id.push( ...obj.id );
           } else {
             acc[obj.userEmail] = { ...obj };
           }
@@ -4439,15 +4440,24 @@ export async function updateAssign( req, res ) {
     if ( !taskDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    let groupList = req.body.assignedGroup;
-    req.body.assignedGroup = [ ...new Set( req.body.assignedGroup.map( ( item ) => item.id ) ) ];
-    groupList = req.body.assignedGroup.reduce( ( acc, ele ) => {
-      let findDetails = groupList.find( ( item ) => item.id == ele );
-      if ( findDetails ) {
-        acc.push( findDetails?.clusterName || findDetails?.teamName );
-      };
-      return acc;
-    }, [] );
+    let groupList = [];
+    let groupAssignList = req.body.assignedGroup;
+    req.body.assignedGroup = [ ...new Set( req.body.assignedGroup.flatMap( ( item ) => item.id ) ) ];
+
+    groupAssignList.forEach( ( ele ) => {
+      let gName;
+      if ( ele?.clusterName ) {
+        gName = ele.clusterName.split( ',' );
+      }
+      if ( ele?.teamName ) {
+        gName = ele.teamName.split( ',' );
+      }
+      gName.forEach( ( name ) => {
+        if ( !groupList.includes( name ) ) {
+          groupList.push( name );
+        }
+      } );
+    } );
     // req.body.assignedGroup = req.body.assignedGroup.map( ( ele ) => {
     //   return { id: ele };
     // } );