tango-app-api-analysis-traffic 3.8.2-alpha.2 → 3.8.2-alpha.4

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.2-alpha.2",
+    "version": "3.8.2-alpha.4",
     "description": "Traffic Analysis",
     "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/tangoTrafficV1.controllers.js

@@ -991,7 +991,7 @@ export const headerStoresV1 = async ( req, res ) => {
     let getUserType = req.user.userType;
     let getRole = req.user.role;
     let getClientId = reqestData.clientId;
-    let totalStores = await getAllStores( getUserEmail, getClientId, getUserType, getRole );
+    let totalStores = await getAllStores( getUserEmail, getClientId, getUserType, getRole, reqestData );
     if ( totalStores && totalStores.length>0 ) {
       let storeQuery = [];
       if ( reqestData.city.length>0 && reqestData.group.length>0 ) {
@@ -1054,7 +1054,7 @@ export const headerStoresV1 = async ( req, res ) => {
           },
         ];
       } else {
-        let totalStores = await getAllStores( getUserEmail, getClientId, getUserType, getRole );
+        let totalStores = await getAllStores( getUserEmail, getClientId, getUserType, getRole, reqestData );
         storeQuery = [
           {
             $match: {
@@ -1205,14 +1205,14 @@ async function getStoresList( getUserEmail, getClientId, getUserType, getRole, r
     if ( getUserEmail && getUserEmail !='' && getClientId && getClientId !='' && getUserType && getUserType !='' && getRole && getRole!='' ) {
       let overAllStores = [];
       if ( getUserType == 'tango' ) {
-        let getAllS = await getAssignedAllStores( getClientId );
+        let getAllS = await getAssignedAllStores( getClientId, req.body );
         if ( getAllS && getAllS.length >0 ) {
           overAllStores = getAllS;
         }
         return overAllStores;
       } else if ( getUserType == 'client' ) {
         if ( getRole == 'superadmin' ) {
-          let getAllS = await getAssignedAllStores( getClientId );
+          let getAllS = await getAssignedAllStores( getClientId, req.body );
           if ( getAllS && getAllS.length >0 ) {
             overAllStores = getAllS;
           }
@@ -1230,19 +1230,19 @@ async function getStoresList( getUserEmail, getClientId, getUserType, getRole, r
 };
 
 
-async function getAllStores( getUserEmail, getClientId, getUserType, getRole ) {
+async function getAllStores( getUserEmail, getClientId, getUserType, getRole, reqestData ) {
   try {
     if ( getUserEmail && getUserEmail !='' && getClientId && getClientId !='' && getUserType && getUserType !='' && getRole && getRole!='' ) {
       let overAllStores = [];
       if ( getUserType == 'tango' ) {
-        let getAllS = await getAssignedAllStores( getClientId );
+        let getAllS = await getAssignedAllStores( getClientId, reqestData );
         if ( getAllS && getAllS.length >0 ) {
           overAllStores = getAllS;
         }
         return overAllStores;
       } else if ( getUserType == 'client' ) {
         if ( getRole == 'superadmin' ) {
-          let getAllS = await getAssignedAllStores( getClientId );
+          let getAllS = await getAssignedAllStores( getClientId, reqestData );
           if ( getAllS && getAllS.length >0 ) {
             overAllStores = getAllS;
           }
@@ -1396,7 +1396,7 @@ async function getAssignedGroupStores( clientId, userEmail, assignedType ) {
   }
 }
 
-async function getAssignedAllStores( userClientId ) {
+async function getAssignedAllStores( userClientId, reqestData ) {
   try {
     if ( userClientId && userClientId !='' ) {
       let storeQuery = [
@@ -1404,7 +1404,7 @@ async function getAssignedAllStores( userClientId ) {
           $match: {
             $and: [
               { clientId: { $eq: userClientId } },
-              { status: { $eq: 'active' } },
+              { status: { $in: reqestData.status } },
               { 'edge.firstFile': true },
             ],
           },
@@ -1433,7 +1433,7 @@ async function getAssignedAllStores( userClientId ) {
 }
 
 
-async function getClusterStores( userClientId, ClusterList ) {
+async function getClusterStores( userClientId, ClusterList, req ) {
   try {
     if ( userClientId && userClientId !='' && ClusterList && ClusterList.length >0 ) {
       let ClusterQuery = [
@@ -1540,7 +1540,7 @@ async function getLocationStores( userClientId, cityList, req ) {
       if ( req.body.assignedStores&&req.body.assignedStores.length>0 ) {
         filter.push( { storeId: { $in: req.body.assignedStores } } );
       }
-      filter.push( { 'edge.firstFile': true }, { status: { $eq: 'active' } } );
+      filter.push( { 'edge.firstFile': true }, { status: { $in: req.body.status } } );
 
       let storeQuery = [
         {
@@ -2038,7 +2038,7 @@ async function getCountryStores( userClientId, countryList, req ) {
       if ( req.body.assignedStores&&req.body.assignedStores.length>0 ) {
         filter.push( { storeId: { $in: req.body.assignedStores } } );
       }
-      filter.push( { 'edge.firstFile': true }, { status: { $eq: 'active' } } );
+      filter.push( { 'edge.firstFile': true }, { status: { $in: req.body.status } } );
 
       let storeQuery = [
         { $match: { $and: filter } },
@@ -2085,12 +2085,12 @@ export const headerStoresV2 = async ( req, res ) => {
       }
 
       if ( reqestData.clusters && reqestData.clusters.length>0 ) {
-        let unqueGroupStores = await getClusterStores( getClientId, reqestData.clusters );
+        let unqueGroupStores = await getClusterStores( getClientId, reqestData.clusters, req );
         andQuery.push( { storeId: { $in: unqueGroupStores } } );
       }
 
       andQuery.push( { 'edge.firstFile': true } );
-      andQuery.push( { status: { $eq: 'active' } } );
+      andQuery.push( { status: { $in: req.body.status } } );
 
       storeQuery.push(
           { $match: { $and: andQuery } },

package/src/dtos/validation.dtos.js

@@ -211,6 +211,7 @@ export const validateHeaderSchema = joi.object( {
   clientId: joi.string().required().allow( '' ),
   city: joi.array().required(),
   group: joi.array().required(),
+  status: joi.array().required(),
   country: joi.array().optional().empty(),
 } );
 
@@ -218,6 +219,7 @@ export const validateHeaderSchemav2 = joi.object( {
   clientId: joi.string().required(),
   city: joi.array().required(),
   clusters: joi.array().required(),
+  status: joi.array().required(),
   country: joi.array().optional().empty(),
 } );
 export const validateHeaderParams = {