tango-app-api-infra 3.8.1-beta.2 → 3.8.1-beta.4

package/package.json

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

package/src/controllers/footfallDirectory.controllers.js

@@ -174,120 +174,182 @@ 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',
+          },
         },
       },
-    };
-
-    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: { 'clientId.keyword': Array.isArray( 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',
-                },
+    ];
+
+    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',
+        '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',
+          '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',
+          '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 } );
@@ -467,17 +529,15 @@ 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= {
+    logger.info( { inputData: inputData } );
+    const getCount = {
+      size: 0,
       query: {
         bool: {
           filter: [
-            { terms: { 'storeId.keyword': Array.isArray( inputData.storeId ) ?
-              inputData.storeId :
-              inputData.storeId } },
+            {
+              term: { 'clientId.keyword': inputData.clientId },
+            },
             {
               range: {
                 dateString: {
@@ -487,65 +547,51 @@ export async function getTaggedStores( req, res ) {
                 },
               },
             },
-          ],
-        },
-      },
-    };
 
-    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',
-                },
+              exists: {
+                field: 'storeId',
+              },
+            },
+            {
+              exists: {
+                field: 'storeName',
               },
             },
           ],
         },
       },
-      // _source: [ 'storeName', 'storeId', 'ticketId', 'createdAt', 'footfallCount', 'duplicateCount', 'employeeCount', 'houseKeepingCount', 'status', 'dateString' ],
+      aggs: {
+        unique_stores: {
+          composite: {
+            size: 1000,
+            sources: [
+              {
+                storeId: {
+                  terms: { field: 'storeId.keyword' },
+                },
+              },
+              {
+                storeName: {
+                  terms: { field: 'storeName.keyword' },
+                },
+              },
+            ],
+          },
+        },
+      },
     };
+    let temp = [];
 
-    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;
+    const geteDataCount = await getOpenSearchData( openSearch.footfallDirectory, getCount );
+    if ( !geteDataCount && geteDataCount?.body?.aggregations?.unique_stores?.buckets?.length > 0 ) {
+      return res.sendError( 'No data found', 204 );
     }
 
-    return res.sendSuccess( { result: response, count: geteDataCount?.body?.count } );
+    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.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, getTicketsSchema, ticketListSchema, ticketSummarySchema, updateStatusQuerySchema, updateStatusSchemea } from '../dtos/footfallDirectory.dtos.js';
+import { createTicketSchema, getTaggedStoresSchema, getTicketsSchema, ticketListSchema, ticketSummarySchema, updateStatusQuerySchema, 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' ],
@@ -86,7 +85,7 @@ export const footfallDirectoryDocs = {
         },
         {
           in: 'query',
-          name: 'searchvalue',
+          name: 'searchValue',
           scema: j2s( ticketListSchema ).swagger,
           required: false,
         },
@@ -108,6 +107,12 @@ export const footfallDirectoryDocs = {
           scema: j2s( ticketListSchema ).swagger,
           required: false,
         },
+        {
+          in: 'query',
+          name: 'sortBy',
+          scema: j2s( ticketListSchema ).swagger,
+          required: false,
+        },
       ],
       responses: {
         200: { description: 'Successful' },
@@ -149,6 +154,18 @@ export const footfallDirectoryDocs = {
           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',
@@ -201,4 +218,40 @@ 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,
+        },
+      ],
+      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

@@ -125,6 +125,7 @@ export const ticketListSchema = Joi.object().keys( {
   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()