tango-app-api-infra 3.0.29-dev → 3.0.30-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.29-dev",
+    "version": "3.0.30-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -22,7 +22,7 @@
         "handlebars": "^4.7.8",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.61",
+        "tango-api-schema": "^2.0.65",
         "tango-app-api-middleware": "^1.0.49-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/infra.controllers.js

@@ -62,15 +62,30 @@ export async function bulkcreateTicket( req, res ) {
 
 export async function updateStatus( req, res ) {
   try {
-    if ( req.body.status == 'inprogress' ) {
-      req.body.ticketActivity.push( {
-        actionType: 'statusChange',
-        actionBy: 'User',
-      } );
-    }
-    let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, req.body );
-    if ( updateTicket ) {
-      res.sendSuccess( 'Ticket Updated Successfully' );
+    if ( req.user.userType == 'tango' ) {
+      if ( req.body.status == 'inprogress' ) {
+        req.body.ticketActivity.push( {
+          actionType: 'statusChange',
+          actionBy: 'Tango',
+        } );
+      }
+      req.body.ticketDetails.addressingUser = req.user._id;
+      let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, req.body );
+      if ( updateTicket ) {
+        res.sendSuccess( 'Ticket Updated Successfully' );
+      }
+    } else if ( req.user.userType == 'client' ) {
+      if ( req.body.status == 'inprogress' ) {
+        req.body.ticketActivity.push( {
+          actionType: 'statusChange',
+          actionBy: 'User',
+        } );
+      }
+      req.body.ticketDetails.addressingClient = req.user._id;
+      let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, req.body );
+      if ( updateTicket ) {
+        res.sendSuccess( 'Ticket Updated Successfully' );
+      }
     }
   } catch ( error ) {
     logger.error( { error: error, function: 'updateStatus' } );

package/src/controllers/internalInfra.controller.js

@@ -116,7 +116,7 @@ export async function downStoresList( req, res ) {
 }
 export async function openTicketList( req, res ) {
   try {
-    let openTicketList = await findTangoTicket( { status: { $ne: 'closed' }, issueType: 'infra' }, { ticketId: 1, basicDetails: 1, createdAt: 1, updateAt: 1, ticketDetails: 1 } );
+    let openTicketList = await findTangoTicket( { status: { $ne: 'closed' } }, { ticketId: 1, basicDetails: 1, createdAt: 1, updateAt: 1, ticketDetails: 1 } );
     if ( openTicketList.length ) {
       res.sendSuccess( {
         count: openTicketList.length,

package/src/controllers/userInfra.controller.js

@@ -12,9 +12,15 @@ export async function userTakeTicket( req, res ) {
   try {
     let userTicket = '';
     if ( req.body.issueType == 'infra' ) {
-      userTicket = await findOneTangoTicket( { 'status': { $ne: 'closed' }, 'issueType': 'infra', 'ticketDetails.assigntoUser': true, 'ticketDetails.addressingUser': { $exists: false } } );
+      userTicket = await findOneTangoTicket( { 'status': { $ne: 'closed' }, 'issueType': 'infra', 'ticketDetails.assigntoUser': true, 'ticketDetails.addressingUser': { $exists: false }, 'ticketDetails.issueStatus': 'notidentified', 'ticketDetails.addressingClient': { $exists: false } } );
+      if ( !userTicket ) {
+        userTicket = await findOneTangoTicket( { 'status': { $ne: 'closed' }, 'issueType': 'infra', 'ticketType': 'refreshticket', 'ticketDetails.refreshTicketStatus': 'notidentified' } );
+      }
     } else if ( req.body.issueType == 'installation' ) {
-      userTicket = await findOneTangoTicket( { 'status': { $ne: 'closed' }, 'issueType': 'installation', 'ticketDetails.addressingUser': { $exists: false } } );
+      userTicket = await findOneTangoTicket( { 'status': { $ne: 'closed' }, 'issueType': 'installation', 'ticketDetails.addressingUser': { $exists: false }, 'ticketDetails.issueStatus': 'notidentified', 'ticketDetails.addressingClient': { $exists: false } } );
+      if ( !userTicket ) {
+        userTicket = await findOneTangoTicket( { 'status': { $ne: 'closed' }, 'issueType': 'installation', 'ticketType': 'refreshticket', 'ticketDetails.refreshTicketStatus': 'notidentified' } );
+      }
     }
     if ( userTicket ) {
       let assignTicket = await updateOneTangoTicket( { ticketId: userTicket.ticketId }, { 'ticketDetails.addressingUser': req.body.userId } );

package/src/routes/clientInfra.routes.js

@@ -7,27 +7,27 @@ export const clientInfraRouter = express.Router();
 
 
 clientInfraRouter.post( '/infraCard', isAllowedSessionHandler, authorize( {
-  userType: [ 'client' ], access: [
+  userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), infraCard );
 clientInfraRouter.post( '/infraIssuesTable', isAllowedSessionHandler, authorize( {
-  userType: [ 'client' ], access: [
+  userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), infraIssuesTable );
 clientInfraRouter.post( '/installationCard', isAllowedSessionHandler, authorize( {
-  userType: [ 'client' ], access: [
+  userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), installationCard );
 clientInfraRouter.post( '/InstallationIssuesTable', isAllowedSessionHandler, authorize( {
-  userType: [ 'client' ], access: [
+  userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), InstallationIssuesTable );
 clientInfraRouter.post( '/hourWiseDownClients', isAllowedSessionHandler, authorize( {
-  userType: [ 'client' ], access: [
+  userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), hourWiseDownClients );
 clientInfraRouter.post( '/hourWiseDownstores', isAllowedSessionHandler, authorize( {
-  userType: [ 'client' ], access: [
+  userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), hourWiseDownstores );
 

package/src/validations/infra.validation.js

@@ -196,9 +196,15 @@ export async function infraReasonExists( req, res, next ) {
         secondaryIsssue: [ ...resolveSteps ],
       } );
     }
+    let actionBy = '';
+    if ( req.user.userType == 'tango' ) {
+      actionBy = 'Tango';
+    } else if ( req.user.userType == 'client' ) {
+      actionBy = 'User';
+    }
     req.body.ticketActivity.push( {
       actionType: 'issueUpdate',
-      actionBy: 'User',
+      actionBy: actionBy,
       comment: req.body.comment,
       reasons: [ {
         primaryIssue: primaryReason.name,