tango-app-api-trax 3.2.1 → 3.3.1-airtalai-0

package/src/controllers/teaxFlag.controller.js

@@ -1,4 +1,4 @@
-import { download, logger } from 'tango-app-api-middleware';
+import { download, logger } from 'tango-app-api-middleware'; // getChecklistUsers
 import { aggregate } from '../services/processedchecklist.services.js';
 import dayjs from 'dayjs';
 import * as processedchecklistService from '../services/processedchecklist.services.js';
@@ -12,6 +12,11 @@ import mongoose from 'mongoose';
 
 export const overallFlagMetrics = async ( req, res ) => {
   try {
+    let requestData = req.body;
+    // Get User Based Checklist //
+    // 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 pipeline = [
       {
         $facet: {
@@ -20,21 +25,10 @@ export const overallFlagMetrics = async ( req, res ) => {
               $match: {
                 $and: [
                   { client_id: req.body.clientId },
-                  {
-                    store_id: {
-                      $in: req.body.stores,
-                    },
-                  },
-                  {
-                    date_iso: {
-                      $gte: new Date( req.body.startDate ),
-                    },
-                  },
-                  {
-                    date_iso: {
-                      $lte: new Date( req.body.endDate ),
-                    },
-                  },
+                  { date_iso: { $gte: new Date( req.body.startDate ) } },
+                  { date_iso: { $lte: new Date( req.body.endDate ) } },
+                  // { store_id: { $in: req.body.stores } },
+                  { $or: [ { store_id: { $in: req.body.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
                 ],
               },
             },
@@ -108,21 +102,10 @@ export const overallFlagMetrics = async ( req, res ) => {
               $match: {
                 $and: [
                   { client_id: req.body.clientId },
-                  {
-                    store_id: {
-                      $in: req.body.stores,
-                    },
-                  },
-                  {
-                    date_iso: {
-                      $gte: dayjs.utc( req.body.endDate ).subtract( 7, 'days' ).startOf( 'day' ).toDate(),
-                    },
-                  },
-                  {
-                    date_iso: {
-                      $lte: dayjs.utc( req.body.startDate ).subtract( 1, 'day' ).startOf( 'day' ).toDate(),
-                    },
-                  },
+                  { date_iso: { $gte: dayjs.utc( req.body.endDate ).subtract( 7, 'days' ).startOf( 'day' ).toDate() } },
+                  { date_iso: { $lte: dayjs.utc( req.body.startDate ).subtract( 1, 'day' ).startOf( 'day' ).toDate() } },
+                  // { store_id: { $in: req.body.stores } },
+                  { $or: [ { store_id: { $in: req.body.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
                 ],
               },
             },
@@ -271,34 +254,26 @@ export const overallFlagMetrics = async ( req, res ) => {
 
 export const checklistFlagsTable = async ( req, res ) => {
   try {
+    let requestData = req.body;
+    // Get User Based Checklist //
+    // 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 matchStage = {
       $match: {
         $and: [
           { client_id: req.body.clientId },
-          {
-            store_id: {
-              $in: req.body.stores,
-            },
-          },
-          {
-            date_iso: {
-              $gte: new Date( req.body.startDate ),
-            },
-          },
-          {
-            date_iso: {
-              $lte: new Date( req.body.endDate ),
-            },
-          },
-          {
-            $or: [
-              { timeFlag: { $gt: 0 } },
-              { questionFlag: { $gt: 0 } },
-              { mobileDetectionFlag: { $gt: 0 } },
-              { storeOpenCloseFlag: { $gt: 0 } },
-              { uniformDetectionFlag: { $gt: 0 } },
-            ],
-          },
+          { date_iso: { $gte: new Date( req.body.startDate ) } },
+          { date_iso: { $lte: new Date( req.body.endDate ) } },
+          { $or: [
+            { timeFlag: { $gt: 0 } },
+            { questionFlag: { $gt: 0 } },
+            { mobileDetectionFlag: { $gt: 0 } },
+            { storeOpenCloseFlag: { $gt: 0 } },
+            { uniformDetectionFlag: { $gt: 0 } },
+          ] },
+          // { store_id: { $in: req.body.stores } },
+          { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
         ],
       },
     };
@@ -560,12 +535,18 @@ export const flagCardsV1 = async ( req, res ) => {
       detectionFlag: { count: 0 },
     };
 
+    let requestData = req.body;
+    // Get User Based Checklist //
+    // 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,
-          store_id: { $in: storeId },
+          // $or: [ { store_id: { $in: storeId } }, { aiStoreList: { $in: storeId } } ],
           date_iso: { $gte: adjustedFromDate, $lte: adjustedToDate },
+          $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: storeId } } ],
         },
       },
       {
@@ -613,7 +594,7 @@ export const flagCardsV1 = async ( req, res ) => {
         {
           client_id: clientId,
           publish: true,
-          checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] },
+          checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] },
         },
         { checkListType: 1 },
     );
@@ -634,7 +615,7 @@ export const flagCardsV1 = async ( req, res ) => {
           flagCards.detectionFlag.count += resultData[item];
         }
       } );
-      flagCards.totalFlag = flagCards.detectionFlag.count;
+      flagCards.totalFlag += flagCards.detectionFlag.count;
     }
 
     return res.sendSuccess( { flagCards } );
@@ -696,8 +677,16 @@ export const flagComparisonCardsV1 = async ( req, res ) => {
       rangeTwoToDate.setUTCHours( 23, 59, 59, 59 );
     }
 
+    // Get User Based Checklist //
+    // 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 createFindQuery = ( fromDate, toDate ) => [
-      { $match: { client_id: requestData.clientId, store_id: { $in: requestData.storeId }, date_iso: { $gte: fromDate, $lte: toDate } } },
+      { $match: { client_id: requestData.clientId,
+        // $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: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ],
+      } },
       {
         $project: {
           timeFlag: 1,
@@ -721,12 +710,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 };
     };
 
@@ -738,19 +723,16 @@ 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(
           {
             client_id: requestData.clientId,
             publish: true,
-            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] },
+            checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] },
           },
           { checkListType: 1 },
       );
