tango-app-api-infra 3.8.1-beta.35 → 3.8.1-beta.37

package/README.md

@@ -1,29 +1,29 @@
-# README #
-
-This README would normally document whatever steps are necessary to get your application up and running.
-
-### What is this repository for? ###
-
-* Quick summary
-* Version
-* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
-
-### How do I get set up? ###
-
-* Summary of set up
-* Configuration
-* Dependencies
-* Database configuration
-* How to run tests
-* Deployment instructions
-
-### Contribution guidelines ###
-
-* Writing tests
-* Code review
-* Other guidelines
-
-### Who do I talk to? ###
-
-* Repo owner or admin
+# README #
+
+This README would normally document whatever steps are necessary to get your application up and running.
+
+### What is this repository for? ###
+
+* Quick summary
+* Version
+* [Learn Markdown](https://bitbucket.org/tutorials/markdowndemo)
+
+### How do I get set up? ###
+
+* Summary of set up
+* Configuration
+* Dependencies
+* Database configuration
+* How to run tests
+* Deployment instructions
+
+### Contribution guidelines ###
+
+* Writing tests
+* Code review
+* Other guidelines
+
+### Who do I talk to? ###
+
+* Repo owner or admin
 * Other community or team contact

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.8.1-beta.35",
+    "version": "3.8.1-beta.37",
     "description": "infra",
     "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/clientInfra.controller.js

@@ -1471,6 +1471,7 @@ async function downStoresCheck( data, inputData ) {
       startTime: dayjs( slot.from ).format( 'hh:mm A' ),
       endTime: dayjs( slot.to ).format( 'hh:mm A' ),
     } ) );
+    let downtimetotal=0;
 
     const downTimePromises = formattedTimeSlots.map( async ( obj ) => {
       const downTime = await getOpenSearchData(
@@ -1492,11 +1493,10 @@ async function downStoresCheck( data, inputData ) {
       const streamwiseDowntime = downTime.body.hits.hits.length > 0 ?
         downTime.body.hits.hits[0]._source.doc.streamwise_downtime :
         [];
-
       const average = streamwiseDowntime.length ?
         Math.round( streamwiseDowntime.reduce( ( acc, curr ) => acc + curr.down_time, 0 ) / streamwiseDowntime.length ) :
         '';
-
+      downtimetotal= Number( downtimetotal ) + Number( average );
       return { ...obj, [`${obj.startTime}-${obj.endTime}`]: average };
     } );
 
@@ -1512,6 +1512,7 @@ async function downStoresCheck( data, inputData ) {
     }, {
       storeName: data.storeName,
       storeId: data.storeId,
+      downtimetotal: downtimetotal,
       PrimaryIssue: data.primaryIssue,
     } );
 

package/src/controllers/footfallDirectory.controllers.js

@@ -388,8 +388,8 @@ export async function ticketList( req, res ) {
           '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 )} %` : `${Math.round( ( ( item?._source?.duplicateCount + item?._source?.employeeCount + item?._source?.houseKeepingCount )/ item?._source?.footfallCount )*100 ).toFixed( 0 )} %`,
+          'Status': item._source.status,
         } );
       }
       return await download( exportData, res );

package/src/controllers/infra.controllers.js

@@ -1642,6 +1642,15 @@ export async function infraTable( req, res ) {
           },
       );
     }
+    if ( req.body.clusterStores&&req.body.clusterStores.length>0 ) {
+      query.push(
+          {
+            $match: {
+              'basicDetails.storeId': { $in: req.body.clusterStores },
+            },
+          },
+      );
+    }
     query.push( {
       $match: {
         $and: [
@@ -2181,6 +2190,15 @@ export async function installationTable( req, res ) {
       );
     }
 
+    if ( req.body.clusterStores&&req.body.clusterStores.length>0 ) {
+      query.push(
+          {
+            $match: {
+              'basicDetails.storeId': { $in: req.body.clusterStores },
+            },
+          },
+      );
+    }
     query.push( {
       $match: {
         $and: [
@@ -2474,7 +2492,24 @@ export async function matTable( req, res ) {
         },
       } );
     }
-
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
+      query.push(
+          {
+            $match: {
+              'basicDetails.storeId': { $in: req.body.assignedStores },
+            },
+          },
+      );
+    }
+    if ( req.body.clusterStores&&req.body.clusterStores.length>0 ) {
+      query.push(
+          {
+            $match: {
+              'basicDetails.storeId': { $in: req.body.clusterStores },
+            },
+          },
+      );
+    }
     query.push( {
       $match: {
         $and: [
@@ -2691,6 +2726,15 @@ export async function dataMismatchTable( req, res ) {
       );
     }
 
+    if ( req.body.clusterStores&&req.body.clusterStores.length>0 ) {
+      query.push(
+          {
+            $match: {
+              'basicDetails.storeId': { $in: req.body.clusterStores },
+            },
+          },
+      );
+    }
     if ( req.user.userType === 'client' ) {
       countFilter.push( { 'dataMismatch.showToClient': true } );
     }