tango-app-api-trax 3.3.1-beta-44 → 3.3.1-beta-46

package/package.json

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

package/src/controllers/teaxFlag.controller.js

@@ -543,17 +543,13 @@ export const flagCardsV1 = 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////
-
     const findQuery = [
       {
         $match: {
           client_id: clientId,
-          $or: [
-            { store_id: { $in: storeId } },
-            { aiStoreList: { $in: storeId } },
-          ],
+          // $or: [ { store_id: { $in: storeId } }, { aiStoreList: { $in: storeId } } ],
           date_iso: { $gte: adjustedFromDate, $lte: adjustedToDate },
-          $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+          $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: storeId } } ],
         },
       },
       {
@@ -690,12 +686,9 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
     // End: Get User Based Checklist////
     const createFindQuery = ( fromDate, toDate ) => [
       { $match: { client_id: requestData.clientId,
-        $or: [
-          { store_id: { $in: requestData.storeId } },
-          { aiStoreList: { $in: requestData.storeId } },
-        ],
+        // $or: [ { store_id: { $in: requestData.storeId } }, { aiStoreList: { $in: requestData.storeId } } ],
         date_iso: { $gte: fromDate, $lte: toDate },
-        $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ],
+        $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: requestData.storeId } } ],
       } },
       {
         $project: {
@@ -720,12 +713,8 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
       let comparisonData = Math.abs( ( ( rangeOneVal - rangeTwoVal ) / rangeTwoVal ) * 100 );
       if ( comparisonData === Infinity ) comparisonData = 0;
       comparisonData = comparisonData % 1 === 0 ? comparisonData.toFixed( 0 ) : comparisonData.toFixed( 1 );
-
       comparisonData = parseInt( comparisonData );
-
-
       const ComparisonFlag = rangeOneVal > rangeTwoVal;
-
       return { comparisonData, ComparisonFlag };
     };
 
@@ -737,13 +726,10 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
         clientId: requestData.clientId,
       };
 
-      console.log( dayjs( fromDate ).format( 'YYYY-MM-DD' ), 'from date' );
-
-      console.log( dayjs( toDate ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'current' );
-
-      console.log( dayjs( toDate ).format( 'YYYY-MM-DD' ), 'previous' );
-
-      console.log( dayjs( toDate ).startOf( 'day' ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'new start of' );
+      // console.log( dayjs( fromDate ).format( 'YYYY-MM-DD' ), 'from date' );
+      // console.log( dayjs( toDate ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'current' );
+      // console.log( dayjs( toDate ).format( 'YYYY-MM-DD' ), 'previous' );
+      // console.log( dayjs( toDate ).startOf( 'day' ).subtract( 1, 'day' ).format( 'YYYY-MM-DD' ), 'new start of' );
 
       const publishedAiChecklists = await checklistconfigService.find(
           {
@@ -759,9 +745,7 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
 
       const LamdaURL = 'https://f65azvtljclaxp6l7rnx65cdmm0lcgvp.lambda-url.ap-south-1.on.aws/';
       const resultData = await LamdaServiceCall( LamdaURL, detectionPayload );
-
       const published = publishedAiChecklists.map( ( val ) => val?.checkListType );
-
       if ( resultData?.status_code === '200' ) {
         let result = 0;
         published.forEach( ( item ) => {
@@ -821,10 +805,9 @@ export const flagTablesV1 = async ( req, res ) => {
     let findAndQuery = [];
     findAndQuery.push(
         { client_id: requestData.clientId },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { aiStoreList: { $in: requestData.storeId } } ] },
-        { date_iso: { $gte: fromDate } },
-        { date_iso: { $lte: toDate } },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+        // { $or: [ { store_id: { $in: requestData.storeId } }, { aiStoreList: { $in: requestData.storeId } } ] },
+        { date_iso: { $gte: fromDate, $lte: toDate } },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } }, { aiStoreList: { $in: requestData.storeId } } ] },
     );
 
     if ( requestData?.filter === 'all' ) {
@@ -1881,7 +1864,7 @@ export const flagChecklistCardsV1 = async ( req, res ) => {
               { date_iso: { $lte: dayjs.utc( reqestData.toDate ).endOf( 'day' ).toDate() } },
               { sourceCheckList_id: new mongoose.Types.ObjectId( reqestData.sourceCheckList_id ) },
               // { store_id: { $in: reqestData?.storeId } },
-              { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+              { $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
             ],
           },
         },
@@ -2187,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 } } ] },
             ],
           },
         },
@@ -2304,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 } } ],
             },
         },
         {
@@ -2333,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 } } ],
             },
         },
         {
@@ -2380,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' ) {
@@ -2398,7 +2372,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
             //   ],
             // },
             // { store_id: { $in: reqestData?.storeId } },
-            { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
+            { $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: getUserEmails } } ] },
           ],
         },
       };
@@ -2659,12 +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 } }, { aiStoreList: { $in: requestData.storeId } } ] },
         { date_iso: { $gte: fromDate } },
         { date_iso: { $lte: toDate } },
         {