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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.29-dev",
+    "version": "3.0.31-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -22,8 +22,8 @@
         "handlebars": "^4.7.8",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.61",
-        "tango-app-api-middleware": "^1.0.49-dev",
+        "tango-api-schema": "^2.0.65",
+        "tango-app-api-middleware": "^1.0.51-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/storeInfra.controlller.js

@@ -133,7 +133,7 @@ export async function storeTicketcard( req, res ) {
           { 'ticketDetails.issueStatus': 'identified' },
           { issueType: 'infra' },
           { createdAt: { $gte: date.start } },
-          { createdAt: { $lte: date.start } },
+          { createdAt: { $lte: date.end } },
         ],
 
       },

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 } );
@@ -45,8 +51,8 @@ export async function userTicketList( req, res ) {
       query.push( {
         $match: {
           $and: [
-            { createdAt: { $gte: date.start } },
-            { createdAt: { $lte: date.end } },
+            { updatedAt: { $gte: date.start } },
+            { updatedAt: { $lte: date.end } },
           ],
         },
       } );

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

@@ -171,41 +171,50 @@ export async function ticketExists( req, res, next ) {
 };
 export async function infraReasonExists( req, res, next ) {
   try {
-    let primaryReason = await findOneinfraReason( { name: req.body.primary } );
-    if ( !primaryReason ) {
-      return res.sendError( 'Primary Reason Not exists in database', 500 );
-    }
-    const secondary = [];
-    const steptoReslove = [];
-    for ( let i = 0; i < req.body.secondary.length; i++ ) {
-      let secondaryReason = await findOneinfraReason( { name: req.body.secondary[i] } );
-      if ( !secondaryReason ) {
-        return res.sendError( `secondary Reason - ${req.body.secondary[i]} Not exists in database`, 500 );
+    if ( req.body.primary&&req.body.secondary&&req.body.secondary.length ) {
+      let primaryReason = await findOneinfraReason( { name: req.body.primary } );
+      if ( !primaryReason ) {
+        return res.sendError( 'Primary Reason Not exists in database', 500 );
       }
-      secondary.push( {
-        name: secondaryReason.name,
-      } );
-      let resolveSteps = [];
-      for ( let i = 0; i < secondaryReason.stepstoResolve.length; i++ ) {
-        resolveSteps.push( {
-          name: secondaryReason.stepstoResolve[i].name,
+      const secondary = [];
+      const steptoReslove = [];
+      for ( let i = 0; i < req.body.secondary.length; i++ ) {
+        let secondaryReason = await findOneinfraReason( { name: req.body.secondary[i] } );
+        if ( !secondaryReason ) {
+          return res.sendError( `secondary Reason - ${req.body.secondary[i]} Not exists in database`, 500 );
+        }
+        secondary.push( {
+          name: secondaryReason.name,
+        } );
+        let resolveSteps = [];
+        for ( let i = 0; i < secondaryReason.stepstoResolve.length; i++ ) {
+          resolveSteps.push( {
+            name: secondaryReason.stepstoResolve[i].name,
+          } );
+        }
+        steptoReslove.push( {
+          primaryIssue: secondaryReason.name,
+          secondaryIsssue: [ ...resolveSteps ],
         } );
       }
-      steptoReslove.push( {
-        primaryIssue: secondaryReason.name,
-        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: actionBy,
+        comment: req.body.comment,
+        reasons: [ {
+          primaryIssue: primaryReason.name,
+          secondaryIssue: secondary,
+        } ],
+      },
+      );
     }
-    req.body.ticketActivity.push( {
-      actionType: 'issueUpdate',
-      actionBy: 'User',
-      comment: req.body.comment,
-      reasons: [ {
-        primaryIssue: primaryReason.name,
-        secondaryIssue: secondary,
-      } ],
-    },
-    );
+
     next();
   } catch ( error ) {
     logger.error( { error: error, function: 'infraReasonExists' } );
@@ -215,27 +224,29 @@ export async function infraReasonExists( req, res, next ) {
 export async function InfrastepstoResolve( req, res, next ) {
   try {
     const steptoReslove = [];
-    for ( let i = 0; i < req.body.secondary.length; i++ ) {
-      let secondaryReason = await findOneinfraReason( { name: req.body.secondary[i] } );
-      if ( !secondaryReason ) {
-        return res.sendError( `secondary Reason - ${req.body.secondary[i]} Not exists in database`, 500 );
+    if ( req.body.primary&&req.body.secondary&&req.body.secondary.length ) {
+      for ( let i = 0; i < req.body.secondary.length; i++ ) {
+        let secondaryReason = await findOneinfraReason( { name: req.body.secondary[i] } );
+        if ( !secondaryReason ) {
+          return res.sendError( `secondary Reason - ${req.body.secondary[i]} Not exists in database`, 500 );
+        }
+        steptoReslove.push( {
+          primaryIssue: secondaryReason.name,
+          secondaryIsssue: [ ...secondaryReason.stepstoResolve ],
+        } );
       }
-      steptoReslove.push( {
-        primaryIssue: secondaryReason.name,
-        secondaryIsssue: [ ...secondaryReason.stepstoResolve ],
-      } );
-    }
-    if ( req.body.primary != 'Store Operation Issues' && req.body.primary != 'Application Issues' ) {
-      req.body.ticketActivity.push( {
-        actionType: 'stepsToResolve',
-        actionBy: 'Tango',
-        reasons: steptoReslove.map( ( item ) => ( {
-          primaryIssue: item.primaryIssue,
-          secondaryIssue: item.secondaryIsssue.map( ( issue ) => ( {
-            name: issue.name, // Assuming each object has a 'name' property
+      if ( req.body.primary != 'Store Operation Issues' && req.body.primary != 'Application Issues' ) {
+        req.body.ticketActivity.push( {
+          actionType: 'stepsToResolve',
+          actionBy: 'Tango',
+          reasons: steptoReslove.map( ( item ) => ( {
+            primaryIssue: item.primaryIssue,
+            secondaryIssue: item.secondaryIsssue.map( ( issue ) => ( {
+              name: issue.name, // Assuming each object has a 'name' property
+            } ) ),
           } ) ),
-        } ) ),
-      } );
+        } );
+      }
     }
     next();
   } catch ( error ) {
@@ -258,13 +269,29 @@ export async function InfraAlert( req, res, next ) {
       await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'hibernation': new Date( req.body.hibernationDays ) } );
     } else {
       if ( req.body.issueType == 'infra' ) {
-        let client = await findOneClient( { clientId: req.body.basicDetails.clientId }, { ticketConfigs: 1 } );
-        let statusCheckAlertTime = dayjs().add( client.ticketConfigs.statusCheckAlert, 'hours' ).format( 'YYYY-MM-DD hh:mm' );
-        req.body.ticketActivity.push( {
-          actionType: 'statusCheck',
-          actionBy: 'Tango',
-          statusCheckAlertTime: statusCheckAlertTime,
-        } );
+        if ( req.body.primary&&req.body.secondary&&req.body.secondary.length ) {
+          let client = await findOneClient( { clientId: req.body.basicDetails.clientId }, { ticketConfigs: 1 } );
+          let statusCheckAlertTime = dayjs().add( client.ticketConfigs.statusCheckAlert, 'hours' ).format( 'YYYY-MM-DD hh:mm' );
+          req.body.ticketActivity.push( {
+            actionType: 'statusCheck',
+            actionBy: 'Tango',
+            statusCheckAlertTime: statusCheckAlertTime,
+          } );
+        } else {
+          if ( req.body.comment !='' ) {
+            let actionBy = '';
+            if ( req.user.userType == 'tango' ) {
+              actionBy = 'Tango';
+            } else if ( req.user.userType == 'client' ) {
+              actionBy = 'User';
+            }
+            req.body.ticketActivity.push( {
+              actionType: 'comment',
+              actionBy: actionBy,
+              comment: req.body.comment,
+            } );
+          }
+        }
       }
     }