tango-app-api-trax 3.3.1-beta-10 → 3.3.1-beta-11

package/package.json

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

package/src/controllers/trax.controller.js

@@ -900,7 +900,7 @@ export const assignedUserDetails = async ( req, res ) => {
             userDetails.push( {
               id: ele._id,
               userName: item.spocDetails?.[0]?.name,
-              userEmail: item.spocDetails[0].email,
+              userEmail: item.spocDetails?.[0]?.email,
               store_id: item?.storeId,
               storeName: item?.storeName,
               userPhone: item.spocDetails?.[0]?.phone,
@@ -945,9 +945,16 @@ export const assignedUserDetails = async ( req, res ) => {
         } );
       }
     } ) );
-
-    userDetails.sort( ( a, b ) => b.teamName - a.teamName );
-    console.log( userDetails );
+    if ( req.query.sortColumn && req.query.sortBy ) {
+      const sortColumn = req.query.sortColumn;
+      const sortBy = parseInt( req.query.sortBy, 10 ) === -1 ? -1 : 1;
+      userDetails.sort( ( a, b ) => {
+        if ( a[sortColumn] == null || b[sortColumn] == null ) return 0;
+        if ( typeof a[sortColumn] === 'string' && typeof b[sortColumn] === 'string' ) {
+          return sortBy * a[sortColumn].localeCompare( b[sortColumn] );
+        }
+      } );
+    }
     let limitedData = userDetails.slice( skip, limit + skip );
     return res.sendSuccess( { count: userDetails.length, storeList, userList, users: limitedData } );
   } catch ( e ) {
@@ -1947,15 +1954,35 @@ export const validateUserv1 = async ( req, res ) => {
   }
 };
 
