tango-app-api-task 3.3.1-hotfix-2 → 3.3.1-hotfix-4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.3.1-hotfix-2",
+    "version": "3.3.1-hotfix-4",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/internalAPI.controller.js

@@ -126,7 +126,7 @@ async function insertData( requestData ) {
           }
         }
 
-        console.log( resultchecklist );
+        // console.log( resultchecklist );
 
 
         if ( resultchecklist.length ) {
@@ -141,7 +141,7 @@ async function insertData( requestData ) {
               let startTimeIso; let endTimeIso;
               startTimeIso = dayjs.utc( `${currentdate} ${sTime}`, 'YYYY-MM-DD hh:mm A' );
               endTimeIso = dayjs.utc( getCLconfig.scheduleEndTimeISO );
-              console.log( endTimeIso );
+              // console.log( endTimeIso );
 
               let insertdata = {};
               insertdata.date_iso = new Date( dayjs( currentdate, 'YYYY-MM-DD' ).format( 'YYYY-MM-DD' ) );
@@ -269,7 +269,7 @@ async function insertData( requestData ) {
                       if ( userIdList.length ) {
                         allQuestion = allQuestion.filter( ( item ) => typeof item._id == 'undefined' );
                       }
-                      console.log( allQuestion );
+                      // console.log( allQuestion );
 
                       if ( allQuestion ) {
                         let assigndeletequery = {};

package/src/controllers/task.controller.js

@@ -542,14 +542,14 @@ export const validateUserv1 = async ( req, res ) => {
       {
         $project: {
           newEmail: { $toLower: '$email' },
-          isActive: 1,
+          // isActive: 1,
           clientId: 1,
         },
       },
       {
         $match: {
           newEmail: { $in: userEmailList },
-          isActive: true,
+          // isActive: true,
           clientId: { $ne: req.body.clientId },
         },
       },
@@ -590,7 +590,7 @@ export const validateUserv1 = async ( req, res ) => {
     let newStoreList = storeList.filter( ( ele ) => ele != null && !existsStore.includes( ele.toLowerCase() ) );
     if ( req.body.coverage == 'store' ) {
       assignDetails.forEach( ( item ) => {
-        let getStoreDetails = storeDetails.find( ( store ) => store.storeName.toLowerCase() == item.storeName.toLowerCase() );
+        let getStoreDetails = storeDetails.find( ( store ) => store.storeName.toLowerCase() == item.storeName.trim().toLowerCase() );
         if ( getStoreDetails ) {
           let storeUserDetails = userDetails.find( ( ele ) => ele.newEmail.toLowerCase() == item.userEmail.toLowerCase() );
           item._id = getStoreDetails._id;
@@ -612,6 +612,10 @@ export const validateUserv1 = async ( req, res ) => {
     }
 
     if ( ( newUserList.length || newStoreList.length || existEmail.length || inActiveStores.length ) && !req.body?.addUser ) {
+      newStoreList = [ ...new Set( newStoreList.map( ( item ) => item ) ) ];
+      newUserList = [ ...new Set( newUserList.map( ( item ) => item ) ) ];
+      existEmail = [ ...new Set( existEmail.map( ( item ) => item ) ) ];
+      inActiveStores = [ ...new Set( inActiveStores.map( ( item ) => item ) ) ];
       return res.sendError( { validate: false, user: newUserList, store: newStoreList, existEmail, inActiveStores, data: assignDetails }, 400 );
     }
     await Promise.all( newUserList.map( async ( ele ) => {
@@ -963,7 +967,7 @@ export async function taskConfig( req, res ) {
       return res.sendSuccess( { id: inputBody._id, message: message } );
     }
   } catch ( e ) {
-    console.log( 'e', e );
+    // console.log( 'e', e );
     logger.error( { functionName: 'taskConfig =>', error: e, message: req.body } );
     return res.sendError( e, 500 );
   }
@@ -1357,7 +1361,7 @@ export async function uploadImage( req, res ) {
 
 async function createUser( data ) {
   try {
-    console.log( 'createUser ====>', data );
+    // console.log( 'createUser ====>', data );
     let params = {
       userName: data.userName,
       email: data.email,
@@ -1825,7 +1829,7 @@ export async function redoTask( req, res ) {
     };
 
     let response = await taskProcessedService.updateOne( { _id: req.body.payload._id }, updateData );
-    console.log( response );
+    // console.log( response );
     if ( response.modifiedCount || response.matchedCount ) {
       let storeTimeZone = await storeService.findOne( { storeName: taskDetails.storeName }, { 'storeProfile.timeZone': 1 } );
       let currentDateTime;
@@ -1865,7 +1869,7 @@ export async function redoTask( req, res ) {
       };
       let url = JSON.parse( process.env.LAMBDAURL );
       let searchResponse = await fetch( url.redoTask, requestOptions );
-      console.log( searchResponse.ok );
+      // console.log( searchResponse.ok );
       if ( searchResponse.ok ) {
         return res.sendSuccess( 'Question redo successfully' );
       } else {
@@ -3708,19 +3712,21 @@ export async function updateAssign( req, res ) {
       },
     ];
     let assignUserDetails = await userService.aggregate( query );
-    await Promise.all( req.body.assignedList.map( async ( assign ) => {
+    for ( let assign of req.body.assignedList ) {
+    // await Promise.all( req.body.assignedList.map( async ( assign ) => {
       let userDetails = assignUserDetails.find( ( ele ) => ele.email.toLowerCase() == assign.userEmail.toLowerCase() );
       if ( !userDetails ) {
         let userData = {
           userName: assign.userName,
           email: assign.userEmail,
-          mobileNumber: assign?.phone || '',
+          mobileNumber: assign?.userPhone || '',
           clientId: req.body.clientId,
         };
         userDetails = await createUser( userData );
       }
       let data = {
         ...assign,
+        userEmail: userDetails?.email,
         store_id: assign?.storeId,
         client_id: req.body.clientId,
         checkListId: req.body.taskId,
@@ -3731,7 +3737,8 @@ export async function updateAssign( req, res ) {
       };
       delete data._id;
       assignedUserList.push( data );
-    } ) );
+    // } ) );
+    }
     let assignGroupDetails = [];
     if ( req.body.coverage == 'store' ) {
       assignGroupDetails = await clusterServices.findcluster( { _id: { $in: req.body.assignedGroup } } );
@@ -3979,7 +3986,7 @@ export async function taskcreation( req, res ) {
 
 
     let finduser = await userService.findOne( { clientId: inputBody.clientId, email: req.body.user, userType: 'client', isActive: true }, { userName: '$userName', email: 1, userId: '$_id' } );
-    console.log( finduser );
+    // console.log( finduser );
 
     if ( !finduser ) {
       return res.sendError( 'No user Found', 500 );

package/src/controllers/taskActionCenter.controllers.js

@@ -88,7 +88,7 @@ export const overallCardsV1 = async ( req, res ) => {
     resultData = { taskApproval: { count: taskCount?.[0]?.count || 0 }, checklistApproval: { count: checklistCount?.[0]?.count || 0 } };
     return res.sendSuccess( { cardData: resultData } );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'overallCards' } );
     return res.sendError( error, 500 );
   }
@@ -160,6 +160,7 @@ export const approvalTableV1 = async ( req, res ) => {
           },
         },
         coverage: { $first: '$coverage' },
+        userName: { $first: '$userName' },
       },
     },
     {
@@ -179,6 +180,7 @@ export const approvalTableV1 = async ( req, res ) => {
         storeName: 1,
         redo: '$_id.redoType',
         coverage: 1,
+        userName: 1,
       },
     },
     {
@@ -364,7 +366,7 @@ export const overallCards = async ( req, res ) => {
     let resultData = await overallCardsData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'overallCards' } );
     return res.sendError( error, 500 );
   }
@@ -383,7 +385,7 @@ async function overallCardsData( requestData ) {
     // resultData.card = cardData;
     return { cardData: cardData };
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: data, function: 'overallCardsData' } );
   }
 }
@@ -394,7 +396,7 @@ export const approvalTable = async ( req, res ) => {
     let resultData = await approvalTableData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskTable' } );
     return res.sendError( error, 500 );
   }
@@ -461,7 +463,7 @@ async function approvalTableData( requestData ) {
     };
     return tableData;
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'approvalTableData' } );
     return res.sendError( error, 500 );
   }
@@ -473,7 +475,7 @@ export const activityLog = async ( req, res ) => {
     let resultData = await activityLogData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'activityLog' } );
     return res.sendError( error, 500 );
   }
@@ -536,7 +538,7 @@ async function activityLogData( requestData ) {
     };
     return activityLogData;
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'activityLogData' } );
     return res.sendError( error, 500 );
   }

package/src/controllers/taskDashboard.controllers.js

@@ -11,7 +11,7 @@ export const overallCards = async ( req, res ) => {
     let resultData = await overallCardsData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'overallCards' } );
     return res.sendError( error, 500 );
   }
@@ -42,7 +42,7 @@ async function overallCardsData( requestData ) {
     // resultData.card = cardData;
     return { cardData: cardData };
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: data, function: 'overallCardsData' } );
   }
 }
