tango-app-api-infra 3.7.1-beta.5 → 3.7.1-beta.7

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.7.1-beta.5",
+    "version": "3.7.1-beta.7",
     "description": "infra",
-    "main": "app.js",
+    "main": "index.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node app.js\""
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
     },
     "engines": {
         "node": ">=18.10.0"

package/src/controllers/footfallDirectory.controllers.js

@@ -1,14 +1,14 @@
-import { logger } from 'tango-app-api-middleware';
-import { bulkUpdate, getOpenSearchData, insertWithId } from 'tango-app-api-middleware/src/utils/openSearch.js';
+import { download, logger } from 'tango-app-api-middleware';
+import { bulkUpdate, getOpenSearchCount, getOpenSearchData, insertWithId } from 'tango-app-api-middleware/src/utils/openSearch.js';
 import { findOneStore } from '../services/store.service.js';
 // import { updateOneCamera } from '../services/camera.service.js';
+import dayjs from 'dayjs';
 
 export async function createTicket( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     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;
@@ -208,34 +208,175 @@ export async function ticketList( req, res ) {
     // process.exit();
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    const skip=( inputData.offset - 1 ) *inputData.limit;
+    const limit = inputData.limit || 10;
+    const skip= inputData.offset == 0? 0:( inputData.offset - 1 ) *limit || 0;
     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',
+                },
+              },
+            },
+          ],
+        },
+      },
+    };
+
+    const geteDataCount = await getOpenSearchCount( openSearch.footfallDirectory, getCount );
+    if ( !geteDataCount || geteDataCount?.body?.count == 0 ) {
+      return res.sendError( 'No data found', 204 );
+    }
     const getQuery = {
-      size: inputData.limit,
+      size: limit,
       from: skip,
       query: {
         bool: {
           filter: [
-            { terms: { 'clientId.keyword': inputData.clientId } },
+            { terms: { 'clientId.keyword': Array.isArray( inputData.clientId ) ?
+              inputData.clientId :
+              inputData.clientId } },
+            {
+              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 );
+  }
+}
+
+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;
+    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 } );
+    logger.info( { response: response, body: getData?.body, getData: getData, geteDataCount: geteDataCount } );
 
 
-    return res.sendSuccess( { result: response } );
+    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 } );