-export async function assignUser( req, res ) {
+export async function assignChecklistUser( req, res ) {
   try {
     let inputBody = req.body;
     let assignDetails = inputBody.assignUsers;
+    let newUsers = inputBody.newUsers;
     if ( inputBody.type == 'upload' ) {
       await assignedService.deleteMany( { checkListId: inputBody.checklistId } );
     }
-    await Promise.all( assignDetails.map( ( assign ) => {
-      assignUsers( assign );
+    let checklistDetails = await checklistService.findOne( { _id: inputBody.checklistId } );
+    if ( !checklistDetails ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    await Promise.all( newUsers.map( async ( user ) => {
+      let getUser = inputBody.assignUsers.find( ( ele ) => ele.userEmail.toLowerCase() == user.toLowerCase() );
+      let userData = {
+        userName: getUser.userName,
+        email: user,
+        mobileNumber: getUser?.phone,
+        clientId: inputBody.clientId,
+      };
+      await createUser( userData );
+    } ) );
+    await Promise.all( assignDetails.map( async ( assign ) => {
+      assign.checklistId = inputBody.checklistId;
+      assign.checkListName = checklistDetails.checkListName;
+      assign.coverage = inputBody.coverage;
+      assign.clientId = inputBody.clientId;
+      assign.upload = inputBody.type;
+      await assignUsers( assign );
     } ) );
     return res.sendSuccess( 'Details updated successfully' );
   } catch ( e ) {
@@ -3100,8 +3127,9 @@ export const checklistV2 = async ( req, res ) => {
 async function assignUsers( data ) {
   let assignedData;
   if ( data.coverage == 'store' ) {
-    if ( data.type == 'cluster' ) {
-      let clusterDetails = await clusterServices.findOneCluster( { _id: data.id }, { stores: 1, clusterName: 1 } );
+    if ( data?.type == 'cluster' ) {
+      let query = !data?.upload ? { _id: data.id } : { clusterName: data.clusterName, clientId: data.clientId };
+      let clusterDetails = await clusterServices.findOneCluster( query, { stores: 1, clusterName: 1 } );
       if ( clusterDetails ) {
         assignedData = {
           checkFlag: true,
@@ -3109,13 +3137,15 @@ async function assignUsers( data ) {
           checkListName: data.checkListName,
           client_id: data?.clientId,
           clusterName: clusterDetails?.clusterName,
-          assignId: data.id,
+          assignId: data?.id || clusterDetails?._id,
         };
       }
     } else {
-      let storeDetails = await storeService.findOne( { _id: data.id } );
+      let query = !data?.upload ? { _id: data.id } : { storeName: data.storeName };
+      let storeDetails = await storeService.findOne( query );
       if ( storeDetails ) {
-        let userDetails = await userService.findOne( { userEmail: storeDetails?.spocDetails?.email, clientId: data.clientId } );
+        let email = data?.upload ? data.userEmail : storeDetails?.spocDetails?.email;
+        let userDetails = await userService.findOne( { email: email, clientId: data.clientId } );
         if ( !userDetails ) {
           let userData = {
             userName: storeDetails.spocDetails?.[0]?.name,
@@ -3123,7 +3153,7 @@ async function assignUsers( data ) {
             mobileNumber: storeDetails.spocDetails?.[0]?.phone,
             clientId: data.clientId,
           };
-          createUser( userData );
+          userDetails = createUser( userData );
         }
         assignedData = {
           store_id: storeDetails.storeId,
@@ -3133,18 +3163,19 @@ async function assignUsers( data ) {
           userEmail: userDetails.email,
           userPhone: userDetails?.mobileNumber,
           city: storeDetails?.storeProfile?.city,
-          country: storeDetails?.storeprofile?.country,
+          country: storeDetails?.storeProfile?.country,
           checkFlag: true,
           checkListId: data.checklistId,
           checkListName: data.checkListName,
           client_id: data.clientId,
-          assignId: data.id,
+          assignId: data?.id || storeDetails._id,
         };
       }
     }
   } else {
     if ( data.type == 'teams' ) {
-      let teamDetails = await teamsServices.findOneTeams( { _id: data.id }, { users: 1, teamName: 1 } );
+      let query = !data?.upload ? { _id: data.id } : { teamName: data.teamName, clientId: data.clientId };
+      let teamDetails = await teamsServices.findOneTeams( query, { users: 1, teamName: 1 } );
       if ( teamDetails ) {
         assignedData = {
           checkFlag: true,
@@ -3152,11 +3183,12 @@ async function assignUsers( data ) {
           checkListName: data.checkListName,
           client_id: data.clientId,
           teamName: teamDetails?.teamName,
-          assignId: data.id,
+          assignId: data?.id || teamDetails?._id,
         };
       }
     } else {
-      let userDetails = await userService.findOne( { _id: { $in: data.id } } );
+      let query = !data?.upload ? { _id: data.id } : { email: data.email, clientId: data.clientId };
+      let userDetails = await userService.findOne( query );
       if ( userDetails ) {
         assignedData = {
           userId: userDetails._id,
@@ -3167,24 +3199,23 @@ async function assignUsers( data ) {
           checkListId: data.checklistId,
           checkListName: data.checkListName,
           client_id: data.clientId,
-          assignId: data.id,
+          assignId: data?.id || userDetails?._id,
         };
       }
     }
   }
-  await assignedService.create( assignedData );
+  if ( assignedData ) {
+    await assignedService.create( assignedData );
+  }
 }
 
 export async function checklistAssign( req, res ) {
   try {
-    if ( !req.body.type ) {
-      return res.sendError( 'Type is required', 400 );
-    }
     if ( !req.body.coverage ) {
       return res.sendError( 'coverage is required', 400 );
     }
-    if ( !req.body.id ) {
-      return res.sendError( 'coverage is required', 400 );
+    if ( !req.body.idList ) {
+      return res.sendError( 'Id list is required', 400 );
     }
     if ( !req.body.checklistId ) {
       return res.sendError( 'Checklist id is required', 400 );
@@ -3197,7 +3228,10 @@ export async function checklistAssign( req, res ) {
       return res.sendError( 'No data found', 204 );
     }
     req.body.checkListName = checklistDetails.checkListName;
-    await assignUsers( req.body );
+    await Promise.all( req.body.idList.map( async ( ele ) => {
+      let storeData = { ...req.body, type: ele.type, id: ele.id };
+      await assignUsers( storeData );
+    } ) );
     return res.sendSuccess( 'Details updated successfully' );
   } catch ( e ) {
     logger.error( { functionName: 'checklistAssign', error: e } );

package/src/routes/trax.routes.js

@@ -13,7 +13,7 @@ traxRouter
     .post( '/runAIInsert', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( runaiValidation ), traxController.runAIInsert )
     .get( '/duplicateChecklist/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( duplicateValidation ), traxController.duplicateChecklist )
     .put( '/checklist/update/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( updateChecklistValidation ), traxController.update )
-    .post( '/validateUser', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( uploadUserValidation ), traxController.validateUser )
+    .post( '/validateUser', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), validate( uploadUserValidation ), traxController.validateUserv1 )
     .get( '/userDetails/:checklistId', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( duplicateValidation ), traxController.assignedUserDetails )
     .post( '/checklistConfigure', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), traxController.updateConfigure )
     .post( '/checklistConfigurev1', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ 'isEdit' ] } ] } ), traxController.updateConfigurev1 )
@@ -27,6 +27,7 @@ traxRouter
     .get( '/checklistV2', isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ), validate( checklistPageSchema ), traxController.checklistV2 )
     .post( '/assign', isAllowedSessionHandler, traxController.checklistAssign )
     .post( '/remove', isAllowedSessionHandler, traxController.removeAssign )
-    .post( '/removeAssignList', isAllowedSessionHandler, traxController.deleteAssignList );
+    .post( '/removeAssignList', isAllowedSessionHandler, traxController.deleteAssignList )
+    .post( '/assignUpload', isAllowedSessionHandler, traxController.assignChecklistUser );
 
 // isAllowedSessionHandler, isAllowedClient, accessVerification( { userType: [ 'tango', 'client' ], access: [ { featureName: 'TangoTrax', name: 'checklist', permissions: [ ] } ] } ),