tango-app-api-infra 3.1.34-beta.35 → 3.1.34-beta.36

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.34-beta.35",
+    "version": "3.1.34-beta.36",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/clientInfra.controller.js

@@ -1,5 +1,5 @@
 
-import { aggregateStore, countDocumentsStore } from '../services/store.service.js';
+import { aggregateStore, countDocumentsStore, findStore } from '../services/store.service.js';
 import { logger, download, getUTC } from 'tango-app-api-middleware';
 import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findinfraReason } from '../services/infraReason.service.js';
@@ -17,7 +17,11 @@ export async function infraCard( req, res ) {
     if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
       storecountQuery = { ...storecountQuery, ...{ storeId: { $in: req.body.assignedStores } } };
     }
+
     let storeCount = await countDocumentsStore( storecountQuery );
+    let stores = await findStore( { status: 'active' } );
+    let storelist = stores.map( ( data ) => data.storeId );
+
     let yetToInstallQuery = [
       {
         $match: {
@@ -25,6 +29,7 @@ export async function infraCard( req, res ) {
             { issueType: 'installation' },
             { 'status': { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
+            { 'basicDetails.storeId': { $in: storelist } },
             { createdAt: { $lte: date.end } },
           ],
         },
@@ -239,6 +244,8 @@ export async function installationCard( req, res ) {
     let onboardedCount = await countDocumentsStore( onboardQuery );
     let installedCount = await countDocumentsStore( installedQuery );
     let deactiveCount = await countDocumentsStore( deactiveQuery );
+    let stores = await findStore( { status: 'active' } );
+    let storelist = stores.map( ( data ) => data.storeId );
 
 
     let ticketbaseQuery = [
@@ -248,6 +255,7 @@ export async function installationCard( req, res ) {
             { issueType: 'installation' },
             { 'status': { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
+            { 'basicDetails.storeId': { $in: storelist } },
             { createdAt: { $lte: date.end } },
           ],
         },

package/src/routes/userInfra.routes.js

@@ -1,38 +1,23 @@
 import express from 'express';
-import { isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, accessVerification } from 'tango-app-api-middleware';
 import { userTakeTicket, userTicketList, activeTicketList, basicDetails, workHistory, pendingTicket, storeInfraList } from '../controllers/userInfra.controller.js';
 
 export const userInfraRouter = express.Router();
 
 
-userInfraRouter.post( '/userTakeTicket', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
-    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit', 'isView' ] } ],
-} ), userTakeTicket );
-userInfraRouter.post( '/userTicketList', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
-    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
-} ), userTicketList );
-userInfraRouter.post( '/activeTicketList', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
-    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
-} ), activeTicketList );
-userInfraRouter.post( '/basicDetails', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
-    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
-} ), basicDetails );
-userInfraRouter.post( '/workHistory', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
-    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
-} ), workHistory );
-userInfraRouter.post( '/storeInfraList', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango', 'client' ], access: [
-    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] },
-  ],
-} ), storeInfraList );
-userInfraRouter.post( '/pendingTicket', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango', 'client' ], access: [
-    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] },
-  ],
-} ), pendingTicket );
+userInfraRouter.post( '/userTakeTicket', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [] } ),
+    userTakeTicket );
+userInfraRouter.post( '/userTicketList', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [] } ), userTicketList );
+userInfraRouter.post( '/activeTicketList', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [] } ), activeTicketList );
+userInfraRouter.post( '/basicDetails', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [] } ), basicDetails );
+userInfraRouter.post( '/workHistory', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [] } ), workHistory );
+userInfraRouter.post( '/storeInfraList', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [] } ), storeInfraList );
+userInfraRouter.post( '/pendingTicket', isAllowedSessionHandler,
+    accessVerification( { userType: [ 'tango' ], access: [] } ), pendingTicket );