tango-app-api-infra 3.8.1-beta.0 → 3.8.1-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.8.1-beta.0",
+    "version": "3.8.1-beta.10",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/footfallDirectory.controllers.js

@@ -1,4 +1,4 @@
-import { download, logger } from 'tango-app-api-middleware';
+import { download, logger, sendMessageToQueue } from 'tango-app-api-middleware';
 import { bulkUpdate, getOpenSearchCount, getOpenSearchData, insertWithId, updateOpenSearchData } from 'tango-app-api-middleware/src/utils/openSearch.js';
 import { findOneStore } from '../services/store.service.js';
 import dayjs from 'dayjs';
@@ -10,11 +10,12 @@ export async function createTicket( req, res ) {
     const getStoreName = await findOneStore( { storeId: inputData.storeId }, { storeName: 1, _id: 0 } );
     inputData.ticketId = 'TE_FDT_' + new Date().valueOf();
     inputData.clientId = inputData?.storeId?.split( '-' )[0];
-    inputData.storeName =getStoreName?.storeName;
+    inputData.storeName = getStoreName?.storeName;
     inputData.createdAt = new Date();
     inputData.updatedAt = new Date();
-    inputData.userName = req.user.userName;
-    inputData.role = req.user.role;
+    inputData.userName = req?.user?.userName;
+    inputData.email = req?.user?.email;
+    inputData.role = req?.user?.role;
     inputData.status = 'open';
     if ( inputData.houseKeepingCount > 0 ) {
       inputData.houseKeepingStatus = 'pending';
@@ -67,12 +68,19 @@ async function bulkUpdateStatusToPending( indexName, inputData ) {
 
   // 3. Duplicate Images > data[]
   if ( inputData.duplicateCount > 0 ) {
+    let updatedDuplicateImages = [];
     for ( const dup of inputData.duplicateImages || [] ) {
       const id = `${inputData.storeId}_${inputData.dateString}_${dup.timeRange}_${dup.tempId}`;
-      const updatedDuplicateImages = ( dup.data || [] ).map( ( item ) => ( {
-        ...item,
-        status: 'pending',
-      } ) );
+      dup?.data?.map( ( item ) => {
+        updatedDuplicateImages.push( {
+          ...item,
+          status: 'pending',
+        } );
+        bulkBody.push(
+            { update: { _index: indexName, _id: `${inputData.storeId}_${inputData.dateString}_${item.timeRange}_${item.tempId}` } },
+            { doc: { status: 'pending' } },
+        );
+      } );
       bulkBody.push(
           { update: { _index: indexName, _id: id } },
           { doc: { status: 'pending', duplicateImage: updatedDuplicateImages } },
@@ -174,120 +182,201 @@ export async function ticketSummary( req, res ) {
 
 export async function ticketList( req, res ) {
   try {
-    // let count = 0;
-    // const array =[
-    //   { A: '3c88e8eb6d499a26d37ca075c390bd2d', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/101' },
-    //   { A: 'c3dd981f485ccd25221c7da704f35d24', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/101' },
-    //   { A: 'ee887e5546ab0e96ca0adbf8c2453c8d', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/1001' },
-    //   { A: 'a59ddeb30d158602d6c672994af2f79a', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/1001' },
-    //   { A: '1f3318280025f5456262b0322b806940', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/201' },
-    //   { A: '925a70751a0988793057148b20158186', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/201',
-    //   }, { A: 'd6d4ab301c322212fb612a7d9661b6be', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/301',
-    //   }, { A: 'cb09aeedfa5ade043922634eb1c35e46', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/301',
-    //   }, { A: '58f81e33f66ef7af15424c1dc44e7de1', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/401',
-    //   }, { A: '7ac8f73f02347d29f6f2bff3c52275f5', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/401',
-    //   }, { A: '9599acd19a48eb28957ad18e40a0a5b1', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/401',
-    //   }, { A: '36584a3ce215a5fbd1c0e6535201020c', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/501',
-    //   }, { A: 'cb7e91870e0a72d4eb691e2618aa5979', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/501',
-    //   }, { A: 'cd072627e6924df745cba004616ec3c9', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/601',
-    //   }, { A: 'a5891519a50f68a9d73a774539fe8496', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/601',
-    //   }, { A: '2008517125b03b1b9a66348e6d017523', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/701',
-    //   }, { A: '79fc93551b59f9ed07eab48d190ba7f4', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/701',
-    //   }, { A: '89365abcfc8dc663b26471d81a7f68eb', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/801',
-    //   }, { A: 'e9fb3b989a245994bd48b97287aad096', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/801',
-    //   }, { A: '4493fb6dc07611bab03630b154ca2483', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/801',
-    //   }, { A: 'e31caf56bb86f6e12377db006ac61756', B: 'rtsp://admin:Bli$$%40145@192.168.29.86/streaming/channels/901',
-    //   }, { A: 'fe66c637bc8da296485494e371f67b99', B: 'rtsp://admin:Bli$$%40145@192.168.29.58/streaming/channels/901' },
-    // ];
-
-    // for ( const item of array ) {
-    //   const a = await updateOneCamera( { streamName: item.A, clientId: '370' }, { RTSP: item.B } );
-    //   count++;
-    //   logger.info( { aaa: a, count: count } );
-    // }
-
-    // process.exit();
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
     const limit = inputData.limit || 10;
-    const skip= inputData.offset == 0? 0:( inputData.offset - 1 ) *limit || 0;
+    const offset = inputData.offset == 0 ? 0 : ( inputData.offset - 1 ) * limit || 0;
+    const order = inputData?.sortOrder || -1;
+
     inputData.clientId = inputData.clientId.split( ',' ); // convert strig to array
-    logger.info( { inputData: inputData, limit: limit, skip: skip } );
-    const getCount= {
-      query: {
-        bool: {
-          filter: [
-            { terms: { 'clientId.keyword': Array.isArray( inputData.clientId ) ?
-              inputData.clientId :
-              inputData.clientId } },
-            {
-              range: {
-                dateString: {
-                  gte: inputData.fromDate,
-                  lte: inputData.toDate,
-                  format: 'yyyy-MM-dd',
-                },
-              },
-            },
-          ],
+
+
+    let filter = [
+      {
+        'range': {
+          'dateString': {
+            'gte': inputData.fromDate,
+            'lte': inputData.toDate,
+            'format': 'yyyy-MM-dd',
+          },
         },
       },
-    };
+      {
+        terms: {
+          'clientId.keyword': Array.isArray( inputData.clientId ) ?
+            inputData.clientId :
+           [ inputData.clientId ],
+        },
+      },
+    ];
 
-    const geteDataCount = await getOpenSearchCount( openSearch.footfallDirectory, getCount );
-    if ( !geteDataCount || geteDataCount?.body?.count == 0 ) {
-      return res.sendError( 'No data found', 204 );
+    if ( inputData?.storeId ) {
+      filter.push(
+          {
+            terms: {
+              'storeId.keyword': Array.isArray( inputData.storeId ) ?
+              inputData.storeId :
+              [ inputData.storeId ],
+            },
+          },
+      );
     }
-    const getQuery = {
-      size: limit,
-      from: skip,
-      query: {
-        bool: {
-          filter: [
-            { terms: { 'clientId.keyword': Array.isArray( inputData.clientId ) ?
-              inputData.clientId :
-              inputData.clientId } },
-            {
-              range: {
-                dateString: {
-                  gte: inputData.fromDate,
-                  lte: inputData.toDate,
-                  format: 'yyyy-MM-dd',
-                },
+
+    let search = {
+      'must': filter,
+    };
+
+    if ( inputData.searchValue && inputData.searchValue !== '' ) {
+      search = {
+        'must': filter,
+        'should': [
+          {
+            'wildcard': {
+              'storeName.keyword': {
+                'value': `*${inputData.searchValue}*`,
               },
             },
-          ],
-        },
+          },
+          {
+            'wildcard': {
+              'storeId.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'ticketId.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+          {
+            'wildcard': {
+              'status.keyword': {
+                'value': `*${inputData.searchValue}*`,
+              },
+            },
+          },
+
+        ],
+        'minimum_should_match': 1,
+      };
+    }
+
+    let searchQuery = {
+      '_source': [
+        'storeName',
+        'storeId',
+        'ticketId',
+        'createdAt',
+        'updatedAt',
+        'footfallCount',
+        'duplicateCount',
+        'employeeCount',
+        'houseKeepingCount',
+        'status',
+        'dateString',
+      ],
+      'from': offset,
+      'size': limit,
+      'query': {
+        'bool': search,
       },
-      _source: [ 'storeName', 'storeId', 'ticketId', 'createdAt', 'footfallCount', 'duplicateCount', 'employeeCount', 'houseKeepingCount', 'status', 'dateString' ],
+      'sort': [
+        { dateString: { order: 'desc' } },
+      ],
     };
 
-    const getData = await getOpenSearchData( openSearch.footfallDirectory, getQuery );
-    const response = getData?.body?.hits?.hits;
-    logger.info( { response: response, body: getData?.body, getData: getData, geteDataCount: geteDataCount } );
+    if ( inputData.sortBy && inputData.sortBy !== '' ) {
+      let sortByValue = '';
 
+      if ( [ 'storeName', 'storeId', 'ticketId', 'status' ].includes( inputData?.sortBy ) ) {
+        sortByValue = `${inputData.sortBy}.keyword`;
+      } else {
+        sortByValue = inputData.sortBy;
+      }
 
-    if ( inputData.isExport=== true ) {
-      const temp = [];
-      for ( const item of response ) {
-        temp.push( {
-          'Store Name': item.storeName,
-          'Store ID': item.storeId,
-          'Ticket ID': item.ticketId,
-          'Ticket raised on': dayjs( item.createdAt ).format( 'dd MMM, yyyy' ),
-          'Total Footfalls': item.footfallCount,
-          'Duplicates': item.duplicateCount,
-          'Employee/Staff': item.employeeCount,
-          'HouseKeeping': item.houseKeepingCount,
-          'Revised Footfalls': item.footfallCount-( item.duplicateCount+item.employeeCount+item.houseKeepingCount ),
-          'Status': item.status,
+
+      searchQuery = {
+        '_source': [
+          'storeName',
+          'storeId',
+          'ticketId',
+          'createdAt',
+          'updatedAt',
+          'footfallCount',
+          'duplicateCount',
+          'employeeCount',
+          'houseKeepingCount',
+          'status',
+          'dateString',
+        ],
+        'from': offset,
+        'size': limit,
+        'query': {
+          'bool': search,
+        },
+        'sort': [
+          { [sortByValue]: { order: order === -1 ? 'desc' : 'asc' } },
+        ],
+      };
+    }
+
+    if ( inputData.isExport == true ) {
+      searchQuery = {
+        '_source': [
+          'storeName',
+          'storeId',
+          'ticketId',
+          'createdAt',
+          'updatedAt',
+          'footfallCount',
+          'duplicateCount',
+          'employeeCount',
+          'houseKeepingCount',
+          'status',
+          'dateString',
+        ],
+        'from': 0,
+        'size': 10000,
+        'query': {
+          'bool': search,
+        },
+        'sort': [
+          { 'storeName.keyword': { order: 'desc' } },
+        ],
+      };
+    }
+    const getData = await getOpenSearchData( openSearch.footfallDirectory, searchQuery );
+    const count = getData?.body?.hits?.total?.value;
+    if ( !count || count == 0 ) {
+      return res.sendError( 'No data found', 204 );
+    }
+    const searchValue = getData?.body?.hits?.hits;
+    if ( !searchValue || searchValue?.length == 0 ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
+    if ( inputData.isExport == true ) {
+      const exportData = [];
+      for ( const item of searchValue ) {
+        exportData.push( {
+          'Store Name': item._source.storeName || '--',
+          'Store ID': item._source.storeId,
+          'Ticket ID': item._source.ticketId,
+          'Ticket raised on': dayjs( item._source.createdAt ).format( 'DD MMM, YYYY' ),
+          'Total Footfalls': item._source.footfallCount,
+          'Duplicates': item._source.duplicateCount,
+          'Employee/Staff': item._source.employeeCount,
+          'HouseKeeping': item._source.houseKeepingCount,
+          'Revised Footfalls': item._source.footfallCount - ( item._source.duplicateCount + item._source.employeeCount + item._source.houseKeepingCount ),
+          'Status': item._source.status,
         } );
       }
-      await download( temp, res );
-      return;
+      return await download( exportData, res );
     }
-
-    return res.sendSuccess( { result: response, count: geteDataCount?.body?.count } );
+    return res.sendSuccess( { result: searchValue, count: count } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: error, messgage: req.query } );
@@ -299,65 +388,161 @@ export async function getTickets( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    const limit = inputData.limit || 10;
-    const skip= inputData.offset == 0? 0:( inputData.offset - 1 ) *limit || 0;
+    const limit = inputData.limit;
+    const skip = inputData.offset == 0 ? 0 : ( inputData.offset - 1 ) * limit || 0;
     inputData.storeId = inputData.storeId.split( ',' ); // convert strig to array
     logger.info( { inputData: inputData, limit: limit, skip: skip } );
-    const getCount= {
-      query: {
+    let source = [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'houseKeepingCount', 'duplicateCount', 'comments', 'employee', 'houseKeeping', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ];
+    let filter = [
+      {
+        terms: {
+          'storeId.keyword': Array.isArray( inputData.storeId ) ?
+            inputData.storeId :
+            inputData.storeId,
+        },
+      },
+      {
+        range: {
+          dateString: {
+            gte: inputData.fromDate,
+            lte: inputData.toDate,
+            format: 'yyyy-MM-dd',
+          },
+        },
+      },
+    ];
+    if ( inputData.status ) {
+      filter.push(
+          {
+            term: {
+              'status.keyword': inputData.status,
+            },
+          },
+      );
+    }
+    if (
+      inputData.revopsType
+    ) {
+      filter.push( {
+        exists: {
+          field: inputData.revopsType,
+        },
+      } );
+      inputData.revopsType === 'employee' ?
+        filter.push( {
+          range: {
+            employeeCount: {
+              gt: 0,
+            },
+          },
+        } ) :
+        inputData.revopsType === 'housekeeping' ?
+          filter.push( {
+            range: {
+              housekeepingCount: {
+                gt: 0,
+              },
+            },
+          } ) :
+          filter.push( {
+            range: {
+              duplicateCount: {
+                gt: 0,
+              },
+            },
+          } );
+      source = inputData.revopsType == 'employee' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'employeeCount', 'comments', 'employee', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] :
+        inputData.revopsType == 'houseKeeping' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'houseKeepingCount', 'comments', 'houseKeeping', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] :
+          inputData.revopsType == 'duplicateImages' ? [ 'storeId', 'dateString', 'ticketName', 'footfallCount', 'duplicateCount', 'comments', 'duplicateImages', 'ticketId', 'clientId', 'storeName', 'createdAt', 'updatedAt', 'userName', 'role', 'status', 'employeeStatus', 'houseKeepingStatus', 'duplicateStatus' ] : [];
+    }
+
+    if ( inputData.action ) {
+      filter.push( {
         bool: {
-          filter: [
-            { terms: { 'storeId.keyword': Array.isArray( inputData.storeId ) ?
-              inputData.storeId :
-              inputData.storeId } },
+          should: [
             {
-              range: {
-                dateString: {
-                  gte: inputData.fromDate,
-                  lte: inputData.toDate,
-                  format: 'yyyy-MM-dd',
-                },
+              term: {
+                'houseKeepingStatus.keyword': inputData.action,
+              },
+            },
+            {
+              term: {
+                'employeeStatus.keyword': inputData.action,
+              },
+            },
+            {
+              term: {
+                'duplicateStatus.keyword': inputData.action,
               },
             },
           ],
+          minimum_should_match: 1, // Ensures at least one should condition must match
+        },
+      } );
+    }
+    let getRevCount = {};
+    if ( inputData.revopsType ) {
+      getRevCount = {
+        size: 0,
+        query: {
+          bool: {
+            filter: filter,
+          },
+        },
+        aggs: {
+          totalCount: {
+            sum: {
+              field: inputData.revopsType == 'employee' ? 'employeeCount' : inputData.revopsType == 'houseKeeping' ? 'houseKeepingCount' : 'duplicateCount',
+            },
+          },
+        },
+      };
+    }
+    const getCount = {
+      query: {
+        bool: {
+          filter: filter,
         },
       },
     };
 
+
     const geteDataCount = await getOpenSearchCount( openSearch.footfallDirectory, getCount );
-    if ( !geteDataCount || geteDataCount?.body?.count == 0 ) {
+    const geteRevDataCount = inputData?.revopsType ? await getOpenSearchData( openSearch.footfallDirectory, getRevCount ) : null;
+    const revCount = inputData?.revopsType ? geteRevDataCount?.body?.aggregations?.totalCount?.value : 0;
+    const count = geteDataCount?.body?.count;
+    if ( !geteDataCount || count == 0 ) {
       return res.sendError( 'No data found', 204 );
     }
+
     const getQuery = {
       size: limit,
       from: skip,
       query: {
         bool: {
-          filter: [
-            { terms: { 'storeId.keyword': Array.isArray( inputData.storeId ) ?
-              inputData.storeId :
-              inputData.storeId } },
-            {
-              range: {
-                dateString: {
-                  gte: inputData.fromDate,
-                  lte: inputData.toDate,
-                  format: 'yyyy-MM-dd',
-                },
-              },
-            },
-          ],
+          filter: filter,
         },
       },
-      // _source: [ 'storeName', 'storeId', 'ticketId', 'createdAt', 'footfallCount', 'duplicateCount', 'employeeCount', 'houseKeepingCount', 'status', 'dateString' ],
+      _source: source,
     };
 
     const getData = await getOpenSearchData( openSearch.footfallDirectory, getQuery );
     const response = getData?.body?.hits?.hits;
+    // let temp=[ response[0] ];
+    // logger.info( { temp: temp, response: response } );
+    // if ( inputData.revopsType ) {
+    //   const key =inputData.revopsType == 'employee'? 'employeeCount':inputData.revopsType == 'houseKeeping'?'houseKeepingCount': 'duplicateCount';
+
+    //   const type = inputData.revopsType;
+    //   temp[0]._source[key] = revCount;
+    //   for ( const doc of response.slice( 1 ) ) {
+    //    inputData.revopsType == 'duplicateImages'? temp[0]._source[type].push( ...doc._source[type] ):temp[0]._source[type].push( doc._source[type] );
+    //   }
+    // }
     logger.info( { response: response, body: getData?.body, getData: getData, geteDataCount: geteDataCount } );
 
 
-    if ( inputData.isExport=== true ) {
+    if ( inputData.isExport === true ) {
       const temp = [];
       for ( const item of response ) {
         temp.push( {
@@ -369,7 +554,7 @@ export async function getTickets( req, res ) {
           'Duplicates': item.duplicateCount,
           'Employee/Staff': item.employeeCount,
           'HouseKeeping': item.houseKeepingCount,
-          'Revised Footfalls': item.footfallCount-( item.duplicateCount+item.employeeCount+item.houseKeepingCount ),
+          'Revised Footfalls': item.footfallCount - ( item.duplicateCount + item.employeeCount + item.houseKeepingCount ),
           'Status': item.status,
         } );
       }
@@ -377,7 +562,7 @@ export async function getTickets( req, res ) {
       return;
     }
 
-    return res.sendSuccess( { result: response, count: geteDataCount?.body?.count } );
+    return res.sendSuccess( { result: inputData.revopsType ? response : response, count: count, revopCount: revCount } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: error, messgage: req.query } );
@@ -387,45 +572,187 @@ export async function getTickets( req, res ) {
 
 export async function updateStatus( req, res ) {
   try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
-    const id = req.query._id;
-    const splitId = id.split( '_' );
-    const storeId = splitId[0];
-    const dateString = splitId[1];
-    if ( inputData.duplicateStatus === 'approved' && inputData.employeeStatus === 'approved' && inputData.houseKeepingStatus === 'approved' ) {
-      inputData.status = 'closed';
+    let temp = [];
+    for ( let data of inputData?.data ) {
+      await updateTicketStatus( data, openSearch, temp );
     }
-    await updateOpenSearchData( openSearch.footfallDirectory, id, { _doc: inputData } );
-    let bulkBody = [];
-    for ( let duplicate of inputData.duplicateImages ) {
-      bulkBody.push(
-          { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${duplicate.timeRange}_${duplicate.tempId}` } },
-          { doc: { duplicateImage: duplicate.duplicateImage } },
-      );
-      duplicate.map( ( item ) => {
+
+    if ( temp.length == inputData?.data?.length ) {
+      return res.sendSuccess( 'Ticket has been updated successfully' );
+    }
+  } catch ( error ) {
+    const err = error.messgae || 'Internal Server Error';
+    logger.error( { error: error, data: req.body, function: 'infra-footfallDirectory-updateStatus' } );
+    return res.sendError( err, 500 );
+  }
+}
+export async function updateTicketStatus( data, openSearch, temp ) {
+  const id = data._id;
+  const splitId = id.split( '_' );
+  const storeId = splitId[0];
+  const dateString = splitId[1];
+  if ( data.duplicateStatus !== 'pending' && data.employeeStatus !== 'pending' && data.houseKeepingStatus !== 'pending' ) {
+    data.status = 'closed';
+  }
+  let tempId = [];
+  const { _id, ...updateData } = data;
+  await updateOpenSearchData( openSearch.footfallDirectory, _id, { doc: updateData } );
+  let bulkBody = [];
+  for ( let duplicate of data.duplicateImages ) {
+    bulkBody.push(
+        { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${duplicate.timeRange}_${duplicate.tempId}` } },
+        { doc: { duplicateImage: duplicate.duplicateImage } },
+    );
+    duplicate?.data?.map( ( item ) => {
+        item.isChecked == true ? tempId.push( item.tempId ) : null;
         bulkBody.push(
             { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${item.timeRange}_${item.tempId}` } },
             { doc: { isChecked: item.isChecked } },
         );
-      } );
-    }
-    for ( let employee of inputData.employee ) {
+    } );
+  }
+  for ( let employee of data.employee ) {
+      employee.isChecked == true ? tempId.push( employee.tempId ) : null;
       bulkBody.push(
           { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${employee.timeRange}_${employee.tempId}` } },
           { doc: { isChecked: employee.isChecked } },
       );
-    }
-    for ( let houseKeeping of inputData.houseKeeping ) {
+  }
+  for ( let houseKeeping of data.houseKeeping ) {
+      houseKeeping.isChecked == true ? tempId.push( houseKeeping.tempId ) : null;
       bulkBody.push(
           { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${houseKeeping.timeRange}_${houseKeeping.tempId}` } },
           { doc: { isChecked: houseKeeping.isChecked } },
       );
+  }
+  temp.push( storeId );
+  // if ( inputData.status == 'closed' ) {
+  // const isSendMessge = await sendSqsMessage( inputData, tempId );
+  //   if ( isSendMessge ==true ) {
+  //     return res.sendSuccess( 'Ticket has been updated successfully' );
+  //   } else {
+  //     return res.sendError( 'No SQS message sent', 500 );
+  //   }
+  // }
+  // if ( data.status == 'closed' ) {
+  //   await sendSqsMessage( data, tempId );
+  // }
+}
+
+export async function sendSqsMessage( inputData, tempId ) {
+  const sqs = JSON.parse( process.env.sqs );
+  const sqsProduceQueue = {
+    QueueUrl: `${sqs.url}${sqs.revopticket}`,
+    MessageBody: JSON.stringify( {
+      store_id: inputData.storeId,
+      store_date: inputData.dateString.split( '-' ).reverse().join( '-' ),
+      bucket_name: '',
+      zone_id: 'traffic_zone',
+      process_type: 'reduction',
+      revop_type: 'footfall',
+      temp_id: tempId,
+    } ),
+  };
+
+  const sqsQueue = await sendMessageToQueue(
+      sqsProduceQueue.QueueUrl,
+      sqsProduceQueue.MessageBody,
+  );
+
+  if ( sqsQueue.statusCode ) {
+    logger.error( {
+      error: `${sqsQueue}`,
+      type: 'UPLOAD_ERROR',
+    } );
+    return res.sendError( 'SQS not sent', 500 );
+  }
+}
+
+export async function getTaggedStores( req, res ) {
+  try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const inputData = req.query;
+    logger.info( { inputData: inputData } );
+    let filter = [
+      {
+        term: { 'clientId.keyword': inputData.clientId },
+      },
+      {
+        range: {
+          dateString: {
+            gte: inputData.fromDate,
+            lte: inputData.toDate,
+            format: 'yyyy-MM-dd',
+          },
+        },
+      },
+
+      {
+        exists: {
+          field: 'storeId',
+        },
+      },
+      {
+        exists: {
+          field: 'storeName',
+        },
+      },
+    ];
+
+    if ( inputData.searchValue && inputData.searchValue !== '' ) {
+      filter.push( {
+        regexp: {
+          'storeName': {
+            value: `.*${inputData.searchValue.toLowerCase()}.*`,
+            flags: 'ALL',
+          },
+        },
+      } );
     }
-    return res.sendSuccess( 'ticket closed successfully' );
+    const getCount = {
+      size: 0,
+      query: {
+        bool: {
+          filter: filter,
+        },
+      },
+      aggs: {
+        unique_stores: {
+          composite: {
+            size: 1000,
+            sources: [
+              {
+                storeId: {
+                  terms: { field: 'storeId.keyword' },
+                },
+              },
+              {
+                storeName: {
+                  terms: { field: 'storeName.keyword' },
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+    let temp = [];
+
+    const geteDataCount = await getOpenSearchData( openSearch.footfallDirectory, getCount );
+    if ( !geteDataCount && geteDataCount?.body?.aggregations?.unique_stores?.buckets?.length > 0 ) {
+      return res.sendError( 'No data found', 204 );
+    }
+
+    const response = geteDataCount?.body?.aggregations?.unique_stores?.buckets;
+    logger.info( { response: response } );
+    response?.map( ( item ) => temp.push( { storeId: item.key.storeId, storeName: item.key.storeName } ) );
+    return res.sendSuccess( { result: temp, count: response?.length } );
   } catch ( error ) {
-    const err = error.messgae || 'Internal Server Error';
-    logger.error( { error: error, data: req.body, function: 'infra-footfallDirectory-updateStatus' } );
-    return res.sendError( err, 500 );
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, messgage: req.query } );
+    return res.sendSuccess( err, 500 );
   }
 }
 

package/src/docs/footfallDirectory.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { createTicketSchema, getTicketsSchema, ticketListSchema, ticketSummarySchema, updateStatusQuerySchema, updateStatusSchemea } from '../dtos/footfallDirectory.dtos.js';
+import { createTicketSchema, getTaggedStoresSchema, getTicketsSchema, ticketListSchema, ticketSummarySchema, updateStatusSchemea } from '../dtos/footfallDirectory.dtos.js';
 
 export const footfallDirectoryDocs = {
 
@@ -59,7 +59,6 @@ export const footfallDirectoryDocs = {
       },
     },
   },
-
   '/v3/footfall-directory-tagging/ticket-list': {
     get: {
       tags: [ 'Footfall Directory Ticket' ],
@@ -72,6 +71,12 @@ export const footfallDirectoryDocs = {
           scema: j2s( ticketListSchema ).swagger,
           required: true,
         },
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( ticketListSchema ).swagger,
+          required: false,
+        },
         {
           in: 'query',
           name: 'fromDate',
@@ -86,7 +91,7 @@ export const footfallDirectoryDocs = {
         },
         {
           in: 'query',
-          name: 'searchvalue',
+          name: 'searchValue',
           scema: j2s( ticketListSchema ).swagger,
           required: false,
         },
@@ -108,6 +113,12 @@ export const footfallDirectoryDocs = {
           scema: j2s( ticketListSchema ).swagger,
           required: false,
         },
+        {
+          in: 'query',
+          name: 'sortBy',
+          scema: j2s( ticketListSchema ).swagger,
+          required: false,
+        },
       ],
       responses: {
         200: { description: 'Successful' },
@@ -143,6 +154,36 @@ export const footfallDirectoryDocs = {
           scema: j2s( getTicketsSchema ).swagger,
           required: true,
         },
+        {
+          in: 'query',
+          name: 'revopsType',
+          scema: j2s( getTicketsSchema ).swagger,
+          required: false,
+        },
+        {
+          in: 'query',
+          name: 'status',
+          scema: j2s( getTicketsSchema ).swagger,
+          required: false,
+        },
+        {
+          in: 'query',
+          name: 'action',
+          scema: j2s( getTicketsSchema ).swagger,
+          required: false,
+        },
+        {
+          in: 'query',
+          name: 'limit',
+          scema: j2s( getTicketsSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'offset',
+          scema: j2s( getTicketsSchema ).swagger,
+          required: false,
+        },
       ],
       responses: {
         200: { description: 'Successful' },
@@ -159,14 +200,7 @@ export const footfallDirectoryDocs = {
       tags: [ 'Footfall Directory Ticket' ],
       description: 'approve or reject the ticket status',
       operationId: 'update-status',
-      parameters: [
-        {
-          in: 'query',
-          name: 'storeId',
-          scema: j2s( updateStatusQuerySchema ).swagger,
-          required: true,
-        },
-      ],
+      parameters: [],
       requestBody: {
         content: {
           'application/json': {
@@ -183,4 +217,46 @@ export const footfallDirectoryDocs = {
       },
     },
   },
+
+  '/v3/footfall-directory-tagging/get-tagged-stores': {
+    get: {
+      tags: [ 'Footfall Directory Ticket' ],
+      description: 'To get list of tagged stores',
+      operationId: 'get-tagged-stores',
+      parameters: [
+        {
+          in: 'query',
+          name: 'clientId',
+          scema: j2s( getTaggedStoresSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'fromDate',
+          scema: j2s( getTaggedStoresSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'toDate',
+          scema: j2s( getTaggedStoresSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'searchValue',
+          scema: j2s( getTaggedStoresSchema ).swagger,
+          required: false,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
 };

package/src/dtos/footfallDirectory.dtos.js

@@ -121,10 +121,12 @@ export const ticketSummaryValid = {
 
 export const ticketListSchema = Joi.object().keys( {
   clientId: Joi.string().required(),
+  storeId: Joi.string().optional(),
   searchValue: Joi.string().optional().allow( '' ),
   limit: Joi.number().optional(),
   offset: Joi.number().optional(),
   isExport: Joi.boolean().optional(),
+  sortBy: Joi.string().optional().allow( '' ),
   fromDate: Joi.string()
       .pattern( /^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD format' )
       .required()
@@ -185,7 +187,6 @@ export const ticketListValid = {
 
 export const getTicketsSchema = Joi.object().keys( {
   storeId: Joi.string().required(),
-
   fromDate: Joi.string()
       .pattern( /^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD format' )
       .required()
@@ -221,6 +222,12 @@ export const getTicketsSchema = Joi.object().keys( {
 
         return value;
       } ),
+  status: Joi.string().optional(),
+  action: Joi.string().optional(),
+  revopsType: Joi.string().optional(),
+  limit: Joi.number().required(),
+  offset: Joi.number().optional(),
+
 } ).custom( ( value, helpers ) => {
   const from = dayjs( value.fromDate );
   const to = dayjs( value.toDate );
@@ -244,26 +251,31 @@ export const getTicketsValid = {
   query: getTicketsSchema,
 };
 
-export const updateStatusQuerySchema =Joi.object().keys( {
-
-  _id: Joi.string().required(),
-} );
-
 export const updateStatusSchemea =Joi.object().keys( {
-
-  duplicateACCount: Joi.number().required(),
-  employeeACCount: Joi.number().required(),
-  houseKeepingACCount: Joi.number().required(),
-  comments: Joi.string().optional().allow( '' ),
-  duplicateImages: Joi.array().items(
+  data: Joi.array().items(
       Joi.object( {
-        tempId: Joi.number().required(),
-        filePath: Joi.string().required(),
-        entryTime: Joi.string().required(),
-        exitTime: Joi.string().required(),
-        timeRange: Joi.string().required(),
-        isChecked: Joi.boolean().required(),
-        data: Joi.array().items(
+        _id: Joi.string().required(),
+        dateString: Joi.string().required().custom( ( value, helpers ) => {
+          const inputDate = dayjs( value, 'YYYY-MM-DD', true );
+          const today = dayjs();
+
+          if ( !inputDate.isValid() ) {
+            return helpers.error( 'any.invalid' );
+          }
+
+          const diff = today.diff( inputDate, 'day' );
+
+          if ( diff > 10 ) {
+            return helpers.message( 'Approval is not allowed for a period exceeding 10 days' );
+          }
+
+          return value;
+        } ),
+        duplicateACCount: Joi.number().optional(),
+        employeeACCount: Joi.number().optional(),
+        houseKeepingACCount: Joi.number().optional(),
+        comments: Joi.string().optional().allow( '' ),
+        duplicateImages: Joi.array().items(
             Joi.object( {
               tempId: Joi.number().required(),
               filePath: Joi.string().required(),
@@ -271,33 +283,104 @@ export const updateStatusSchemea =Joi.object().keys( {
               exitTime: Joi.string().required(),
               timeRange: Joi.string().required(),
               isChecked: Joi.boolean().required(),
-            } ),
-        ).optional(),
-      } ) ).optional(),
-
-  houseKeeping: Joi.array().items( Joi.object( {
-    tempId: Joi.number().required(),
-    filePath: Joi.string().required(),
-    entryTime: Joi.string().required(),
-    exitTime: Joi.string().required(),
-    timeRange: Joi.string().required(),
-    isChecked: Joi.boolean().required(),
-  } ) ).optional(),
-  employee: Joi.array().items( Joi.object( {
-    tempId: Joi.number().required(),
-    filePath: Joi.string().required(),
-    entryTime: Joi.string().required(),
-    exitTime: Joi.string().required(),
-    timeRange: Joi.string().required(),
-    isChecked: Joi.boolean().required(),
+              data: Joi.array().items(
+                  Joi.object( {
+                    tempId: Joi.number().required(),
+                    filePath: Joi.string().required(),
+                    entryTime: Joi.string().required(),
+                    exitTime: Joi.string().required(),
+                    timeRange: Joi.string().required(),
+                    isChecked: Joi.boolean().required(),
+                  } ),
+              ).optional(),
+            } ) ).optional(),
+        houseKeeping: Joi.array().items( Joi.object( {
+          tempId: Joi.number().required(),
+          filePath: Joi.string().required(),
+          entryTime: Joi.string().required(),
+          exitTime: Joi.string().required(),
+          timeRange: Joi.string().required(),
+          isChecked: Joi.boolean().required(),
+
+        } ) ).optional(),
+        employee: Joi.array().items( Joi.object( {
+          tempId: Joi.number().required(),
+          filePath: Joi.string().required(),
+          entryTime: Joi.string().required(),
+          exitTime: Joi.string().required(),
+          timeRange: Joi.string().required(),
+          isChecked: Joi.boolean().required(),
+
+        } ) ).optional(),
+        duplicateStatus: Joi.string().required(),
+        employeeStatus: Joi.string().required(),
+        houseKeepingStatus: Joi.string().required(),
+      } ) ).required(),
 
-  } ) ).optional(),
-  duplicateStatus: Joi.string().required(),
-  employeeStatus: Joi.string().required(),
-  houseKeepingStatus: Joi.string().required(),
 } );
 
 export const updateStatusValid = {
-  query: updateStatusQuerySchema,
   body: updateStatusSchemea,
 };
+
+
+export const getTaggedStoresSchema = Joi.object().keys( {
+  clientId: Joi.string().required(),
+  searchValue: Joi.string().optional().allow( '' ),
+  fromDate: Joi.string()
+      .pattern( /^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD format' )
+      .required()
+      .messages( {
+        'string.pattern.name': `'fromDate' must be in the format YYYY-MM-DD (e.g., 2025-07-19).`,
+        'string.empty': `'fromDate' is required.`,
+      } )
+      .custom( ( value, helpers ) => {
+        const from = dayjs( value );
+        if ( !from.isValid() ) {
+          return helpers.error( 'any.invalid', { message: 'Invalid fromDate' } );
+        }
+        return value;
+      } ),
+
+  toDate: Joi.string()
+      .pattern( /^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD format' )
+      .required()
+      .messages( {
+        'string.pattern.name': `'toDate' must be in the format YYYY-MM-DD (e.g., 2025-07-19).`,
+        'string.empty': `'toDate' is required.`,
+      } )
+      .custom( ( value, helpers ) => {
+        const to = dayjs( value );
+        const today = dayjs();
+
+        if ( !to.isValid() ) {
+          return helpers.error( 'any.invalid', { message: 'Invalid toDate' } );
+        }
+        if ( to.isAfter( today, 'day' ) ) {
+          return helpers.error( 'any.invalid', { message: 'toDate cannot be in the future' } );
+        }
+
+        return value;
+      } ),
+} ).custom( ( value, helpers ) => {
+  const from = dayjs( value.fromDate );
+  const to = dayjs( value.toDate );
+
+  if ( !from.isValid() || !to.isValid() ) {
+    return helpers.error( 'any.invalid', { message: 'Invalid dates' } );
+  }
+
+  if ( from.isAfter( to ) ) {
+    return helpers.error( 'any.invalid', { message: 'fromDate cannot be after toDate' } );
+  }
+
+  if ( to.diff( from, 'day' ) > 90 ) {
+    return helpers.error( 'any.invalid', { message: 'Date range cannot exceed 90 days' } );
+  }
+
+  return value;
+} );
+
+export const getTaggedStoresValid = {
+  query: getTaggedStoresSchema,
+};

package/src/routes/footfallDirectory.routes.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import { isExist } from '../validations/footfallDirectory.validation.js';
-import { createTicket, getTickets, ticketList, ticketSummary, updateStatus } from '../controllers/footfallDirectory.controllers.js';
-import { createTicketValid, getTicketsValid, ticketListValid, ticketSummaryValid, updateStatusValid } from '../dtos/footfallDirectory.dtos.js';
+import { createTicket, getTaggedStores, getTickets, ticketList, ticketSummary, updateStatus } from '../controllers/footfallDirectory.controllers.js';
+import { createTicketValid, getTaggedStoresValid, getTicketsValid, ticketListValid, ticketSummaryValid, updateStatusValid } from '../dtos/footfallDirectory.dtos.js';
 import { bulkValidate, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
 
 export const footfallDirectoryRouter = express.Router();
@@ -11,6 +11,7 @@ footfallDirectoryRouter.get( '/ticket-summary', isAllowedSessionHandler, bulkVal
 
 footfallDirectoryRouter.get( '/ticket-list', isAllowedSessionHandler, bulkValidate( ticketListValid ), ticketList );
 footfallDirectoryRouter.get( '/get-tickets', isAllowedSessionHandler, bulkValidate( getTicketsValid ), getTickets );
+footfallDirectoryRouter.get( '/get-tagged-stores', bulkValidate( getTaggedStoresValid ), getTaggedStores );
 
 footfallDirectoryRouter.put( '/update-status', bulkValidate( updateStatusValid ), updateStatus );