tango-app-api-infra 3.0.24-dev → 3.0.26-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.24-dev",
+    "version": "3.0.26-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -23,7 +23,7 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "tango-api-schema": "^2.0.61",
-        "tango-app-api-middleware": "^1.0.48-dev",
+        "tango-app-api-middleware": "^1.0.49-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/clientInfra.controller.js

@@ -264,6 +264,7 @@ export async function infraIssuesTable( req, res ) {
     {
       $project: {
         storeId: '$basicDetails.storeId',
+        clientId: '$basicDetails.clientId',
         ticketId: 1,
         storeName: '$basicDetails.storeName',
         status: 1,
@@ -297,6 +298,7 @@ export async function infraIssuesTable( req, res ) {
     {
       $project: {
         storeId: 1,
+        clientId: 1,
         storeName: 1,
         createdAt: 1,
         ticketId: 1,
@@ -311,6 +313,7 @@ export async function infraIssuesTable( req, res ) {
       $group: {
         _id: '$ticketId',
         storeId: { $first: '$storeId' },
+        clientId: { $first: '$clientId' },
         ticketId: { $first: '$ticketId' },
         storeName: { $first: '$storeName' },
         createdAt: { $first: '$createdAt' },
@@ -402,8 +405,37 @@ export async function InstallationIssuesTable( req, res ) {
           createdAt: 1,
           clientName: '$basicDetails.clientName',
           storeId: '$basicDetails.storeId',
+          clientId: '$basicDetails.clientId',
           storeName: '$basicDetails.storeName',
           status: 1,
+          primaryIssue: {
+            $filter: {
+              input: '$ticketActivity',
+              as: 'item',
+              cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
+            },
+          },
+        },
+      },
+      {
+        $unwind: {
+          path: '$primaryIssue', preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $unwind: {
+          path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $project: {
+          createdAt: 1,
+          clientName: 1,
+          storeId: 1,
+          clientId: 1,
+          storeName: 1,
+          status: 1,
+          primaryIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '-' ] },
         },
       },
     ];
@@ -419,6 +451,13 @@ export async function InstallationIssuesTable( req, res ) {
         },
       } );
     }
+    if ( req.body.filterIssue && req.body.filterIssue != '' ) {
+      query.push( {
+        $match: {
+          primaryIssue: req.body.filterIssue,
+        },
+      } );
+    }
     if ( req.body.sortColumName && req.body.sortColumName !== '' && req.body.sortBy ) {
       query.push( {
         $sort: { [req.body.sortColumName]: req.body.sortBy },
@@ -431,6 +470,7 @@ export async function InstallationIssuesTable( req, res ) {
           { $limit: Number( req.body.limit ) },
       );
     }
+
     let storesList = await aggregateTangoTicket( query );
     if ( storesList.length == 0 ) {
       return res.sendError( 'no data', 204 );

package/src/controllers/infra.controllers.js

@@ -131,6 +131,9 @@ export async function updateTicketIssue( req, res ) {
     if ( req.body.ticketDetails.ticketType === 'refreshticket' ) {
       await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketDetails.refreshTicketStatus': 'identified' } );
     }
+    if ( req.body.issueType === 'installation' ) {
+      await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketDetails.installationStatus': 'installationfailed' } );
+    }
     if ( updateTicket ) {
       res.sendSuccess( 'Ticket Updated  Successfully' );
     }
@@ -167,7 +170,7 @@ export async function updateInstallationTicket( req, res ) {
 
 export async function viewTicket( req, res ) {
   try {
-    let ticket = await findOneTangoTicket( { ticketId: req.body.ticketId }, { ticketId: 1, status: 1, ticketDetails: 1, basicDetails: 1, ticketActivity: 1, createdAt: 1, attachments: 1 } );
+    let ticket = await findOneTangoTicket( { ticketId: req.body.ticketId }, { ticketId: 1, status: 1, ticketDetails: 1, basicDetails: 1, ticketActivity: 1, createdAt: 1, attachments: 1, cameraList: 1 } );
     if ( ticket.attachments && ticket.attachments.length > 0 ) {
       for ( let index in ticket.attachments ) {
         if ( ticket.attachments.hasOwnProperty( index ) ) {
@@ -240,6 +243,8 @@ export async function uploadAttachments( req, res ) {
       if ( updateTicket ) {
         res.sendSuccess( 'Uploaded successfully' );
       }
+    } else {
+
     }
   } catch ( error ) {
     logger.error( { error: error, function: 'uploadAttachments' } );

package/src/controllers/storeInfra.controlller.js

@@ -11,6 +11,7 @@ export async function storeTicketList( req, res ) {
       $match: {
         $and: [
           { 'basicDetails.storeId': req.body.storeId },
+          { issueType: 'infra' },
           { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
@@ -20,6 +21,7 @@ export async function storeTicketList( req, res ) {
       $project: {
         storeId: '$basicDetails.storeId',
         status: 1,
+        issueDate: '$issueDate',
         Date: { $dateToString: { format: '%d-%m-%Y', date: '$createdAt' } },
         issueClosedDate: 1,
         ticketId: 1,
@@ -55,6 +57,7 @@ export async function storeTicketList( req, res ) {
         issueStatus: 1,
         ticketType: 1,
         comments: 1,
+        issueDate: 1,
         primaryIssue: '$primaryIssue.reasons.primaryIssue',
         secondaryIssue: '$primaryIssue.reasons.secondaryIssue',
       },
@@ -66,6 +69,7 @@ export async function storeTicketList( req, res ) {
         Date: { $first: '$Date' },
         issueClosedDate: { $first: '$issueClosedDate' },
         status: { $first: '$status' },
+        issueDate: { $first: '$issueDate' },
         ticketId: { $first: '$ticketId' },
         issueStatus: { $first: '$issueStatus' },
         ticketType: { $first: '$ticketType' },
@@ -74,6 +78,11 @@ export async function storeTicketList( req, res ) {
         secondaryIssue: { $last: '$secondaryIssue' },
       },
     },
+    {
+      $sort: {
+        issueDate: -1,
+      },
+    },
     ];
 
     if ( req.body.filter && req.body.filter !== '' ) {
@@ -121,6 +130,7 @@ export async function storeTicketcard( req, res ) {
         $and: [
           { 'basicDetails.storeId': req.body.storeId },
           { 'ticketDetails.issueStatus': 'identified' },
+          { issueType: 'infra' },
           { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.start } },
         ],

package/src/controllers/userInfra.controller.js

@@ -35,13 +35,13 @@ export async function userTicketList( req, res ) {
     let query = [ {
       $match: {
         $and: [
-          { 'status': req.body.status },
+
           { issueType: req.body.issueType },
           { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
         ],
       },
     } ];
-    if ( req.body.status != 'closed' ) {
+    if ( req.body.status != 'closed' || req.body.export ) {
       query.push( {
         $match: {
           $and: [
@@ -57,14 +57,20 @@ export async function userTicketList( req, res ) {
         },
       } );
     }
-
-
+    if ( req.body.status && req.body.status != '' ) {
+      query.push( {
+        $match: {
+          status: req.body.status,
+        },
+      } );
+    }
     query.push( {
       $project: {
         storeId: '$basicDetails.storeId',
         Date: { $dateToString: { format: '%d-%m-%Y', date: '$issueDate' } },
         ticketId: 1,
         issueType: 1,
+        status: 1,
         issueStatus: '$ticketDetails.issueStatus',
         ticketType: '$ticketDetails.ticketType',
         installationStatus: '$ticketDetails.installationStatus',
@@ -94,6 +100,7 @@ export async function userTicketList( req, res ) {
         ticketId: 1,
         issueStatus: 1,
         ticketType: 1,
+        status: 1,
         issueType: 1,
         installationStatus: 1,
         infraIssue: '$primaryIssue.reasons.primaryIssue',
@@ -106,6 +113,7 @@ export async function userTicketList( req, res ) {
         Date: { $first: '$Date' },
         ticketId: { $first: '$ticketId' },
         issueType: { $first: '$issueType' },
+        status: { $first: '$status' },
         installationStatus: { $first: '$installationStatus' },
         issueStatus: { $first: '$issueStatus' },
         ticketType: { $first: '$ticketType' },
@@ -143,6 +151,7 @@ export async function userTicketList( req, res ) {
           'TICKET ID': element.ticketId,
           'STORE ID': element.storeId,
           'ISSUE': element.issueStatus,
+          'STATUS': element.status,
         } );
       } );
       await download( exportdata, res );
@@ -521,6 +530,20 @@ export async function storeInfraList( req, res ) {
       if ( installationcheck ) {
         store.ticketId = installationcheck.ticketId;
         store.status = installationcheck.ticketDetails.installationStatus;
+        if ( store.status === 'onboareded' ) {
+          store.statusDetail = 'Ready to pair';
+        }
+        if ( store.status === 'paired' ) {
+          store.statusDetail = 'Processing';
+        }
+        if ( store.status === 'installationfailed' ) {
+          if ( installationcheck.ticketActivity.length > 0 ) {
+            let issue = installationcheck.ticketActivity.filter( ( a ) => a.actionType === 'issueUpdate' );
+            if ( issue.length > 0 && issue[0].reasons.length > 0 ) {
+              store.statusDetail = issue[0].reasons[0].primaryIssue;
+            }
+          }
+        }
       } else {
         let infracheck = await findOneTangoTicket( { 'basicDetails.storeId': store.storeId, 'issueType': 'infra', 'issueDate': new Date( dayjs().format( 'YYYY-MM-DD' ) ), 'status': { $ne: 'closed' } } );
         if ( infracheck ) {

package/src/routes/clientInfra.routes.js

@@ -1,16 +1,34 @@
 
 import express from 'express';
-import { isAllowedSessionHandler } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
 import { infraCard, installationCard, InstallationIssuesTable, infraIssuesTable, hourWiseDownClients, hourWiseDownstores } from '../controllers/clientInfra.controller.js';
 
 export const clientInfraRouter = express.Router();
 
 
-clientInfraRouter.post( '/infraCard', isAllowedSessionHandler, infraCard );
-clientInfraRouter.post( '/infraIssuesTable', isAllowedSessionHandler, infraIssuesTable );
-clientInfraRouter.post( '/installationCard', isAllowedSessionHandler, installationCard );
-clientInfraRouter.post( '/InstallationIssuesTable', isAllowedSessionHandler, InstallationIssuesTable );
-clientInfraRouter.post( '/hourWiseDownClients', isAllowedSessionHandler, hourWiseDownClients );
-clientInfraRouter.post( '/hourWiseDownstores', isAllowedSessionHandler, hourWiseDownstores );
+clientInfraRouter.post( '/infraCard', isAllowedSessionHandler, authorize( {
+  userType: [ 'client' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), infraCard );
+clientInfraRouter.post( '/infraIssuesTable', isAllowedSessionHandler, authorize( {
+  userType: [ 'client' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), infraIssuesTable );
+clientInfraRouter.post( '/installationCard', isAllowedSessionHandler, authorize( {
+  userType: [ 'client' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), installationCard );
+clientInfraRouter.post( '/InstallationIssuesTable', isAllowedSessionHandler, authorize( {
+  userType: [ 'client' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), InstallationIssuesTable );
+clientInfraRouter.post( '/hourWiseDownClients', isAllowedSessionHandler, authorize( {
+  userType: [ 'client' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), hourWiseDownClients );
+clientInfraRouter.post( '/hourWiseDownstores', isAllowedSessionHandler, authorize( {
+  userType: [ 'client' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), hourWiseDownstores );
 
 

package/src/routes/infra.routes.js

@@ -1,6 +1,6 @@
 
 import express from 'express';
-import { isAllowedSessionHandler } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
 import { validateDetails, bulkvalidateDetails, validateTicket, bulkvalidateTicket, ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert } from '../validations/infra.validation.js';
 import { createTicket, bulkcreateTicket, updateStatus, createReason, PrimaryReasons, secondaryReason, updateTicketIssue, viewTicket, AlertTicketReply, uploadAttachments, updateInstallationTicket } from '../controllers/infra.controllers.js';
 
@@ -9,15 +9,40 @@ export const infraRouter = express.Router();
 
 infraRouter.post( '/createTicket', validateDetails, validateTicket, createTicket );
 infraRouter.post( '/bulkcreateTicket', bulkvalidateDetails, bulkvalidateTicket, bulkcreateTicket );
-
-infraRouter.post( '/updateStatus', isAllowedSessionHandler, ticketExists, updateStatus );
 infraRouter.post( '/createReason', createReason );
-infraRouter.get( '/PrimaryReasons', isAllowedSessionHandler, PrimaryReasons );
-infraRouter.post( '/secondaryReason', isAllowedSessionHandler, secondaryReason );
-infraRouter.post( '/updateTicketIssue', isAllowedSessionHandler, ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert, updateTicketIssue );
-infraRouter.post( '/viewTicket', isAllowedSessionHandler, ticketExists, viewTicket );
-infraRouter.post( '/AlertTicketReply', isAllowedSessionHandler, ticketExists, AlertTicketReply );
-infraRouter.put( '/uploadAttachments/:ticketId', isAllowedSessionHandler, ticketExists, uploadAttachments );
-infraRouter.post( '/updateInstallationTicket', isAllowedSessionHandler, ticketExists, updateInstallationTicket );
+infraRouter.post( '/updateStatus', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit' ] } ],
+} ), ticketExists, updateStatus );
+infraRouter.get( '/PrimaryReasons', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit' ] } ],
+} ), PrimaryReasons );
+infraRouter.post( '/secondaryReason', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit' ] },
+    { featureName: 'manage', name: 'stores', permissions: [ 'isEdit' ] },
+  ],
+} ), secondaryReason );
+infraRouter.post( '/updateTicketIssue', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit' ] } ],
+} ), ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert, updateTicketIssue );
+infraRouter.post( '/viewTicket', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), ticketExists, viewTicket );
+infraRouter.post( '/AlertTicketReply', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit', 'isView' ] } ],
+} ), ticketExists, AlertTicketReply );
+infraRouter.put( '/uploadAttachments/:ticketId', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit', 'isView' ] } ],
+} ), ticketExists, uploadAttachments );
+infraRouter.post( '/updateInstallationTicket', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit', 'isView' ] } ],
+} ), ticketExists, updateInstallationTicket );
 
 

package/src/routes/storeInfra.routes.js

@@ -1,12 +1,24 @@
 
 import express from 'express';
-import { isAllowedSessionHandler } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
 import { storeTicketList, storeTicketcard, edgeAppLogTable, viewedgeAppLog } from '../controllers/storeInfra.controlller.js';
 export const storeInfraRouter = express.Router();
 
-storeInfraRouter.post( '/storeTicketList', isAllowedSessionHandler, storeTicketList );
-storeInfraRouter.post( '/storeTicketcard', isAllowedSessionHandler, storeTicketcard );
-storeInfraRouter.post( '/edgeAppLogTable', isAllowedSessionHandler, edgeAppLogTable );
-storeInfraRouter.post( '/viewedgeAppLog', isAllowedSessionHandler, viewedgeAppLog );
+storeInfraRouter.post( '/storeTicketList', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), storeTicketList );
+storeInfraRouter.post( '/storeTicketcard', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), storeTicketcard );
+storeInfraRouter.post( '/edgeAppLogTable', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), edgeAppLogTable );
+storeInfraRouter.post( '/viewedgeAppLog', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), viewedgeAppLog );
 
 

package/src/routes/userInfra.routes.js

@@ -1,15 +1,35 @@
 import express from 'express';
-import { isAllowedSessionHandler } from 'tango-app-api-middleware';
+import { isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
 import { userTakeTicket, userTicketList, activeTicketList, basicDetails, workHistory, storeInfraList } from '../controllers/userInfra.controller.js';
 
 export const userInfraRouter = express.Router();
 
 
-userInfraRouter.post( '/userTakeTicket', isAllowedSessionHandler, userTakeTicket );
-userInfraRouter.post( '/userTicketList', isAllowedSessionHandler, userTicketList );
-userInfraRouter.post( '/activeTicketList', isAllowedSessionHandler, activeTicketList );
-userInfraRouter.post( '/basicDetails', isAllowedSessionHandler, basicDetails );
-userInfraRouter.post( '/workHistory', isAllowedSessionHandler, workHistory );
-userInfraRouter.post( '/storeInfraList', isAllowedSessionHandler, storeInfraList );
+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' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] },
+    { featureName: 'manage', name: 'stores', permissions: [ 'isView' ] },
+  ],
+} ), storeInfraList );