tango-app-api-trax 3.7.4-runai-airtelv2-10 → 3.7.5-halfshutter-1

package/app.js

@@ -0,0 +1,56 @@
+import express from 'express';
+import { traxDashboardRouter, traxFlagRouter, traxRouter, downloadRouter, mobileRouter, locusOrderRouter, internalTraxRouter, traxActivityLogRouter, galleryRouter } from './index.js';
+import dotenv from 'dotenv';
+import pkg from 'body-parser';
+const { json, urlencoded } = pkg;
+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 cors from 'cors';
+import admin from 'firebase-admin';
+import fileupload from 'express-fileupload';
+
+
+const serviceAccountPath = JSON.parse( process.env.FIREBASE );
+admin.initializeApp( {
+  credential: admin.credential.cert( serviceAccountPath ),
+} );
+
+const env=dotenv.config();
+
+const app = express();
+const PORT = process.env.PORT || 3000;
+app.use( cors() );
+
+
+if ( env.error ) {
+  logger.error( '.env not found' );
+  process.exit( 1 );
+}
+
+app.use( json( { limit: '500mb' } ) );
+app.use( fileupload() );
+app.use(
+    urlencoded( {
+      extended: true,
+    } ),
+);
+
+app.use( responseMiddleware );
+app.use( errorMiddleware );
+
+app.use( '/trax/dashboard', traxDashboardRouter );
+app.use( '/trax', traxRouter );
+app.use( '/trax/flag', traxFlagRouter );
+app.use( '/trax/downloads', downloadRouter );
+app.use( '/trax/mobileAPI', mobileRouter );
+app.use( '/trax/locusorder', locusOrderRouter );
+app.use( '/trax/internalAPI', internalTraxRouter );
+app.use( '/trax/activityLog', traxActivityLogRouter );
+app.use( '/trax/gallery', galleryRouter );
+
+app.listen( PORT, () => {
+  console.log( `server is running on port= ${PORT} ` );
+  connectdb();
+} );

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-trax",
-    "version": "3.7.4-runai-airtelv2-10",
+    "version": "3.7.5-halfshutter-1",
     "description": "Trax",
-    "main": "index.js",
+    "main": "app.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+        "start": "nodemon --exec \"eslint --fix . && node app.js\""
     },
     "engines": {
         "node": ">=18.10.0"
@@ -27,7 +27,7 @@
         "mongodb": "^6.8.0",
         "nodemon": "^3.1.4",
         "path": "^0.12.7",
-        "tango-api-schema": "^2.3.20",
+        "tango-api-schema": "^2.4.4",
         "tango-app-api-middleware": "^3.5.2",
         "url": "^0.11.4",
         "winston": "^3.13.1",

package/src/controllers/teaxFlag.controller.js

@@ -548,7 +548,17 @@ export const flagCardsV1 = async ( req, res ) => {
           // $or: [ { store_id: { $in: storeId } }, { aiStoreList: { $in: storeId } } ],
           date_iso: { $gte: adjustedFromDate, $lte: adjustedToDate },
           // $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: storeId } } ],
-          $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+          // $or: [ { store_id: { $in: storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+          $or: clientId === '11' ?
+        [
+          { store_id: { $in: storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+        ] :
+        [
+          { store_id: { $in: storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+          { aiStoreList: { $in: storeId } },
+        ],
         },
       },
       {
@@ -568,7 +578,6 @@ export const flagCardsV1 = async ( req, res ) => {
     ];
 
     const getOverallChecklistData = await processedchecklistService.aggregate( findQuery );
-    console.log( 'getOverallChecklistData =>', getOverallChecklistData );
 
     if ( !getOverallChecklistData.length ) {
       const resVal = {
@@ -2879,7 +2888,17 @@ export const flagComparisonCardsV2 = async ( req, res ) => {
       { $match: { client_id: requestData.clientId,
         date_iso: { $gte: fromDate, $lte: toDate },
         // $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ],
-        $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+        // $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ],
+        $or: requestData.clientId === '11' ?
+        [
+          { store_id: { $in: requestData.storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+        ] :
+        [
+          { store_id: { $in: requestData.storeId } },
+          { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } },
+          { aiStoreList: { $in: requestData.storeId } },
+        ],
       } },
       {
         $project: {
@@ -3010,8 +3029,17 @@ export const flagTablesV2 = async ( req, res ) => {
         { client_id: requestData.clientId },
         { date_iso: { $gte: fromDate, $lte: toDate } },
         // { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
-        { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
+        // { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
     );
+    if ( requestData.clientId == '11' ) {
+      findAndQuery.push(
+          { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } } ] },
+      );
+    } else {
+      findAndQuery.push(
+          { $or: [ { store_id: { $in: requestData.storeId } }, { store_id: { $eq: '' }, userEmail: { $in: requestData.userEmailes } }, { aiStoreList: { $in: requestData.storeId } } ] },
+      );
+    }
 
     if ( requestData?.filter === 'all' ) {
       findAndQuery.push( { $or: [ { checkListType: { $in: [ 'custom', 'customerunattended', 'mobileusagedetection', 'staffleftinthemiddle', 'storeopenandclose', 'uniformdetection', 'cleaning', 'scrum', 'outsidebusinesshoursqueuetracking' ] } } ] } );

package/src/controllers/trax.controller.js

@@ -546,7 +546,12 @@ export const zoneList = async ( req, res ) => {
   try {
     let inputBody = req.query;
 
-    if ( inputBody.checkListName && inputBody.checkListName == 'Outside Business Hours Queue Tracking' ) {
+    const allowedChecklists = [
+      'Outside Business Hours Queue Tracking',
+      'Store Half Shutter Detection',
+    ];
+
+    if ( inputBody.checkListName && allowedChecklists.includes( inputBody.checkListName ) ) {
       let query = [
         {
           $match: {
@@ -3945,7 +3950,7 @@ async function updateOpenSearch( user, data ) {
 export const aiChecklist = async ( req, res ) => {
   try {
     let storeDetails = await storeService.count( { clientId: req.query.clientId, status: 'active' } );
-    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking' ];
+    let aiList = [ 'mobileusagedetection', 'storeopenandclose', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'eyetest', 'remoteoptometrist', 'storehygienemonitoring', 'queuealert', 'cleaning', 'scrum', 'suspiciousactivity', 'boxalert', 'suspiciousfootfall', 'drinking', 'bagdetection', 'inventorycount', 'carsattended', 'numberplateinfo', 'vehicle_check_in', 'outsidebusinesshoursqueuetracking', 'halfshutter' ];
     let checklistDetails = [];
     let publishList = [];
     let unpublishList = [];
@@ -3958,7 +3963,7 @@ export const aiChecklist = async ( req, res ) => {
     checklistDetails = [ ...publishList, ...unpublishList ];
 
     checklistDetails.forEach( ( item ) => {
-      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking' ].includes( item.checkListType ) ) {
+      if ( ![ 'mobileusagedetection', 'storeopenandclose', 'cleaning', 'scrum', 'uniformdetection', 'staffleftinthemiddle', 'customerunattended', 'outsidebusinesshoursqueuetracking', 'halfshutter' ].includes( item.checkListType ) ) {
         item.storeCount = storeDetails;
       }
     } );