tango-app-api-infra 3.0.34-dev → 3.0.36-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.34-dev",
+    "version": "3.0.36-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.66",
+        "tango-api-schema": "^2.0.67",
         "tango-app-api-middleware": "^1.0.52-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/clientInfra.controller.js

@@ -63,7 +63,6 @@ export async function infraCard( req, res ) {
         ticketId: 1,
         issueStatus: '$ticketDetails.issueStatus',
         ticketType: '$ticketDetails.ticketType',
-        issueIdentifiedBy: '$ticketDetails.issueIdentifiedBy',
         primaryIssue: {
           $filter: {
             input: '$ticketActivity',
@@ -88,7 +87,7 @@ export async function infraCard( req, res ) {
         ticketId: 1,
         issueStatus: 1,
         ticketType: 1,
-        issueIdentifiedBy: 1,
+        issueIdentifiedBy: '$primaryIssue.actionBy',
         primaryIssue: '$primaryIssue.reasons.primaryIssue',
       },
     },
@@ -112,7 +111,6 @@ export async function infraCard( req, res ) {
       );
     }
     let ticketList = await aggregateTangoTicket( query );
-
     let issueList = await findinfraReason( { parentId: { '$exists': false } } );
     const categoryCounts = {};
     let response;
@@ -302,6 +300,7 @@ export async function infraIssuesTable( req, res ) {
         storeName: 1,
         createdAt: 1,
         ticketId: 1,
+        actionBy: '$primaryIssue.actionBy',
         issueIdentifiedDate: { $ifNull: [ '$issueIdentifiedDate', '-' ] },
         issueClosedDate: { $ifNull: [ '$issueClosedDate', '-' ] },
         status: 1,
@@ -315,6 +314,7 @@ export async function infraIssuesTable( req, res ) {
         storeId: { $first: '$storeId' },
         clientId: { $first: '$clientId' },
         ticketId: { $first: '$ticketId' },
+        actionBy: { $first: '$actionBy' },
         storeName: { $first: '$storeName' },
         createdAt: { $first: '$createdAt' },
         issueIdentifiedDate: { $last: '$issueIdentifiedDate' },
@@ -342,6 +342,15 @@ export async function infraIssuesTable( req, res ) {
         },
       } );
     }