@@ -108,7 +108,6 @@ export const overallCardsV1 = async ( req, res ) => {
 };
 export const taskTableV1 = async ( req, res ) => {
   try {
-    console.log( 'req.body', req.body );
     let limit = parseInt( req.body.limit ) || 10;
     let offset = parseInt( req.body.offset - 1 ) || 0;
     let page = offset * limit;
@@ -190,7 +189,7 @@ export const taskTableV1 = async ( req, res ) => {
           { $sort: { createdAt: -1 } },
       );
     }
-    console.log( 'page', page );
+    // console.log( 'page', page );
     query.push( {
       $facet: {
         data: [
@@ -221,7 +220,7 @@ export const taskTableV1 = async ( req, res ) => {
 
     return res.sendSuccess( { taskTableData: checkList[0].data, totalCount: checkList[0].count[0].totalCount } );
   } catch ( e ) {
-    console.log( 'e', e );
+    // console.log( 'e', e );
     logger.error( 'checklist =>', e );
     return res.sendError( e, 500 );
   }
@@ -422,7 +421,7 @@ export const taskInfoTableV1 = async ( req, res ) => {
     }
     return res.sendSuccess( result );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: req.query, function: 'taskInfo' } );
     return res.sendError( { error: error }, 500 );
   }
@@ -434,7 +433,7 @@ export const taskTable = async ( req, res ) => {
     let resultData = await taskTableData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskTable' } );
     return res.sendError( error, 500 );
   }
@@ -528,7 +527,7 @@ async function taskTableData( requestData ) {
     };
     return tableData;
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'taskTableData' } );
     return res.sendError( error, 500 );
   }
