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

package/package.json

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

package/src/controllers/task.controller.js

@@ -264,8 +264,8 @@ export async function taskDetails( req, res ) {
     }
     if ( storechecklistdetails ) {
       result.checkListDetails = { ...storechecklistdetails._doc };
-      let assignedusers = await taskAssignService.find( { checkListId: storechecklistdetails._id }, { _id: 1 } );
-      assignedusers = assignedusers?.map( ( item ) => item._id );
+      let assignedusers = await taskAssignService.find( { checkListId: storechecklistdetails._id }, { assignId: 1 } );
+      assignedusers = assignedusers?.map( ( item ) => item.assignId );
       result.checkListDetails = { ...result.checkListDetails, ...{ sections: sectionList }, ...{ assignedusers: assignedusers } };
     }
     return res.sendSuccess( result );
@@ -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,
@@ -664,12 +664,16 @@ export async function taskConfig( req, res ) {
       return res.sendError( { message: 'Task Id is Required' }, 400 );
     }
 
-    if ( inputBody.submitType == 'publish' ) {
-      let checkUserAssigned = await taskAssignService.findOne( { checkListId: inputBody._id, checkFlag: true } );
-      if ( !checkUserAssigned ) {
-        return res.sendError( { message: 'Please assign a user' }, 400 );
-      }
+    if ( !inputBody.assignedUsers.length && inputBody.submitType == 'publish' ) {
+      return res.sendError( 'Please Assigned a user', 400 );
     }
+
+    // if ( inputBody.submitType == 'publish' ) {
+    //   let checkUserAssigned = await taskAssignService.findOne( { checkListId: inputBody._id, checkFlag: true } );
+    //   if ( !checkUserAssigned ) {
+    //     return res.sendError( { message: 'Please assign a user' }, 400 );
+    //   }
+    // }
     if ( !inputBody?.approver.length && inputBody.submitType == 'publish' ) {
       return res.sendError( { message: 'Please assign approver' }, 400 );
     }
@@ -931,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 } );
@@ -1524,6 +1528,7 @@ export async function approveTask( req, res ) {
             sourceCheckList_id: req.body.sourceCheckList_id,
             fromDate: req.body.fromDate,
             toDate: req.body.toDate,
+            filtertype: req.body.filtertype,
             store_id: inputstores,
           },
           'upsert': {
@@ -2644,6 +2649,7 @@ export async function StoreHygienetask( req, res ) {
 export async function eyeTesttask( req, res ) {
   try {
     let inputBody = req.body;
+    console.log( inputBody );
     inputBody.clientId = 11;
     inputBody.taskDescription = '';
     let userId;
@@ -2654,7 +2660,9 @@ export async function eyeTesttask( req, res ) {
 
     let url = JSON.parse( process.env.LAMBDAURL );
     let checklistId = url.dailystoreChecklistId;
+    console.log( checklistId );
     let finduser = await checklistassignconfigModel.findOne( { checkListId: new mongoose.Types.ObjectId( checklistId ), store_id: storeDetails.storeId } );
+    console.log( finduser );
 
     if ( !finduser ) {
       return res.sendError( 'No user Found For this store', 500 );
@@ -2813,8 +2821,10 @@ export async function eyeTesttask( req, res ) {
         }
         question[0].questionReferenceImage = images;
       } else {
+        console.log( req.file );
         let images = [];
         let uplaodedImage = await uploadmultiImage( req.files.referenceImage );
+        console.log( uplaodedImage );
         let imgUrl = decodeURIComponent( uplaodedImage.imgUrl.split( '?' )[0] );
         let url = imgUrl.split( '/' );
         if ( url.includes( 'https:' ) || url.includes( 'http:' ) ) {
@@ -3357,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 );
       }
@@ -3440,7 +3450,6 @@ async function assignUsers( data ) {
         },
       ];
       let clusterDetails = await clusterServices.aggregateCluster( query );
-      console.log( clusterDetails );
       if ( clusterDetails.length ) {
         if ( !data.upload ) {
           assignedData = {
@@ -3454,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 ) {
@@ -3650,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 );