+    if ( req.body.filter && req.body.filter.length > 0 ) {
+      query.push(
+          {
+            $match: {
+              actionBy: { $in: req.body.filter },
+            },
+          },
+      );
+    }
     if ( req.body.sortColumName && req.body.sortColumName !== '' && req.body.sortBy ) {
       query.push( {
         $sort: { [req.body.sortColumName]: req.body.sortBy },

package/src/controllers/infra.controllers.js

@@ -14,6 +14,7 @@ export async function createTicket( req, res ) {
       req.body.ticketActivity = [ {
         actionType: 'defaultInfra',
         actionBy: 'Tango',
+        IdentifiedBy: 'Tango',
       } ];
     }
     if ( req.body.issueType == 'installation' ) {
@@ -42,6 +43,7 @@ export async function bulkcreateTicket( req, res ) {
         data.ticketActivity = [ {
           actionType: 'defaultInfra',
           actionBy: 'Tango',
+          IdentifiedBy: 'Tango',
         } ];
       }
       if ( data.issueType == 'installation' ) {
@@ -67,6 +69,7 @@ export async function updateStatus( req, res ) {
         req.body.ticketActivity.push( {
           actionType: 'statusChange',
           actionBy: 'Tango',
+          IdentifiedBy: req.user.userName,
         } );
       }
       req.body.ticketDetails.addressingUser = req.user._id;
@@ -79,6 +82,7 @@ export async function updateStatus( req, res ) {
         req.body.ticketActivity.push( {
           actionType: 'statusChange',
           actionBy: 'User',
+          IdentifiedBy: req.user.userName,
         } );
       }
       req.body.ticketDetails.addressingClient = req.user._id;
@@ -166,9 +170,16 @@ export async function updateInstallationTicket( req, res ) {
       updateValue = { 'ticketDetails.installationStatus': req.body.installationStatus, 'status': 'inprogress' };
     }
     if ( req.body.actionType && req.body.actionType != '' ) {
+      let actionBy = '';
+      if ( req.user.userType == 'tango' ) {
+        actionBy = 'Tango';
+      } else if ( req.user.userType == 'client' ) {
+        actionBy = 'User';
+      }
       req.body.ticketActivity.push( {
         actionType: req.body.actionType,
-        actionBy: 'Tango',
+        actionBy: actionBy,
+        IdentifiedBy: actionBy == 'Tango' ? actionBy : req.user.userName,
       } );
       updateValue = { ticketActivity: req.body.ticketActivity };
     }
@@ -214,10 +225,12 @@ export async function AlertTicketReply( req, res ) {
       actionType: 'statusCheckReply',
       actionBy: 'User',
       statusCheckReply: req.body.statusCheckReply,
+      IdentifiedBy: req.user.userName,
       hibernationDays: req.body.hibernationDays,
     } );
     req.body.ticketActivity.push( {
       actionType: 'statusCheckMonitor',
+      IdentifiedBy: 'Tango',
       actionBy: 'Tango',
     } );
     await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketActivity': req.body.ticketActivity } );

package/src/controllers/userInfra.controller.js

@@ -74,6 +74,7 @@ export async function userTicketList( req, res ) {
       $project: {
         storeId: '$basicDetails.storeId',
         Date: { $dateToString: { format: '%d-%m-%Y', date: '$issueDate' } },
+        updatedAt: 1,
         ticketId: 1,
         issueType: 1,
         status: 1,
@@ -102,6 +103,7 @@ export async function userTicketList( req, res ) {
     {
       $project: {
         storeId: 1,
+        updatedAt: 1,
         Date: 1,
         ticketId: 1,
         issueStatus: 1,
@@ -116,6 +118,7 @@ export async function userTicketList( req, res ) {
       $group: {
         _id: '$ticketId',
         storeId: { $first: '$storeId' },
+        updatedAt: { $first: '$updatedAt' },
         Date: { $first: '$Date' },
         ticketId: { $first: '$ticketId' },
         issueType: { $first: '$issueType' },
@@ -426,6 +429,7 @@ export async function storeInfraList( req, res ) {
       {
         $project: {
           storeId: 1,
+          clientId: 1,
           storeName: 1,
           storeProfile: 1,
           status: 1,
@@ -443,6 +447,7 @@ export async function storeInfraList( req, res ) {
           _id: '$storeId',
           store: { $first: '$_id' },
           storeId: { $first: '$storeId' },
+          clientId: { $first: '$clientId' },
           storeName: { $first: '$storeName' },
           status: { $first: '$status' },
           progress: { $first: '$progress' },

package/src/validations/infra.validation.js

@@ -171,7 +171,7 @@ export async function ticketExists( req, res, next ) {
 };
 export async function infraReasonExists( req, res, next ) {
   try {
-    if ( req.body.primary&&req.body.secondary&&req.body.secondary.length ) {
+    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 );
@@ -206,6 +206,7 @@ export async function infraReasonExists( req, res, next ) {
       req.body.ticketActivity.push( {
         actionType: 'issueUpdate',
         actionBy: actionBy,
+        IdentifiedBy: req.user.userName,
         comment: req.body.comment,
         reasons: [ {
           primaryIssue: primaryReason.name,
@@ -213,8 +214,29 @@ export async function infraReasonExists( req, res, next ) {
         } ],
       },
       );
+    } else {
+      if ( req.body.primary == 'Application Issues' ) {
+        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,
+          IdentifiedBy: req.user.userName,
+          comment: req.body.comment,
+          reasons: [ {
+            primaryIssue: req.body.primary,
+            secondaryIssue: [],
+          } ],
+        },
+        );
+      }
     }
 
+
     next();
   } catch ( error ) {
     logger.error( { error: error, function: 'infraReasonExists' } );
@@ -224,7 +246,7 @@ export async function infraReasonExists( req, res, next ) {
 export async function InfrastepstoResolve( req, res, next ) {
   try {
     const steptoReslove = [];
-    if ( req.body.primary&&req.body.secondary&&req.body.secondary.length ) {
+    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 ) {
@@ -239,6 +261,7 @@ export async function InfrastepstoResolve( req, res, next ) {
         req.body.ticketActivity.push( {
           actionType: 'stepsToResolve',
           actionBy: 'Tango',
+          IdentifiedBy: 'Tango',
           reasons: steptoReslove.map( ( item ) => ( {
             primaryIssue: item.primaryIssue,
             secondaryIssue: item.secondaryIsssue.map( ( issue ) => ( {
@@ -263,38 +286,42 @@ export async function InfraAlert( req, res, next ) {
       await updateOneStore( { storeId: req.body.basicDetails.storeId }, { 'ticketConfigs.hibernation': new Date( req.body.hibernationDays ) } );
       req.body.ticketActivity.push( {
         actionType: 'statusCheckReply',
-        actionBy: 'Tango',
+        actionBy: 'User',
+        IdentifiedBy: req.user.userName,
         hibernationDays: req.body.hibernationDays,
       } );
       await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'hibernation': new Date( req.body.hibernationDays ) } );
     } else {
       if ( req.body.issueType == 'infra' ) {
-        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' );
+        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',
+          timeStamp: statusCheckAlertTime,
+          actionBy: 'Tango',
+          IdentifiedBy: 'Tango',
+          statusCheckAlertTime: statusCheckAlertTime,
+        } );
+      }
+      if ( req.body.comment != '' && !req.body.secondary||req.body.secondary.length == 0 ) {
+        let actionBy = '';
+        if ( req.user.userType == 'tango' ) {
+          actionBy = 'Tango';
+        } else if ( req.user.userType == 'client' ) {
+          actionBy = 'User';
+        }
+        if ( req.body.comment != '' ) {
           req.body.ticketActivity.push( {
-            actionType: 'statusCheck',
-            actionBy: 'Tango',
-            statusCheckAlertTime: statusCheckAlertTime,
+            actionType: 'comment',
+            actionBy: actionBy,
+            IdentifiedBy: req.user.userName,
+            comment: req.body.comment,
           } );
-        } 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,
-            } );
-          }
         }
       }
     }
 
+
     next();
   } catch ( error ) {
     logger.error( { error: error, function: 'InfraAlert' } );