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

package/package.json

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

package/src/controllers/task.controller.js

@@ -597,7 +597,7 @@ export async function userDetails( req, res ) {
       if ( ele?.clusterName ) {
         let clusterDetails = await clusterServices.findOneCluster( { _id: ele.assignId }, { stores: 1 } );
         if ( clusterDetails ) {
-          let storeDetails = await storeService.find( { _id: { $in: clusterDetails.stores.map( ( item ) => item.store ) } } );
+          let storeDetails = await storeService.find( { _id: { $in: clusterDetails.stores.map( ( item ) => item.store ) }, status: 'active' } );
           storeDetails.forEach( ( item ) => {
             userDetails.push( {
               id: ele._id,
@@ -935,7 +935,7 @@ async function insertPCBulkV3( getCLconfig, checklistId, updatedchecklist, date,
         let clusterDetails = await clusterServices.findcluster( { _id: { $in: clusterList } } );
         if ( clusterDetails.length ) {
           let idList = clusterDetails.flatMap( ( item ) => item.stores.map( ( ele ) => ele.store ) );
-          let getStoreDetails = await storeService.find( { _id: { $in: idList } } );
+          let getStoreDetails = await storeService.find( { _id: { $in: idList }, status: 'active' } );
           if ( getStoreDetails.length ) {
             assignList = await Promise.all( getStoreDetails.map( async ( store ) => {
               let userDetails = await userService.findOne( { email: store?.spocDetails?.[0]?.email, clientId: store.clientId } );
@@ -3367,7 +3367,7 @@ export async function taskAssign( req, res ) {
       } else {
         idList = req.body.idList;
       }
-      let getStoreDetails = await storeService.find( { _id: { $in: idList } } );
+      let getStoreDetails = await storeService.find( { _id: { $in: idList }, status: 'active' } );
       if ( !getStoreDetails.length ) {
         return res.sendError( 'No data found', 204 );
       }
@@ -3463,7 +3463,7 @@ async function assignUsers( data ) {
           };
         } else {
           let clusterList = clusterDetails[0].stores.map( ( ele ) => ele.store );
-          let storeDetails = await storeService.find( { _id: clusterList } );
+          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 ) {
@@ -3659,13 +3659,15 @@ export async function assignTaskUser( req, res ) {
       assign.clientId = inputBody.clientId;
       assign.upload = inputBody.type;
       let uploadData = await assignUsers( assign );
-      if ( Array.isArray( uploadData ) ) {
-        assignData.push( ...uploadData );
-      } else {
-        assignData.push( uploadData );
+      if ( uploadData ) {
+        if ( Array.isArray( uploadData ) ) {
+          assignData.push( ...uploadData );
+        } else {
+          assignData.push( uploadData );
+        }
       }
     } ) );
-    return res.sendSuccess( { idList: [ ...new Set( assignData.map( ( item ) => item.assignId ) ) ], assignData } );
+    return res.sendSuccess( { idList: [ ...new Set( assignData.map( ( item ) => item?.assignId?.toString() ) ) ], assignData } );
   } catch ( e ) {
     logger.error( { functionName: 'assignTaskUser', error: e } );
     return res.sendError( e, 500 );