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

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -303,23 +303,70 @@ export async function getTickets( req, res ) {
     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: {
-        bool: {
-          filter: [
-            { terms: { 'storeId.keyword': Array.isArray( inputData.storeId ) ?
+
+    let filter =[
+      { terms: { 'storeId.keyword': Array.isArray( inputData.storeId ) ?
               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,
+        },
+      } );
+    }
+
+    if ( inputData.action ) {
+      filter.push( {
+        bool: {
+          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
+        },
+      } );
+    }
+
+    const getCount= {
+      query: {
+        bool: {
+          filter: filter,
         },
       },
     };
@@ -328,28 +375,15 @@ export async function getTickets( req, res ) {
     if ( !geteDataCount || geteDataCount?.body?.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' ],
     };
 
     const getData = await getOpenSearchData( openSearch.footfallDirectory, getQuery );
@@ -429,3 +463,93 @@ export async function updateStatus( req, res ) {
   }
 }
 
+export async function getTaggedStores( 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;
+    inputData.storeId = inputData.storeId.split( ',' ); // convert strig to array
+    logger.info( { inputData: inputData, limit: limit, skip: skip } );
+    const getCount= {
+      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',
+                },
+              },
+            },
+          ],
+        },
+      },
+    };
+
+    const geteDataCount = await getOpenSearchCount( openSearch.footfallDirectory, getCount );
+    if ( !geteDataCount || geteDataCount?.body?.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',
+                },
+              },
+            },
+          ],
+        },
+      },
+      // _source: [ 'storeName', 'storeId', 'ticketId', 'createdAt', 'footfallCount', 'duplicateCount', 'employeeCount', 'houseKeepingCount', 'status', 'dateString' ],
+    };
+
+    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.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,
+        } );
+      }
+      await download( temp, res );
+      return;
+    }
+
+    return res.sendSuccess( { result: response, count: geteDataCount?.body?.count } );
+  } catch ( error ) {
+    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

@@ -143,6 +143,24 @@ 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,
+        },
       ],
       responses: {
         200: { description: 'Successful' },
@@ -162,7 +180,7 @@ export const footfallDirectoryDocs = {
       parameters: [
         {
           in: 'query',
-          name: 'storeId',
+          name: '_id',
           scema: j2s( updateStatusQuerySchema ).swagger,
           required: true,
         },

package/src/dtos/footfallDirectory.dtos.js

@@ -185,7 +185,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 +220,12 @@ export const getTicketsSchema = Joi.object().keys( {
 
         return value;
       } ),
+  status: Joi.string().optional(),
+  action: Joi.string().optional(),
+  revopsType: Joi.string().optional(),
+  limit: Joi.number().optional(),
+  offset: Joi.number().optional(),
+
 } ).custom( ( value, helpers ) => {
   const from = dayjs( value.fromDate );
   const to = dayjs( value.toDate );
@@ -301,3 +306,65 @@ export const updateStatusValid = {
   query: updateStatusQuerySchema,
   body: updateStatusSchemea,
 };
+
+
+export const getTaggedStoresSchema = Joi.object().keys( {
+  clientId: Joi.string().required(),
+
+  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 );