tango-app-api-infra 3.8.1-beta.32 → 3.8.1-beta.34

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.8.1-beta.32",
+    "version": "3.8.1-beta.34",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.3.1",
+        "tango-api-schema": "^2.3.8",
         "tango-app-api-middleware": "^3.1.93",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/footfallDirectory.controllers.js

@@ -381,10 +381,10 @@ export async function ticketList( req, res ) {
           'Ticket raised on': dayjs( item._source.createdAt ).format( 'DD MMM, YYYY' ),
           'Issue Date': dayjs( item._source.dateString ).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 ),
+          'Duplicates': item?._source?.status === 'closed'? item._source.duplicateACCount : item._source.duplicateCount,
+          'Employee/Staff': item?._source?.status === 'closed'? item._source.employeeACCount : item._source.employeeCount,
+          'HouseKeeping': item?._source?.status === 'closed'? item._source.houseKeepingACCount : item._source.houseKeepingCount,
+          'Revised Footfall': item?._source?.status === 'closed'? item._source.footfallCount - ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount ) : item._source.footfallCount - ( item._source.duplicateCount + item._source.employeeCount + item._source.houseKeepingCount ),
           'Status': item._source.status,
           'Ticket%': item?._source?.status === 'closed'?`${Math.round( ( ( item._source.duplicateACCount + item._source.employeeACCount + item._source.houseKeepingACCount )/ item._source.footfallCount )*100 ).toFixed( 0 )} %` : 'NA',
         } );
@@ -452,11 +452,11 @@ export async function getTickets( req, res ) {
     if (
       inputData.revopsType
     ) {
-      filter.push( {
-        exists: {
-          field: inputData.revopsType,
-        },
-      } );
+      // filter.push( {
+      //   exists: {
+      //     field: inputData.revopsType,
+      //   },
+      // } );
       inputData.revopsType === 'employee' ?
         filter.push( {
           range: {
@@ -465,10 +465,10 @@ export async function getTickets( req, res ) {
             },
           },
         } ) :
-        inputData.revopsType === 'housekeeping' ?
+        inputData.revopsType === 'houseKeeping' ?
           filter.push( {
             range: {
-              housekeepingCount: {
+              houseKeepingCount: {
                 gt: 0,
               },
             },
@@ -773,7 +773,8 @@ export async function updateTicketStatus( data, openSearch, temp, user ) {
       isVideoStream: true,
     };
     const getStoreType = await countDocumnetsCamera( query );
-    const tempIdList = await extractCheckedTempIds( getExistingOne?.body );
+    let getUpdateExistingOne = await getOpenSearchById( openSearch.footfallDirectory, _id );
+    const tempIdList = await extractCheckedTempIds( getUpdateExistingOne?.body );
     logger.info( { tempIdList: tempIdList } );
     const isSendMessge = await sendSqsMessage( data, tempIdList, getStoreType, storeId );
     if ( isSendMessge ==true ) {
@@ -1100,11 +1101,11 @@ export async function downloadTickets( req, res ) {
     if (
       inputData.revopsType
     ) {
-      filter.push( {
-        exists: {
-          field: inputData.revopsType,
-        },
-      } );
+      // filter.push( {
+      //   exists: {
+      //     field: inputData.revopsType,
+      //   },
+      // } );
       inputData.revopsType === 'employee' ?
         filter.push( {
           range: {
@@ -1113,10 +1114,10 @@ export async function downloadTickets( req, res ) {
             },
           },
         } ) :
-        inputData.revopsType === 'housekeeping' ?
+        inputData.revopsType === 'houseKeeping' ?
           filter.push( {
             range: {
-              housekeepingCount: {
+              houseKeepingCount: {
                 gt: 0,
               },
             },