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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.8.1-beta.5",
+    "version": "3.8.1-beta.7",
     "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';
@@ -368,11 +368,11 @@ export async function getTickets( req, res ) {
   try {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    const limit = inputData.limit || 10;
+    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 } );
-
+    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 :
@@ -405,6 +405,32 @@ export async function getTickets( req, res ) {
           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 ) {
@@ -431,7 +457,24 @@ export async function getTickets( req, res ) {
         },
       } );
     }
-
+    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: {
@@ -440,8 +483,12 @@ export async function getTickets( req, res ) {
       },
     };
 
+
     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 );
     }
 
@@ -453,10 +500,22 @@ export async function getTickets( req, res ) {
           filter: filter,
         },
       },
+      _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 } );
 
 
@@ -480,7 +539,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 } );
@@ -490,6 +549,7 @@ 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( '_' );
@@ -498,7 +558,8 @@ export async function updateStatus( req, res ) {
     if ( inputData.duplicateStatus === 'approved' && inputData.employeeStatus === 'approved' && inputData.houseKeepingStatus === 'approved' ) {
       inputData.status = 'closed';
     }
-    await updateOpenSearchData( openSearch.footfallDirectory, id, { _doc: inputData } );
+    let tempId = [];
+    await updateOpenSearchData( openSearch.footfallDirectory, id, { doc: inputData } );
     let bulkBody = [];
     for ( let duplicate of inputData.duplicateImages ) {
       bulkBody.push(
@@ -506,6 +567,7 @@ export async function updateStatus( req, res ) {
           { doc: { duplicateImage: duplicate.duplicateImage } },
       );
       duplicate.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 } },
@@ -513,18 +575,28 @@ export async function updateStatus( req, res ) {
       } );
     }
     for ( let employee of inputData.employee ) {
-      bulkBody.push(
-          { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${employee.timeRange}_${employee.tempId}` } },
-          { doc: { isChecked: employee.isChecked } },
-      );
+       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 ) {
-      bulkBody.push(
-          { update: { _index: openSearch.revop, _id: `${storeId}_${dateString}_${houseKeeping.timeRange}_${houseKeeping.tempId}` } },
-          { doc: { isChecked: houseKeeping.isChecked } },
-      );
+       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 } },
+       );
     }
-    return res.sendSuccess( 'ticket closed successfully' );
+    // 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 );
+    //   }
+    // }
+    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' } );
@@ -532,40 +604,80 @@ export async function updateStatus( req, res ) {
   }
 }
 
+export async function sendSqsMessage( inputData, tempId ) {
+  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',
+          },
+        },
+      } );
+    }
     const getCount = {
       size: 0,
       query: {
         bool: {
-          filter: [
-            {
-              term: { 'clientId.keyword': inputData.clientId },
-            },
-            {
-              range: {
-                dateString: {
-                  gte: inputData.fromDate,
-                  lte: inputData.toDate,
-                  format: 'yyyy-MM-dd',
-                },
-              },
-            },
-
-            {
-              exists: {
-                field: 'storeId',
-              },
-            },
-            {
-              exists: {
-                field: 'storeName',
-              },
-            },
-          ],
+          filter: filter,
         },
       },
       aggs: {

package/src/docs/footfallDirectory.docs.js

@@ -170,7 +170,7 @@ export const footfallDirectoryDocs = {
           in: 'query',
           name: 'limit',
           scema: j2s( getTicketsSchema ).swagger,
-          required: false,
+          required: true,
         },
         {
           in: 'query',
@@ -243,6 +243,12 @@ export const footfallDirectoryDocs = {
           scema: j2s( getTaggedStoresSchema ).swagger,
           required: true,
         },
+        {
+          in: 'query',
+          name: 'searchValue',
+          scema: j2s( getTaggedStoresSchema ).swagger,
+          required: false,
+        },
       ],
       responses: {
         200: { description: 'Successful' },

package/src/dtos/footfallDirectory.dtos.js

@@ -224,7 +224,7 @@ export const getTicketsSchema = Joi.object().keys( {
   status: Joi.string().optional(),
   action: Joi.string().optional(),
   revopsType: Joi.string().optional(),
-  limit: Joi.number().optional(),
+  limit: Joi.number().required(),
   offset: Joi.number().optional(),
 
 } ).custom( ( value, helpers ) => {
@@ -256,6 +256,22 @@ export const updateStatusQuerySchema =Joi.object().keys( {
 } );
 
 export const updateStatusSchemea =Joi.object().keys( {
+  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().required(),
   employeeACCount: Joi.number().required(),
@@ -311,7 +327,7 @@ export const updateStatusValid = {
 
 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()