tango-app-api-trax 3.5.2-alpha-8 → 3.5.2-alpha-10

package/package.json

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

package/src/controllers/gallery.controller.js

@@ -280,14 +280,25 @@ export const checklistDropdown = async ( req, res ) => {
 
 export async function approveChecklist( req, res ) {
   try {
+    if ( !( req.body.storeId.length > 0 || req.body.userEmail.length > 0 ) ) {
+      return res.sendError( 'StoreId or user Email required', 400 );
+    }
     let toDate = new Date( req.body.toDate );
     let userTimezoneOffset = toDate.getTimezoneOffset() * 60000;
     toDate = new Date( toDate.getTime() - userTimezoneOffset );
     toDate.setUTCHours( 23, 59, 59, 59 );
     let query = { sourceCheckList_id: req.body.sourceCheckList_id, date_iso: { $gte: req.body.fromDate, $lte: toDate }, $or: [ { checklistStatus: 'submit' }, { redoStatus: true } ], approvalEnable: true };
     if ( req.body?.storeId?.length ) {
-      const filteredStoreIds = req.body.storeId.filter( ( store ) => req.body.assignedStores.includes( store ) );
-      query['store_id'] = { $in: filteredStoreIds };
+      if ( req.body.assignedStores && req.body.assignedStores.length > 0 ) {
+        const filteredStoreIds = req.body.storeId.filter( ( store ) => req.body.assignedStores.includes( store ) );
+        query['store_id'] = { $in: filteredStoreIds };
+      } else {
+        const filteredStoreIds = req.body?.storeId;
+        query['store_id'] = { $in: filteredStoreIds };
+      }
+    }
+    if ( req.body?.userEmail?.length ) {
+      query['userEmail'] = { $in: req.body?.userEmail };
     }
     let checklistDetails = await processedChecklist.find( query, { _id: 1, checklistStatus: 1, storeName: 1, store_id: 1, userEmail: 1, client_id: 1, coverage: 1, checkListName: 1 } );
     if ( !checklistDetails.length ) {
@@ -325,7 +336,7 @@ export async function approveChecklist( req, res ) {
             approvalByEmail: req.user.email,
           },
         };
-        console.log( params );
+        // console.log( params );
         const requestOptions = {
           method: 'POST',
           headers: {
@@ -335,7 +346,7 @@ export async function approveChecklist( req, res ) {
         };
         let url = JSON.parse( process.env.LAMBDAURL );
         let searchResponse = await fetch( url.approveChecklist, requestOptions );
-        console.log( searchResponse );
+        // console.log( searchResponse );
         const filteredStoreIds = req.body.storeId.filter( ( store ) => req.body.assignedStores.includes( store ) );
         let logData= {
           'client_id': checklistDetails[0].client_id,
@@ -375,7 +386,7 @@ export async function approveChecklist( req, res ) {
       return res.sendError( `${redoList.length} stores has not been approved since those stores are not submitted`, 400 );
     }
   } catch ( e ) {
-    // console.log( 'e', e );
+    console.log( 'e', e );
     logger.error( { function: 'approveChecklist', error: e } );
     return res.sendError( e, 500 );
   }