tango-app-api-task 3.2.1-beta-24 → 3.2.1-beta-25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-task",
-    "version": "3.2.1-beta-24",
+    "version": "3.2.1-beta-25",
     "description": "Task",
     "main": "index.js",
     "type": "module",

package/src/controllers/task.controller.js

@@ -738,6 +738,7 @@ export async function taskConfig( req, res ) {
           checkListName: checklistDetails.checkListName,
           checklistId: checklistDetails._id,
           coverage: inputBody.coverage,
+          insert: true,
         };
         await assignUsers( data );
       } ) );
@@ -3354,71 +3355,29 @@ export async function taskAssign( req, res ) {
     if ( !taskDetails ) {
       return res.sendError( 'No data found', 204 );
     }
-    let idList;
-    let assignList;
-    if ( req.body.coverage == 'store' ) {
-      let clusterDetails = await clusterServices.findcluster( { _id: { $in: req.body.idList } }, { stores: 1, clusterName: 1 } );
-      if ( clusterDetails.length ) {
-        let clusterList = clusterDetails.map( ( item ) => item._id.toString() );
-        idList = [
-          ...clusterDetails.flatMap( ( item ) => item.stores.map( ( ele ) => ele.store ) ),
-          ...req.body.idList.filter( ( ele ) => !clusterList.includes( ele ) ),
-        ];
-      } else {
-        idList = req.body.idList;
-      }
-      let getStoreDetails = await storeService.find( { _id: { $in: idList }, status: 'active' } );
-      if ( !getStoreDetails.length ) {
-        return res.sendError( 'No data found', 204 );
-      }
-      assignList = await Promise.all( getStoreDetails.map( async ( store ) => {
-        let userDetails = await userService.findOne( { email: store?.spocDetails?.[0]?.email, clientId: store.clientId } );
-        if ( !userDetails ) {
-          let data = {
-            clientId: store.clientId,
-            userName: store.spocDetails?.[0]?.name,
-            mobileNumber: store.spocDetails?.[0]?.phone || '',
-            email: store.spocDetails[0].email,
-          };
-          userDetails = await createUser( data );
+    let assignList = [];
+
+    await Promise.all( req.body.idList.map( async ( data ) => {
+      let assignedData = {
+        ...data,
+        clientId: req.body.clientId,
+        checkListName: taskDetails.checkListName,
+        checklistId: taskDetails._id,
+        coverage: req.body.coverage,
+        insert: false,
+      };
+      // console.log( assignedData, 'daterthj' );
+      let uploadData = await assignUsers( assignedData );
+      if ( uploadData ) {
+        if ( Array.isArray( uploadData ) ) {
+          assignList.push( ...uploadData );
+        } else {
+          assignList.push( uploadData );
         }
-        let data = {
-          store_id: store.storeId,
-          storeName: store.storeName,
-          userId: userDetails._id,
-          userName: userDetails.userName,
-          userEmail: userDetails.email,
-          userPhone: userDetails?.mobileNumber,
-          clusterName: clusterDetails?.clusterName,
-        };
-        return data;
-      } ) );
-    } else {
-      let teamDetails = await teamsServices.findteams( { _id: { $in: req.body.idList } }, { users: 1, teamName: 1 } );
-      if ( teamDetails.length ) {
-        let teamList = teamDetails.map( ( ele ) => ele._id.toString() );
-        idList = [
-          ...teamDetails.flatMap( ( item ) => item.users.map( ( ele ) => ele.userId ) ),
-          ...req.body.idList.filter( ( ele ) => !teamList.includes( ele._id ) ),
-        ];
-      } else {
-        idList = req.body.idList;
-      }
-      let userDetails = await userService.find( { _id: { $in: idList } } );
-      if ( !userDetails.length ) {
-        return res.sendError( 'No data found', 204 );
       }
-      assignList = [];
-      userDetails.forEach( ( user ) => {
-        assignList.push( {
-          userId: user._id,
-          userName: user.userName,
-          userEmail: user.email,
-          userPhone: user?.mobileNumber,
-          teamName: teamDetails?.teamName,
-        } );
-      } );
-    }
+    } ) );
+
+
     return res.sendSuccess( { count: assignList.length, assignList } );
   } catch ( e ) {
     logger.error( { functionName: 'checklistAssign', error: e } );
@@ -3439,7 +3398,7 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data?.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { cluster: data.clusterName.toLowerCase() },
+            ...( !data?.clusterName ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { cluster: data.clusterName.toLowerCase() },
           },
         },
         {
@@ -3451,7 +3410,7 @@ async function assignUsers( data ) {
       ];
       let clusterDetails = await clusterServices.aggregateCluster( query );
       if ( clusterDetails.length ) {
-        if ( !data.upload ) {
+        if ( data.insert ) {
           assignedData = {
             checkFlag: true,
             checkListId: data.checklistId,
@@ -3466,10 +3425,10 @@ async function assignUsers( data ) {
           let storeDetails = await storeService.find( { _id: { $in: clusterList }, status: 'active' } );
           assignedData = await Promise.all( storeDetails.map( async ( store ) => {
             let userDetails = await userService.findOne( { email: store.spocDetails?.[0]?.email, clientId: data.clientId } );
-            if ( !userDetails ) {
+            if ( !userDetails && store?.spocDetails?.length ) {
               let userData = {
                 userName: store.spocDetails?.[0]?.name,
-                email: store.spocDetails[0].email,
+                email: store.spocDetails[0]?.email,
                 mobileNumber: store.spocDetails?.[0]?.phone,
                 clientId: data.clientId,
               };
@@ -3486,7 +3445,9 @@ async function assignUsers( data ) {
               client_id: data.clientId,
               assignId: data?.id || clusterDetails?.[0]?._id,
               coverage: 'store',
-              teamName: clusterDetails?.[0]?.clusterName,
+              clusterName: clusterDetails?.[0]?.clusterName,
+              storeId: store.storeId,
+              storeName: store.storeName,
             };
             return userData;
           } ) );
@@ -3502,13 +3463,13 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { store: data.storeName.toLowerCase() },
+            ...( !data.storeName ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { store: data.storeName.toLowerCase() },
           },
         },
       ];
       let storeDetails = await storeService.aggregate( query );
       if ( storeDetails.length ) {
-        let email = data?.upload ? data.userEmail : storeDetails?.[0]?.spocDetails?.[0]?.email;
+        let email = !data?.insert ? data.userEmail : storeDetails?.[0]?.spocDetails?.[0]?.email;
         let userDetails = await userService.findOne( { email: email, clientId: data.clientId } );
         if ( !userDetails ) {
           let userData = {
@@ -3548,13 +3509,13 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data?.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { team: data.teamName.toLowerCase() },
+            ...( !data?.teamName ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { team: data.teamName.toLowerCase() },
           },
         },
       ];
       let teamDetails = await teamsServices.aggregateTeams( query );
       if ( teamDetails.length ) {
-        if ( !data.upload ) {
+        if ( data.insert ) {
           assignedData = {
             checkFlag: true,
             checkListId: data.checklistId,
@@ -3595,17 +3556,19 @@ async function assignUsers( data ) {
         {
           $match: {
             clientId: data.clientId,
-            ...( !data?.upload ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { userEmail: data.userEmail.toLowerCase() },
+            ...( !data?.userEmail ) ? { _id: new mongoose.Types.ObjectId( data.id ) } : { userEmail: data.userEmail.toLowerCase() },
           },
         },
       ];
+      // console.log( 'data?.userEmail=>', data.userEmail );
       let userDetails = await userService.aggregate( query );
       if ( !userDetails.length ) {
         let userData = {
-          userName: data.userEmail.split( '@' )[0],
+          userName: data?.userEmail?.split( '@' )[0],
           email: data.userEmail,
           clientId: data.clientId,
         };
+        // console.log( userData, 'userData', data );
         let details = await createUser( userData );
         userDetails = [ details ];
       }
@@ -3625,8 +3588,10 @@ async function assignUsers( data ) {
       }
     }
   }
-  if ( assignedData && !data.upload ) {
-    await taskAssignService.updateOne( { checkListId: assignedData.checkListId, assignId: assignedData.assignId }, assignedData );
+
+  // console.log( assignedData, 'test', data );
+  if ( assignedData && !data.upload && data.insert ) {
+    await assignedService.updateOne( { checkListId: assignedData.checkListId, assignId: assignedData.assignId }, assignedData );
   } else {
     return assignedData;
   }