tango-app-api-trax 3.3.1-beta-56 → 3.3.1-beta-58

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.3.1-beta-56",
+    "version": "3.3.1-beta-58",
     "description": "Trax",
     "main": "index.js",
     "type": "module",

package/src/controllers/trax.controller.js

@@ -1010,10 +1010,10 @@ export const assignedUserDetailsv1 = async ( req, res ) => {
           let storeDetails = await storeService.find( { _id: { $in: clusterDetails.stores.map( ( item ) => item.store ) }, status: 'active' } );
           storeDetails.forEach( ( item ) => {
             userDetails.push( {
-              id: ele.assignId,
+              _id: ele.assignId,
               userName: item.spocDetails?.[0]?.name,
               userEmail: item.spocDetails?.[0]?.email,
-              store_id: item?.storeId,
+              storeId: item?.storeId,
               storeName: item?.storeName,
               userPhone: item.spocDetails?.[0]?.phone,
               city: ele?.city,
@@ -1029,10 +1029,10 @@ export const assignedUserDetailsv1 = async ( req, res ) => {
           let teamUserDetails = await userService.find( { _id: { $in: teamDetails.users.map( ( item ) => item.userId ) } } );
           teamUserDetails.forEach( ( item ) => {
             userDetails.push( {
-              id: ele.assignId,
+              _id: ele.assignId,
               userName: item.userName,
               userEmail: item.email,
-              store_id: ele?.storeId,
+              storeId: ele?.storeId,
               storeName: ele?.storeName,
               userPhone: item?.mobileNumber,
               city: ele?.city,
@@ -1044,10 +1044,10 @@ export const assignedUserDetailsv1 = async ( req, res ) => {
         }
       } else {
         userDetails.push( {
-          id: ele.assignId,
+          _id: ele.assignId,
           userName: ele.userName,
           userEmail: ele.userEmail,
-          store_id: ele?.store_id,
+          storeId: ele?.store_id,
           storeName: ele?.storeName,
           userPhone: ele.userPhone,
           city: ele.city,
@@ -2068,8 +2068,10 @@ export const validateUserv1 = async ( req, res ) => {
     ] );
 
 
+    existEmail = existEmail.map( ( ele ) => ele.newEmail );
     let existUserEmail = userDetails.map( ( ele ) => ele.newEmail );
-    let newUserList = userEmailList.filter( ( ele ) => !existUserEmail.includes( ele ) );
+    let newUserList = userEmailList.filter( ( ele ) => !existUserEmail.includes( ele ) && !existEmail.includes( ele ) );
+    let inActiveStores = storeDetails.filter( ( ele ) => ele.status == 'deactive' ).map( ( ele ) => ele.storeName );
 
     let existsStore = storeDetails.map( ( ele ) => ele?.storeName );
     let newStoreList = storeList.filter( ( ele ) => ele != null && !existsStore.includes( ele.toLowerCase() ) );
@@ -2090,21 +2092,21 @@ export const validateUserv1 = async ( req, res ) => {
       } );
     }
 
-    if ( ( newUserList.length || newStoreList.length || existEmail.length ) && !req.body?.addUser ) {
-      return res.sendError( { validate: false, user: newUserList, store: newStoreList, existEmail, data: assignDetails }, 400 );
+    if ( ( newUserList.length || newStoreList.length || existEmail.length || inActiveStores.length ) && !req.body?.addUser ) {
+      return res.sendError( { validate: false, user: newUserList, store: newStoreList, existEmail, inActiveStores, data: assignDetails }, 400 );
     }
     if ( req.body.coverage == 'user' ) {
       await Promise.all( newUserList.map( async ( ele ) => {
-        let findUser = assignDetails.findIndex( ( item ) => item?.userEmail?.toLowerCase() == ele?.toLowerCase() );
-        if ( findUser != -1 ) {
+        let findUserIndex = assignDetails.findIndex( ( item ) => item?.userEmail?.toLowerCase() == ele?.toLowerCase() );
+        if ( findUserIndex != -1 ) {
           let data = {
-            userName: findUser.userName,
+            userName: assignDetails[findUserIndex]?.userName,
             email: ele,
-            mobileNumber: findUser?.mobileNumber,
+            mobileNumber: assignDetails[findUserIndex]?.mobileNumber,
             clientId: req.body.clientId,
           };
           let response = await createUser( data );
-          findUser._id = response._id;
+          assignDetails[findUserIndex]._id = response._id;
         }
       } ) );
     }
@@ -3653,9 +3655,36 @@ export async function checklistAssign( req, res ) {
         clientId: req.body.clientId,
       };
       let uploadData = await assignUsers( assignedData );
-      uniqueArr.push( ...uploadData );
+      if ( uploadData.length ) {
+        uniqueArr.push( ...uploadData );
+      }
     } ) );
 
+    if ( uniqueArr.length ) {
+      if ( req.body.coverage == 'store' ) {
+        uniqueArr = uniqueArr.reduce( ( acc, obj ) => {
+          if ( acc[obj.storeName] ) {
+            acc[obj.storeName].clusterName += ',' + obj.clusterName;
+          } else {
+            acc[obj.storeName] = { ...obj };
+          }
+          return acc;
+        }, {} );
+
+        uniqueArr= Object.values( uniqueArr );
+      } else {
+        uniqueArr = uniqueArr.reduce( ( acc, obj ) => {
+          if ( acc[obj.userEmail] ) {
+            acc[obj.userEmail].teamName += ','+ obj.teamName;
+          } else {
+            acc[obj.userEmail] = { ...obj };
+          }
+          return acc;
+        }, {} );
+        uniqueArr = Object.values( uniqueArr );
+      }
+    }
+
     return res.sendSuccess( { count: uniqueArr.length, uniqueArr } );
   } catch ( e ) {
     logger.error( { functionName: 'checklistAssign', error: e } );