tango-app-api-task 3.4.1-activitylog-11 → 3.4.1-activitylog-13

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.4.1-activitylog-11",
+    "version": "3.4.1-activitylog-13",
     "description": "Task",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.10.0",
         "nodemon": "^3.1.7",
         "npm": "^10.9.2",
-        "tango-api-schema": "^2.2.106",
+        "tango-api-schema": "^2.2.108",
         "tango-app-api-middleware": "^3.1.58",
         "winston": "^3.17.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/task.controller.js

@@ -1221,7 +1221,7 @@ function findObjectDifference( oldObj, newObj ) {
 }
 
 
-export async function insertSingleProcessData( checklistId,answerTypechange,inputBody ) {
+export async function insertSingleProcessData( checklistId, answerTypechange, inputBody ) {
   try {
     let currentdate = new Date();
     let date = dayjs( currentdate ).format();
@@ -1333,7 +1333,7 @@ export async function insertSingleProcessData( checklistId,answerTypechange,inpu
             updatedchecklist = checklistDetails;
           }
           if ( updatedchecklist ) {
-            await insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, dateVal, startTimeIso, endTimeIso, insertdata,answerTypechange,inputBody );
+            await insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, dateVal, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody );
           }
         }
       }
@@ -1345,7 +1345,7 @@ export async function insertSingleProcessData( checklistId,answerTypechange,inpu
   }
 };
 
-async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date, startTimeIso, endTimeIso, insertdata,answerTypechange ) {
+async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date, startTimeIso, endTimeIso, insertdata, answerTypechange, inputBody ) {
   let getquestionQuery = [];
 
   if ( dayjs( getCLconfig.publishDate ).format( 'YYYY-MM-DD' ) != dayjs( date ).format( 'YYYY-MM-DD' ) ) {
@@ -1513,11 +1513,11 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
         element4.remainder = getCLconfig?.remainder || [];
         element4.restrictAttendance = getCLconfig?.restrictAttendance;
         element4.coverage = getCLconfig?.coverage;
-        if(inputBody&&inputBody?.streamId){
+        if ( inputBody&&inputBody?.streamId ) {
           element4.streamId = inputBody?.streamId;
         }
-        if(answerTypechange){
-          element4.planotype = "qrScan"
+        if ( answerTypechange ) {
+          element4.planotype = 'qrScan';
         }
         element4.coverage = getCLconfig?.coverage;
         assignUserList.push( element4 );
@@ -3830,7 +3830,7 @@ export async function eyeTesttask( req, res ) {
         userId: userId,
       };
       await taskAssignService.create( userDetails );
-      await insertSingleProcessData( response?._id,true,inputBody);
+      await insertSingleProcessData( response?._id, true, inputBody );
       return res.sendSuccess( 'Task created successfully' );
     }
   } catch ( e ) {
@@ -4320,7 +4320,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 +4335,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 +4403,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 +4415,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 +4441,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 };
     // } );