tango-app-api-trax 3.3.1-beta-45 → 3.3.1-beta-47

package/package.json

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

package/src/controllers/teaxFlag.controller.js

@@ -800,7 +800,7 @@ export const flagTablesV1 = async ( req, res ) => {
     let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
     let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
-    console.log( 'getUserEmails =>', getUserEmails );
+
     let findQuery = [];
     let findAndQuery = [];
     findAndQuery.push(
@@ -2170,10 +2170,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
               { date_iso: { $lte: rangeTwoToDate } },
               { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
               // { store_id: { $in: requestData?.storeId } },
-              { '$or': [
-                { '$and': findORQuery1 },
-                { '$and': findORQuery2 },
-              ] },
+              { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
             ],
           },
         },
@@ -2287,10 +2284,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
               client_id: requestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
               // store_id: { $in: requestData.storeId },
-              $or: [
-                { '$and': findORQuery1 },
-                { '$and': findORQuery2 },
-              ],
+              $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
             },
         },
         {
@@ -2316,10 +2310,7 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
               client_id: requestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
               // store_id: { $in: requestData.storeId },
-              $or: [
-                { '$and': findORQuery1 },
-                { '$and': findORQuery2 },
-              ],
+              $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
             },
         },
         {
@@ -2363,7 +2354,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
   try {
     let reqestData = req.body;
     // Get User Based Checklist //
-    let loginUser = { clientId: requestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
+    let loginUser = { clientId: reqestData.clientId, role: req.user.role, userType: req.user.userType, userEmail: req.user.email };
     let getUserEmails = await getChecklistUsers( loginUser );
     // End: Get User Based Checklist////
     if ( reqestData.ChecklistType == 'custom' ) {
@@ -2642,7 +2633,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
     let findQuery = [
       { $match: { $and: [
         { client_id: requestData.clientId },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { aiStoreList: { $in: requestData.storeId } } ] },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: requestData.storeId } } ] },
         { date_iso: { $gte: fromDate } },
         { date_iso: { $lte: toDate } },
         {
@@ -2652,7 +2643,6 @@ export const checklistDropdownV1 = async ( req, res ) => {
             { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } },
           ],
         },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
       ] } },
       {
         $project: {