@@ -760,9 +742,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 ) => {
@@ -813,17 +793,23 @@ export const flagTablesV1 = async ( req, res ) => {
     toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
 
+    // Get User Based Checklist //
+    // 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////
+
     let findQuery = [];
     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 } }, { aiStoreList: { $in: requestData.storeId } } ] },
+        { date_iso: { $gte: fromDate, $lte: toDate } },
+        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
     );
 
     if ( requestData?.filter === 'all' ) {
-      findAndQuery.push( { $or: [ { questionFlag: { $gte: 1 } }, { timeFlag: { $gte: 1 } }, { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } } ] } );
+      // findAndQuery.push( { $or: [ { questionFlag: { $gte: 1 } }, { timeFlag: { $gte: 1 } }, { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } } ] } );
+      findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] } } ] } );
     } else if ( requestData?.filter === 'question' ) {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { questionFlag: { $gte: 1 } } );
@@ -831,7 +817,7 @@ export const flagTablesV1 = async ( req, res ) => {
       findAndQuery.push( { checkListType: 'custom' } );
       findAndQuery.push( { timeFlag: { $gte: 1 } } );
     } else if ( requestData?.filter === 'detection' ) {
-      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } } );
+      findAndQuery.push( { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] } } );
     }
 
     findQuery.push( { $match: { $and: findAndQuery } } );
