tango-app-api-trax 3.3.1-beta-57 → 3.3.1-beta-59

package/package.json

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

package/src/controllers/trax.controller.js

@@ -1972,7 +1972,7 @@ export const validateUserv1 = async ( req, res ) => {
 
       const duplicateStores = Object.keys( duplicateStore ).filter( ( storeName ) => duplicateStore[storeName].count > 1 );
       if ( duplicateStores.length ) {
-        return res.sendSuccess( { validate: false, ExistsEmail: duplicateStores, message: 'Store and email is duplicated' } );
+        return res.sendError( { validate: false, duplicates: duplicateStores, message: 'Store and email is duplicated' }, 400 );
       }
     } else {
       const duplicateUser = assignDetails.reduce( ( acc, obj ) => {
@@ -1995,7 +1995,7 @@ export const validateUserv1 = async ( req, res ) => {
 
       const duplicateUsers = Object.keys( duplicateUser ).filter( ( storeName ) => duplicateUser[storeName].count > 1 );
       if ( duplicateUsers.length ) {
-        return res.sendSuccess( { validate: false, ExistsEmail: duplicateUsers, message: 'Email is Duplicated' } );
+        return res.sendError( { validate: false, duplicates: duplicateUsers, message: 'Email is Duplicated' }, 400 );
       }
     }
 
@@ -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;
         }
       } ) );
     }