@@ -540,7 +539,7 @@ export const taskInfoTable = async ( req, res ) => {
     let resultData = await taskInfoTableData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskInfoTable' } );
     return res.sendError( error, 500 );
   }
@@ -674,7 +673,7 @@ async function taskInfoTableData( requestData ) {
     };
     return tableInfoData;
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'tableInfoData' } );
     return res.sendError( error, 500 );
   }
@@ -685,7 +684,7 @@ export const taskDropdownList = async ( req, res ) => {
     let resultData = await taskDropdownListData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskDropdownList' } );
     return res.sendError( error, 500 );
   }
@@ -738,7 +737,7 @@ async function taskDropdownListData( requestData ) {
     };
     return taskDropdownListData;
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'taskDropdownListData' } );
     return res.sendError( error, 500 );
   }
@@ -799,7 +798,7 @@ export const taskDropdownListV1 = async ( req, res ) => {
     result.taskDropdown = getChecklistData;
     return res.sendSuccess( result );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: req.query, function: 'checklistDropdown' } );
     return res.sendError( { error: error }, 500 );
   }
@@ -907,7 +906,7 @@ export const taskDropdownListNew = async ( req, res ) => {
     result.taskDropdown = getChecklistData;
     return res.sendSuccess( result );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: req.query, function: 'checklistDropdownV1' } );
     return res.sendError( { error: error }, 500 );
   }
@@ -918,7 +917,7 @@ export const taskInfoView = async ( req, res ) => {
     let resultData = await taskInfoViewData( requestData );
     return res.sendSuccess( resultData );
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, function: 'taskInfoView' } );
     return res.sendError( error, 500 );
   }
@@ -949,7 +948,7 @@ async function taskInfoViewData( requestData ) {
     };
     return taskInfoViewData;
   } catch ( error ) {
-    console.log( 'error =>', error );
+    // console.log( 'error =>', error );
     logger.error( { error: error, message: requestData, function: 'taskInfoViewData' } );
     return res.sendError( error, 500 );
   }
@@ -964,7 +963,7 @@ export const taskDeleteV1 = async ( req, res ) => {
 
     const taskConfig = await taskService.findOne( { _id: new mongoose.Types.ObjectId( requestData.taskId ) }, { _id: 1 } );
     if ( !taskConfig ) {
-      console.log( 'Task found:', taskConfig );
+      // console.log( 'Task found:', taskConfig );
       return res.sendError( 'Task not found', 404 );
     }
 
@@ -974,7 +973,7 @@ export const taskDeleteV1 = async ( req, res ) => {
     );
 
     if ( resultData ) {
-      console.log( 'Update result:', resultData );
+      // console.log( 'Update result:', resultData );
       return res.sendSuccess( { message: 'Task deleted successfully' } );
     } else {
       return res.sendError( 'Something went wrong please try again', 500 );