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

package/package.json

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

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 ) => {
@@ -3708,7 +3712,8 @@ 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 = {
@@ -3721,6 +3726,7 @@ export async function updateAssign( req, res ) {
       }
       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 } } );