package/src/docs/footfallDirectory.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { createTicketSchema, ticketSummarySchema } from '../dtos/footfallDirectory.dtos.js';
+import { createTicketSchema, getTicketsSchema, ticketListSchema, ticketSummarySchema } from '../dtos/footfallDirectory.dtos.js';
 
 export const footfallDirectoryDocs = {
 
@@ -69,21 +69,80 @@ export const footfallDirectoryDocs = {
         {
           in: 'query',
           name: 'clientId',
-          scema: j2s( ticketSummarySchema ).swagger,
-          required: false,
+          scema: j2s( ticketListSchema ).swagger,
+          required: true,
         },
         {
           in: 'query',
           name: 'fromDate',
-          scema: j2s( ticketSummarySchema ).swagger,
-          required: false,
+          scema: j2s( ticketListSchema ).swagger,
+          required: true,
         },
         {
           in: 'query',
           name: 'toDate',
-          scema: j2s( ticketSummarySchema ).swagger,
+          scema: j2s( ticketListSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'searchvalue',
+          scema: j2s( ticketListSchema ).swagger,
+          required: false,
+        },
+        {
+          in: 'query',
+          name: 'limit',
+          scema: j2s( ticketListSchema ).swagger,
           required: false,
         },
+        {
+          in: 'query',
+          name: 'offset',
+          scema: j2s( ticketListSchema ).swagger,
+          required: false,
+        },
+        {
+          in: 'query',
+          name: 'isExport',
+          scema: j2s( ticketListSchema ).swagger,
+          required: false,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
+  '/v3/footfall-directory-tagging/get-tickets': {
+    get: {
+      tags: [ 'Footfall Directory Ticket' ],
+      description: 'To get tickets Details by selction stores and date range',
+      operationId: 'get-tickets',
+      parameters: [
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( getTicketsSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'fromDate',
+          scema: j2s( getTicketsSchema ).swagger,
+          required: true,
+        },
+        {
+          in: 'query',
+          name: 'toDate',
+          scema: j2s( getTicketsSchema ).swagger,
+          required: true,
+        },
       ],
       responses: {
         200: { description: 'Successful' },

package/src/dtos/footfallDirectory.dtos.js

@@ -124,6 +124,7 @@ export const ticketListSchema = Joi.object().keys( {
   searchValue: Joi.string().optional().allow( '' ),
   limit: Joi.number().optional(),
   offset: Joi.number().optional(),
+  isExport: Joi.boolean().optional(),
   fromDate: Joi.string()
       .pattern( /^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD format' )
       .required()
@@ -179,5 +180,66 @@ export const ticketListSchema = Joi.object().keys( {
 } );
 
 export const ticketListValid = {
-  query: ticketSummarySchema,
+  query: ticketListSchema,
+};
+
+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()
+      .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 getTicketsValid = {
+  query: getTicketsSchema,
 };

package/src/routes/footfallDirectory.routes.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import { isExist } from '../validations/footfallDirectory.validation.js';
-import { createTicket, ticketList, ticketSummary } from '../controllers/footfallDirectory.controllers.js';
-import { createTicketValid, ticketListValid, ticketSummaryValid } from '../dtos/footfallDirectory.dtos.js';
+import { createTicket, getTickets, ticketList, ticketSummary } from '../controllers/footfallDirectory.controllers.js';
+import { createTicketValid, getTicketsValid, ticketListValid, ticketSummaryValid } from '../dtos/footfallDirectory.dtos.js';
 import { bulkValidate, validate } from 'tango-app-api-middleware';
 
 export const footfallDirectoryRouter = express.Router();
@@ -10,4 +10,8 @@ footfallDirectoryRouter.post( '/create-ticket', validate( createTicketValid ), i
 footfallDirectoryRouter.get( '/ticket-summary', bulkValidate( ticketSummaryValid ), ticketSummary );
 
 footfallDirectoryRouter.get( '/ticket-list', bulkValidate( ticketListValid ), ticketList );
+footfallDirectoryRouter.get( '/get-tickets', bulkValidate( getTicketsValid ), getTickets );
+
+// footfallDirectoryRouter.put( '/update-status', bulkValidate( updateStatus ), getTickets );
+
 // footfallDirectoryRouter.get( '/ticket-list', ticketList );

package/app.js

@@ -1,49 +0,0 @@
-import express from 'express';
-import { infraRouter, internalInfraRouter, userInfraRouter, storeInfraRouter, dataMismatchTicketRouter, clientInfraRouter, employeeTrainigRouter } from './index.js';
-
-import dotenv from 'dotenv';
-import { logger } from 'tango-app-api-middleware';
-import { connectdb } from './config/database/database.js';
-import responseMiddleware from './config/response/response.js';
-import errorMiddleware from './config/response/error.js';
-import pkg from 'body-parser';
-import cors from 'cors';
-import { swaggerConfig } from './config/swagger/swagger.js';
-import swagger from 'swagger-ui-express';
-import { footfallDirectoryRouter } from './src/routes/footfallDirectory.routes.js';
-
-const { json, urlencoded } = pkg;
-const env=dotenv.config();
-
-const app = express();
-const PORT = process.env.PORT || 3000;
-app.use( cors() );
-
-app.use( json( { limit: '500mb' } ) );
-app.use(
-    urlencoded( {
-      extended: true,
-    } ),
-);
-app.use( responseMiddleware );
-app.use( errorMiddleware );
-
-if ( env.error ) {
-  logger.error( '.env not found' );
-  process.exit( 1 );
-}
-app.use( '/api-docs', swagger.serve, swagger.setup( swaggerConfig ) );
-
-app.use( '/v3/infra', infraRouter );
-app.use( '/v3/userinfra', userInfraRouter );
-app.use( '/v3/internalinfra', internalInfraRouter );
-app.use( '/v3/storeInfra', storeInfraRouter );
-app.use( '/v3/datamismatchticket', dataMismatchTicketRouter );
-app.use( '/v3/clientinfra', clientInfraRouter );
-app.use( '/v3/employeetrainig', employeeTrainigRouter );
-app.use( '/v3/footfall-directory-tagging', footfallDirectoryRouter );
-
-app.listen( PORT, () => {
-  logger.info( `server is running on port= ${PORT} ` );
-  connectdb();
-} );