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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.34-beta.32",
+    "version": "3.1.34-beta.34",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.1.30",
-        "tango-app-api-middleware": "^3.1.43-alpha.7",
+        "tango-app-api-middleware": "^3.1.43-alpha.8",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/clientInfra.controller.js

@@ -13,7 +13,8 @@ export async function infraCard( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
     let storecountQuery ={ 'clientId': { $in: req.body.clientId }, 'createdAt': { $lte: date.end }, 'status': 'active' };
-    if ( req.user&&req.user.userType ==='client' ) {
+    console.log( req.user.role );
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       storecountQuery = { ...storecountQuery, ...{ storeId: { $in: req.body.assignedStores } } };
     }
     let storeCount = await countDocumentsStore( storecountQuery );
@@ -30,7 +31,7 @@ export async function infraCard( req, res ) {
       },
     ];
 
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       yetToInstallQuery.push(
           {
             $match: {
@@ -50,7 +51,7 @@ export async function infraCard( req, res ) {
         ],
       },
     } ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       totalStoreQuery.push(
           {
             $match: {
@@ -227,14 +228,13 @@ export async function installationCard( req, res ) {
       clientId: { $in: req.body.clientId },
       createdAt: { $lte: date.end },
     };
-    console.log( req.body.assignedStores );
-    console.log( req.storeIds );
-    console.log( '-->', req.body.assignedStores );
 
 
-    if ( req.user&&req.user.userType ==='client' ) {
-      console.log( req.body.assignedStores );
-      baseQuery = { ...baseQuery, ...{ storeId: { $in: req.body.assignedStores } } };
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+      if ( req.body.assignedStores&&req.body.assignedStores.length>0 ) {
+        console.log( '=====>', req.body.assignedStores );
+        baseQuery = { ...baseQuery, ...{ storeId: { $in: req.body.assignedStores } } };
+      }
     }
     let onboardQuery = { ...baseQuery };
     let installedQuery = { ...baseQuery, status: 'active' };
@@ -257,7 +257,7 @@ export async function installationCard( req, res ) {
         },
       },
     ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       ticketbaseQuery.push(
           {
             $match: {
@@ -374,7 +374,7 @@ export async function infraIssuesTable( req, res ) {
         ],
       },
     } ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       totalStoreQuery.push(
           {
             $match: {
@@ -399,7 +399,7 @@ export async function infraIssuesTable( req, res ) {
         ],
       },
     } );
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       pendingquery.push(
           {
             $match: {
@@ -545,7 +545,7 @@ export async function infraIssuesTable( req, res ) {
         } ];
       }
     }
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       storesQuery.push(
           {
             $match: {
@@ -713,7 +713,7 @@ export async function InstallationIssuesTable( req, res ) {
         ],
       },
     } );
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       query.push(
           {
             $match: {
@@ -781,7 +781,7 @@ export async function InstallationIssuesTable( req, res ) {
     },
     );
     let storesQuery = [];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       storesQuery.push(
           {
             $match: {
@@ -1143,7 +1143,7 @@ export async function hourWiseDownstores( req, res ) {
         ],
       },
     } ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client' &&req.user.role!='superadmin' ) {
       totalStoreQuery.push(
           {
             $match: {
@@ -1168,7 +1168,7 @@ export async function hourWiseDownstores( req, res ) {
         ],
       },
     } );
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client' &&req.user.role!='superadmin' ) {
       pendingquery.push(
           {
             $match: {
@@ -1522,7 +1522,7 @@ export async function ticketCountSplit( req, res ) {
       { issueType: { $in: [ 'highcount', 'lowcount' ] } },
 
     ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       filter.push( { 'basicDetails.storeId': { $in: req.body.assignedStores } } );
     }
     if ( req.user.userType === 'client' ) {
@@ -1701,7 +1701,7 @@ export async function ticketCount( req, res ) {
       },
 
     ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client' &&req.user.role!='superadmin' ) {
       filter.push( { 'basicDetails.storeId': { $in: req.body.assignedStores } } );
     }
     if ( req.user.userType === 'client' ) {

package/src/controllers/infra.controllers.js

@@ -1109,7 +1109,7 @@ export async function allCounts( req, res ) {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
     let countQuery = [];
 
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       countQuery.push(
           {
             $match: {
@@ -1203,7 +1203,7 @@ export async function infraTable( req, res ) {
         },
       } );
     }
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       query.push(
           {
             $match: {
@@ -1538,7 +1538,7 @@ export async function installationTable( req, res ) {
         },
       } );
     }
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       query.push(
           {
             $match: {
@@ -2014,9 +2014,7 @@ export async function storeFilter( req, res ) {
         'issueType': { '$in': [ 'highcount', 'lowcount' ] }, 'basicDetails.clientId': inputData.clientId, 'basicDetails.storeId': { $exists: true },
       };
     }
-    if ( req.user&&req.user.userType ==='client' ) {
-      console.log( '---->', req.body.assignedStores );
-
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       query = { ...query, 'basicDetails.storeId': { $in: req.body.assignedStores } };
     }
     console.log( query );
@@ -2054,7 +2052,7 @@ export async function dataMismatchTable( req, res ) {
       },
 
     ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       countFilter.push(
           { 'basicDetails.storeId': { $in: req.body.assignedStores } },
       );
@@ -2124,7 +2122,7 @@ export async function dataMismatchTable( req, res ) {
       { 'basicDetails.clientId': { $in: inputData.clientId } },
       { issueType: { $in: [ 'highcount', 'lowcount' ] } },
     ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       filter.push(
           { 'basicDetails.storeId': { $in: req.body.assignedStores } },
       );