@@ -845,6 +831,7 @@ export const flagTablesV1 = async ( req, res ) => {
         sourceCheckList_id: 1,
         checkListId: 1,
         checkListName: 1,
+        coverage: 1,
         storeCount: 1,
         createdBy: 1,
         createdByName: 1,
@@ -867,29 +854,47 @@ export const flagTablesV1 = async ( req, res ) => {
         _id: '$sourceCheckList_id',
         checkListName: { $last: '$checkListName' },
         checkListChar: { $last: { $substr: [ '$checkListName', 0, 2 ] } },
+        coverage: { $last: '$coverage' },
         sourceCheckList_id: { $last: '$sourceCheckList_id' },
         checkListType: { $last: '$checkListType' },
         storeCount: { $sum: 1 },
         storeCountAi: { $max: '$storeCount' },
-        flaggedStores: {
-          $addToSet: {
-            $cond: [
-              {
-                $or: [
-                  { $gt: [ '$timeFlag', 0 ] },
-                  { $gt: [ '$questionFlag', 0 ] },
-                  { $gt: [ '$mobileDetectionFlag', 0 ] },
-                  { $gt: [ '$storeOpenCloseFlag', 0 ] },
-                  { $gt: [ '$uniformDetectionFlag', 0 ] },
-                  { $gt: [ '$customerUnattended', 0 ] },
-                  { $gt: [ '$staffLeftInTheMiddle', 0 ] },
-                ],
-              },
-              '$store_id',
-              '$$REMOVE',
+        // flaggedStores: {
+        //   $addToSet: {
+        //     $cond: [
+        //       {
+        //         $or: [
+        //           { $gt: [ '$timeFlag', 0 ] },
+        //           { $gt: [ '$questionFlag', 0 ] },
+        //           { $gt: [ '$mobileDetectionFlag', 0 ] },
+        //           { $gt: [ '$storeOpenCloseFlag', 0 ] },
+        //           { $gt: [ '$uniformDetectionFlag', 0 ] },
+        //           { $gt: [ '$customerUnattended', 0 ] },
+        //           { $gt: [ '$staffLeftInTheMiddle', 0 ] },
+        //         ],
+        //       },
+        //       '$store_id',
+        //       '$$REMOVE',
+        //     ],
+        //   },
+        // },
+        flaggedStores: { $sum: { $cond: [
+          {
+            $or: [
+              { '$gt': [ '$timeFlag', 0 ] },
+              { '$gt': [ '$questionFlag', 0 ] },
+              { '$gt': [ '$mobileDetectionFlag', 0 ] },
+              { '$gt': [ '$storeOpenCloseFlag', 0 ] },
+              { '$gt': [ '$uniformDetectionFlag', 0 ] },
+              { '$gt': [ '$customerUnattended', 0 ] },
+              { '$gt': [ '$staffLeftInTheMiddle', 0 ] },
+              { '$gt': [ '$cleaning', 0 ] },
+              { '$gt': [ '$scrum', 0 ] },
             ],
           },
-        },
+          1,
+          0,
+        ] } },
         flagCount: {
           $sum: {
             $add: [ '$questionFlag', '$timeFlag' ],
@@ -927,6 +932,7 @@ export const flagTablesV1 = async ( req, res ) => {
           // },
         },
         aiStoreList: { $max: '$aiStoreList' },
+        aiStoreListNew: { $sum: { $size: '$aiStoreList' } },
         submittedQuestionCount: {
           $sum: {
             $cond: [
@@ -942,14 +948,16 @@ export const flagTablesV1 = async ( req, res ) => {
     findQuery.push( {
       $project: {
         assignedStores: '$storeCount',
-        assignedStoresAi: '$storeCountAi',
+        assignedStoresAi: '$aiStoreListNew',
         checkListName: 1,
+        coverage: 1,
         checkListChar: 1,
         sourceCheckList_id: 1,
         checkListType: 1,
         flagType: 1,
         uniqueFlaggedStores: 1,
-        flaggedStores: { $size: '$flaggedStores' },
+        // flaggedStores: { $size: '$flaggedStores' },
+        flaggedStores: '$flaggedStores',
         flagCount: 1,
         questionCount: 1,
         correctAnswers: { $subtract: [ '$submittedQuestionCount', '$questionFlag' ] },
@@ -970,6 +978,12 @@ export const flagTablesV1 = async ( req, res ) => {
       $project: {
         checkListName: 1,
         checkListChar: 1,
+        coverage: {
+          $concat: [
+            { $toUpper: { $substr: [ { $ifNull: [ '$coverage', '' ] }, 0, 1 ] } },
+            { $substr: [ { $ifNull: [ '$coverage', '' ] }, 1, { $strLenCP: { $ifNull: [ '$coverage', '' ] } } ] },
+          ],
+        },
         sourceCheckList_id: 1,
         checkListType: 1,
         flagType: 1,
@@ -1831,7 +1845,6 @@ async function checklistDropdownData( checklistType ) {
   }
 }
 
-
 // Lamda Service Call //
 async function LamdaServiceCall( url, data ) {
   try {
@@ -1858,6 +1871,10 @@ async function LamdaServiceCall( url, data ) {
 export const flagChecklistCardsV1 = async ( req, res ) => {
   try {
     let reqestData = req.body;
+    // Get User Based Checklist //
+    // 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' ) {
       const pipeline = [
@@ -1865,10 +1882,11 @@ export const flagChecklistCardsV1 = async ( req, res ) => {
           $match: {
             $and: [
               { client_id: reqestData?.clientId },
-              { store_id: { $in: reqestData?.storeId } },
               { date_iso: { $gte: new Date( reqestData?.fromDate ) } },
               { 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: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: reqestData.userEmailes } } ] },
             ],
           },
         },
@@ -1967,18 +1985,12 @@ export const flagChecklistCardsV1 = async ( req, res ) => {
       const pipeline = [
         {
           $match:
-            {
-              date_iso: {
-                $gte: new Date( reqestData.fromDate ),
-              },
-              date_iso: {
-                $lte: dayjs.utc( reqestData.toDate ).endOf( 'day' ).toDate(),
-              },
-              store_id: {
-                $in: reqestData.storeId,
-              },
+            { date_iso: { $gte: new Date( reqestData.fromDate ) },
+              date_iso: { $lte: dayjs.utc( reqestData.toDate ).endOf( 'day' ).toDate() },
               client_id: reqestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( reqestData.sourceCheckList_id ),
+              // store_id: { $in: reqestData.storeId },
+              $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: reqestData.userEmailes } } ],
             },
         },
         {
@@ -2080,6 +2092,10 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       },
     };
 
+    // Get User Based Checklist //
+    // 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////
 
     if ( requestData.ChecklistType == 'custom' ) {
       const range1pipeline = [
@@ -2087,10 +2103,11 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
           $match: {
             $and: [
               { client_id: requestData?.clientId },
-              { store_id: { $in: requestData?.storeId } },
               { date_iso: { $gte: rangeOneFromDate } },
               { date_iso: { $lte: rangeOneToDate } },
               { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
+              // { store_id: { $in: requestData?.storeId } },
+              { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
             ],
           },
         },
@@ -2168,10 +2185,11 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
           $match: {
             $and: [
               { client_id: requestData?.clientId },
-              { store_id: { $in: requestData?.storeId } },
               { date_iso: { $gte: rangeTwoFromDate } },
               { date_iso: { $lte: rangeTwoToDate } },
               { sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ) },
+              // { store_id: { $in: requestData?.storeId } },
+              { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
             ],
           },
         },
@@ -2280,18 +2298,12 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       const fromPipeline = [
         {
           $match:
-            {
-              date_iso: {
-                $gte: rangeOneFromDate,
-              },
-              date_iso: {
-                $lte: rangeOneToDate,
-              },
-              store_id: {
-                $in: requestData.storeId,
-              },
+            { date_iso: { $gte: rangeOneFromDate },
+              date_iso: { $lte: rangeOneToDate },
               client_id: requestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
+              // store_id: { $in: requestData.storeId },
+              $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
             },
         },
         {
@@ -2312,18 +2324,12 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
       const toPipeline = [
         {
           $match:
-            {
-              date_iso: {
-                $gte: rangeTwoFromDate,
-              },
-              date_iso: {
-                $lte: rangeTwoToDate,
-              },
-              store_id: {
-                $in: requestData.storeId,
-              },
+            { date_iso: { $gte: rangeTwoFromDate },
+              date_iso: { $lte: rangeTwoToDate },
               client_id: requestData.clientId,
               sourceCheckList_id: new mongoose.Types.ObjectId( requestData.sourceCheckList_id ),
+              // store_id: { $in: requestData.storeId },
+              $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
             },
         },
         {
@@ -2366,12 +2372,15 @@ export const flagChecklistComparisonCardsV1 = async ( req, res ) => {
 export const flagChecklistTableV1 = async ( req, res ) => {
   try {
     let reqestData = req.body;
+    // Get User Based Checklist //
+    // 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' ) {
       const match = {
         $match: {
           $and: [
             { client_id: reqestData?.clientId },
-            { store_id: { $in: reqestData?.storeId } },
             { date_iso: { $gte: new Date( reqestData?.fromDate ) } },
             { date_iso: { $lte: dayjs.utc( reqestData.toDate ).endOf( 'day' ).toDate() } },
             { sourceCheckList_id: new mongoose.Types.ObjectId( reqestData.sourceCheckList_id ) },
@@ -2381,6 +2390,8 @@ export const flagChecklistTableV1 = async ( req, res ) => {
             //     { questionFlag: { $gt: 0 } },
             //   ],
             // },
+            // { store_id: { $in: reqestData?.storeId } },
+            { $or: [ { store_id: { $in: reqestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: reqestData.userEmailes } } ] },
           ],
         },
       };
@@ -2402,6 +2413,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
             checklistStatus: 1,
             questionFlagCount: '$questionFlag',
             timeFlagCount: '$timeFlag',
+            userName: '$userName',
             reinitiateStatus: true,
             // detections: {
             //   $sum: {
@@ -2427,7 +2439,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
       ];
 
       if ( reqestData.search && reqestData.search != '' ) {
-        pipeline[0].$match.$and.push( { storeName: { $regex: reqestData.search, $options: 'i' } } );
+        pipeline[0].$match.$and.push( { $or: [ { storeName: { $regex: reqestData.search, $options: 'i' } }, { userName: { $regex: reqestData.search, $options: 'i' } }, { userEmail: { $regex: reqestData.search, $options: 'i' } } ] } );
       }
 
       const total = await processedchecklistService.aggregate( pipeline );
@@ -2480,6 +2492,10 @@ export const flagChecklistTableV1 = async ( req, res ) => {
         if ( resultData ) {
           if ( resultData.status_code == '200' ) {
             const exportdata = [];
+            console.log( resultData );
+            if ( reqestData.ChecklistType==='scrum'||reqestData.ChecklistType==='cleaning' ) {
+              reqestData.ChecklistType = 'scrumdetection';
+            }
             resultData[reqestData.ChecklistType + 'Data'].forEach( ( element ) => {
               exportdata.push( {
                 'Date': element?.date,
@@ -2497,6 +2513,7 @@ export const flagChecklistTableV1 = async ( req, res ) => {
           return res.sendError( 'No Content', 204 );
         }
       }
+      console.log( reqestData );
 
       let LamdaURL = 'https://vpcejaftccr3jzqf5wrdkks7yy0krqix.lambda-url.ap-south-1.on.aws/';
       let resultData = await LamdaServiceCall( LamdaURL, reqestData );
@@ -2633,22 +2650,22 @@ export const checklistDropdownV1 = async ( req, res ) => {
     toDate.setUTCHours( 23, 59, 59, 59 );
     let result = {};
 
+    // Get User Based Checklist //
+    // 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////
+
     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: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
         { date_iso: { $gte: fromDate } },
         { date_iso: { $lte: toDate } },
         {
           $or: [
             { questionFlag: { $gte: 1 } },
             { timeFlag: { $gte: 1 } },
-            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection' ] } },
+            { checkListType: { $in: [ 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum' ] } },
           ],
         },
       ] } },
@@ -2656,12 +2673,14 @@ export const checklistDropdownV1 = async ( req, res ) => {
         $project: {
           sourceCheckList_id: 1,
           checkListName: 1,
+          coverage: 1,
         },
       },
       {
         $group: {
           _id: '$sourceCheckList_id',
           checkListName: { $last: '$checkListName' },
+          coverage: { $last: '$coverage' },
         },
       },
       {
@@ -2669,6 +2688,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           _id: 0,
           sourceCheckList_id: '$_id',
           checkListName: 1,
+          coverage: 1,
         },
       },
       {
@@ -2697,7 +2717,6 @@ export const checklistDropdownV1 = async ( req, res ) => {
                 scheduleRepeatedType: 1,
                 scheduleStartTime: 1,
                 sourceCheckList_id: '$_id',
-                storeCount: 1,
               },
             },
           ], as: 'checklistData',
@@ -2716,7 +2735,7 @@ export const checklistDropdownV1 = async ( req, res ) => {
           scheduleRepeatedType: '$checklistData.scheduleRepeatedType',
           scheduleStartTime: '$checklistData.scheduleStartTime',
           sourceCheckList_id: '$checklistData._id',
-          storeCount: '$checklistData.storeCount',
+          coverage: 1,
         },
       },
     ];