tango-app-api-infra 3.0.63-dev → 3.0.64-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.63-dev",
+    "version": "3.0.64-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/infra.controllers.js

@@ -125,33 +125,28 @@ export async function bulkcreateTicket( req, res ) {
 
 export async function updateStatus( req, res ) {
   try {
-    console.log( req.user.userType );
     if ( req.user.userType == 'tango' ) {
-      if ( req.body.status == 'inprogress' ) {
-        req.body.ticketActivity.push( {
-          actionType: 'statusChange',
-          timeStamp: new Date(),
-          actionBy: 'Tango',
-          IdentifiedBy: req.user.userName,
-        } );
-        req.body.status ='inprogress';
-      }
+      req.body.ticketActivity.push( {
+        actionType: 'statusChange',
+        timeStamp: new Date(),
+        actionBy: 'Tango',
+        IdentifiedBy: req.user.userName,
+      } );
+      req.body.status = 'inprogress';
       req.body.ticketDetails.addressingUser = req.user._id;
-      console.log( req.body );
       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',
-          timeStamp: new Date(),
-          actionBy: 'User',
-          IdentifiedBy: req.user.userName,
-        } );
-        req.body.status ='inprogress';
-      }
+      req.body.ticketActivity.push( {
+        actionType: 'statusChange',
+        timeStamp: new Date(),
+        actionBy: 'User',
+        IdentifiedBy: req.user.userName,
+      } );
+      req.body.status = 'inprogress';
+
       req.body.ticketDetails.addressingClient = req.user._id;
       let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, req.body );
       if ( updateTicket ) {
@@ -1280,13 +1275,12 @@ export async function storeFilter( req, res ) {
     const uniqueStoreIds = [ ...new Set( stores.map( ( store ) => store.basicDetails.storeId ) ) ];
     const uniqueStoreObjects = uniqueStoreIds.map( ( storeId ) => ( { 'storeId': storeId } ) );
 
-    if ( uniqueStoreObjects.length>0 ) {
+    if ( uniqueStoreObjects.length > 0 ) {
       res.sendSuccess( { count: uniqueStoreObjects.length, data: uniqueStoreObjects } );
     } else {
       res.sendError( 'No data', 204 );
     }
   } catch ( error ) {
-    // console.log( error );
     logger.error( { error: error, function: 'storeFilter' } );
     return res.sendError( error, 500 );
   }

package/src/controllers/internalInfra.controller.js

@@ -468,6 +468,13 @@ export async function infraReportSent( req, res ) {
         status: 1,
         ticketDetails: 1,
         issueClosedDate: 1,
+        otherscomment: {
+          $filter: {
+            input: '$ticketActivity',
+            as: 'item',
+            cond: { $eq: [ '$$item.actionType', 'comment' ] },
+          },
+        },
         primaryIssue: {
           $filter: {
             input: '$ticketActivity',
@@ -477,6 +484,11 @@ export async function infraReportSent( req, res ) {
         },
       },
     },
+    {
+      $unwind: {
+        path: '$otherscomment', preserveNullAndEmptyArrays: true,
+      },
+    },
     {
       $unwind: {
         path: '$primaryIssue', preserveNullAndEmptyArrays: true,
@@ -500,6 +512,8 @@ export async function infraReportSent( req, res ) {
         status: 1,
         ticketDetails: 1,
         issueClosedDate: 1,
+        ommentText: { $ifNull: [ '$primaryIssue.comment', '-' ] },
+        otherscomment: { $ifNull: [ '$otherscomment.comment', '-' ] },
         primaryIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '-' ] },
         secondaryIssue: { $ifNull: [ '$primaryIssue.reasons.secondaryIssue.name', '-' ] },
       },
@@ -510,11 +524,12 @@ export async function infraReportSent( req, res ) {
         ticketDetails: { $first: '$ticketDetails' },
         issueClosedDate: { $first: '$issueClosedDate' },
         basicDetails: { $first: '$basicDetails' },
+        commentText: { $last: '$commentText' },
         primaryIssue: { $last: '$primaryIssue' },
         secondaryIssue: { $last: '$secondaryIssue' },
+        otherscomment: { $last: '$otherscomment' },
         createdAt: { $first: '$createdAt' },
         status: { $last: '$status' },
-
       },
     },
     ];
@@ -527,7 +542,7 @@ export async function infraReportSent( req, res ) {
       exportdata.push( {
         'Client ID': element.basicDetails.clientId,
         'Client Name': element.basicDetails.clientName,
-        'Ticket Created Date & Time': dayjs( element.createdAt ).format( 'YYYY-MM-DD HH:mm A' ),
+        'Ticket Created Date & Time': dayjs( element.createdAt ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm A' ),
         'Store ID': element.basicDetails.storeId,
         'Store Name': element.basicDetails.storeName,
         'Issue ': element.primaryIssue,
@@ -535,9 +550,12 @@ export async function infraReportSent( req, res ) {
         'Status ': element.status,
         'Responded By': clientuser && clientuser.userName ? clientuser.userName : '-',
         'Resolved By': tangouser && tangouser.userName ? tangouser.userName : '-',
-        'Ticket Closed Date & Time': element.issueClosedDate ? dayjs( element.issueClosedDate ).format( 'YYYY-MM-DD HH:mm A' ) : '-',
-        'Latest Comment': '',
-        'Activity Log': `${appConfig.url.domain+'/manage/stores/infra-ticket?storeId='+element.basicDetails.storeId}`,
+        'Ticket Closed Date & Time': element.issueClosedDate ? dayjs( element.issueClosedDate ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm A' ) : '-',
+        'Latest Comment': element.otherscomment?element.otherscomment:element.commentText,
+        'Activity Log': {
+          label: 'Link',
+          url: `${appConfig.url.domain+'/manage/stores/infra-ticket?storeId='+element.basicDetails.storeId}`,
+        },
       } );
     }
 
@@ -574,30 +592,13 @@ export async function infraReportSent( req, res ) {
     }
     let reportdate = dayjs().format( 'YYYY-MM-DD' );
     let attachments = null;
-    if ( exportdata.length > 0 ) {
-      const wb = new xl.Workbook();
-      const ws = wb.addWorksheet( 'Daily report' );
-      const headers = Object.keys( exportdata[0] );
-
-      for ( let i = 0; i < headers.length; i++ ) {
-        ws.cell( 1, i + 1 ).string( headers[i] );
-      };
-      for ( let i = 0; i < exportdata.length; i++ ) {
-        const dataRow = exportdata[i];
-        for ( let j = 0; j < headers.length; j++ ) {
-          const header = headers[j];
-          const value = dataRow[header];
-          ws.cell( i + 2, j + 1 ).string( value?.toString() );
-        }
-      }
-      let buffer = await wb.writeToBuffer();
+    let buffer = await download( exportdata );
+    attachments = {
+      filename: `dailyInfraReport- ${reportdate}.xlsx`,
+      content: buffer,
+      contentType: 'application/xlsx', // e.g., 'application/pdf'
+    };
 
-      attachments = {
-        filename: `dailyInfraReport- ${reportdate}.xlsx`,
-        content: buffer,
-        contentType: 'application/xlsx', // e.g., 'application/pdf'
-      };
-    }
 
     const subject = `Daily Digest - Infra Downtime Report - ${reportdate}`;
     const fileContent = readFileSync( join() + '/src/hbs/dailyInfraReport.hbs', 'utf8' );
@@ -724,8 +725,7 @@ export async function download( data ) {
     for ( let j = 0; j < headers.length; j++ ) {
       const header = headers[j];
       const value = dataRow[header];
-
-      if ( typeof value === 'object' && value.hasOwnProperty( 'label' ) && value.hasOwnProperty( 'url' ) ) {
+      if ( value&& typeof value === 'object' && value.hasOwnProperty( 'label' ) && value.hasOwnProperty( 'url' ) ) {
         ws.cell( i + 2, j + 1 ).link( value.url );
         ws.cell( i + 2, j + 1 ).string( value.label );
       } else {
@@ -884,11 +884,9 @@ export async function edgeApplogsCheck( req, res ) {
       let findissueEdgeApp = {};
       if ( result.length>0 ) {
         for ( let findissue of result ) {
-          // console.log( ticket.ticketId );
           const istTimestamp = dayjs.utc( ticket.createdAt ).tz( 'Asia/Kolkata' ).format( 'HH:mm:ss' );
 
           if ( findissue.code == '1003' ) {
-          // Compare the times
             const occurringTimeParsed = dayjs( `${req.body.date} ${findissue.edgelog.occuringTime}` );
             const ticketCreatedParsed = dayjs( `${req.body.date} ${istTimestamp}` );
             const isOccurringTimeEarlier = occurringTimeParsed.isBefore( ticketCreatedParsed );
@@ -902,7 +900,6 @@ export async function edgeApplogsCheck( req, res ) {
               };
               updateIssue( findissueEdgeApp );
               finalresult.push( findissueEdgeApp );
-            // console.log( findissueEdgeApp );
             }
           } else if ( findissue.code == '1024' ) {
             const occurringTimeParsed = dayjs( `${req.body.date} ${findissue.edgelog.data.occuringTime}` );
@@ -938,7 +935,6 @@ export async function edgeApplogsCheck( req, res ) {
               };
               updateIssue( findissueEdgeApp );
               finalresult.push( findissueEdgeApp );
-            // console.log( findissueEdgeApp );
             }
           } else if ( findissue.code ==='1005' ) {
             const occurringTimeParsed = dayjs( `${req.body.date} ${findissue.edgelog.occuringTime}` );
@@ -954,7 +950,6 @@ export async function edgeApplogsCheck( req, res ) {
               };
               updateIssue( findissueEdgeApp );
               finalresult.push( findissueEdgeApp );
-            // console.log( findissueEdgeApp );
             }
           }
         }
@@ -1054,7 +1049,6 @@ export async function updateIssue( data ) {
       'status': 'inprogress',
     };
     await updateOneTangoTicket( { ticketId: data.ticketId }, query );
-    // console.log( data );
   } catch ( error ) {
     logger.error( { error: error, function: 'updateAutomaticIssue' } );
     res.sendError( error, 500 );

package/src/controllers/storeInfra.controlller.js

@@ -28,7 +28,20 @@ export async function storeTicketList( req, res ) {
         ticketId: 1,
         issueStatus: '$ticketDetails.issueStatus',
         ticketType: '$ticketDetails.ticketType',
-        comments: { $size: '$ticketActivity' },
+        otherscomment: {
+          $filter: {
+            input: '$ticketActivity',
+            as: 'item',
+            cond: { $eq: [ '$$item.actionType', 'comment' ] },
+          },
+        },
+        comments: {
+          $filter: {
+            input: '$ticketActivity',
+            as: 'item',
+            cond: { $ne: [ '$$item.actionType', 'statusChange' ] },
+          },
+        },
         primaryIssue: {
           $filter: {
             input: '$ticketActivity',
@@ -43,11 +56,21 @@ export async function storeTicketList( req, res ) {
         path: '$primaryIssue', preserveNullAndEmptyArrays: true,
       },
     },
+    {
+      $unwind: {
+        path: '$otherscomment', preserveNullAndEmptyArrays: true,
+      },
+    },
     {
       $unwind: {
         path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
       },
     },
+    {
+      $unwind: {
+        path: '$primaryIssue.reasons.secondaryIssue', preserveNullAndEmptyArrays: true,
+      },
+    },
     {
       $project: {
         storeId: 1,
@@ -57,10 +80,12 @@ export async function storeTicketList( req, res ) {
         ticketId: 1,
         issueStatus: 1,
         ticketType: 1,
-        comments: 1,
+        comments: { $size: '$comments' },
         issueDate: 1,
+        commentText: '$primaryIssue.comment',
         primaryIssue: '$primaryIssue.reasons.primaryIssue',
-        secondaryIssue: '$primaryIssue.reasons.secondaryIssue',
+        secondaryIssue: '$primaryIssue.reasons.secondaryIssue.name',
+        otherscomment: '$otherscomment.comment',
       },
     },
     {
@@ -75,8 +100,11 @@ export async function storeTicketList( req, res ) {
         issueStatus: { $first: '$issueStatus' },
         ticketType: { $first: '$ticketType' },
         comments: { $first: '$comments' },
+        commentText: { $last: '$commentText' },
         primaryIssue: { $last: '$primaryIssue' },
         secondaryIssue: { $last: '$secondaryIssue' },
+        otherscomment: { $last: '$otherscomment' },
+
       },
     },
     {
@@ -102,8 +130,10 @@ export async function storeTicketList( req, res ) {
           'TICKET ID': element.ticketId,
           'DATE': element.Date,
           'ISSUE CLOSED DATE': element.issueClosedDate,
-          'ISSUE': element.primaryIssue,
+          'PRIMARY ISSUE': element.primaryIssue,
+          'SECONDARY ISSUE': element.secondaryIssue,
           'STATUS': element.status,
+          'COMMENT': element.otherscomment?element.otherscomment:element.commentText,
         } );
       } );
       await download( exportdata, res );
@@ -330,7 +360,6 @@ export async function edgeAppLogTable( req, res ) {
       };
       const downtime = await getOpenSearchData( 'live_downtime_hourly', downTimeQuery );
       let streamwiseDowntime = downtime.body.hits.hits.length > 0 ? downtime.body.hits.hits[0]._source.doc.streamwise_downtime : [];
-      // console.log( obj.hour, streamwiseDowntime );
       if ( streamwiseDowntime.length > 0 ) {
         const sum = streamwiseDowntime.reduce( ( accumulator, currentValue ) => {
           return accumulator + currentValue.down_time;

package/src/controllers/userInfra.controller.js

@@ -113,6 +113,7 @@ export async function userTicketList( req, res ) {
       query.push( {
         $match: {
           $and: [
+            { 'basicDetails.clientId': { $in: req.body.clientId } },
             { issueType: req.body.issueType },
             { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
           ],
@@ -122,6 +123,7 @@ export async function userTicketList( req, res ) {
       query.push( {
         $match: {
           $and: [
+            { 'basicDetails.clientId': { $in: req.body.clientId } },
             { issueType: { $in: [ 'highcount', 'lowcount' ] } },
             { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
           ],
@@ -334,6 +336,7 @@ export async function workHistory( req, res ) {
       query.push( {
         $match: {
           $and: [
+            { 'basicDetails.clientId': { $in: req.body.clientId } },
             { 'status': 'closed' },
             { issueType: req.body.issueType },
             { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
@@ -344,6 +347,7 @@ export async function workHistory( req, res ) {
       query.push( {
         $match: {
           $and: [
+            { 'basicDetails.clientId': { $in: req.body.clientId } },
             { 'status': 'closed' },
             { issueType: { $in: [ 'highcount', 'lowcount' ] } },
             { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
@@ -443,6 +447,7 @@ export async function workHistory( req, res ) {
             issueClosedDate: 1,
             ticketId: 1,
             issueStatus: 1,
+            status: 1,
             ticketType: 1,
             infraIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '' ] },
           },

package/src/validations/infra.validation.js

@@ -202,8 +202,6 @@ export async function validateTicketstatus( req, res, next ) {
         if ( req.body.status == 'closed' ) {
           return res.sendSuccess( 'Ticket already closed' );
         }
-        console.log( req.body.ticketDetails );
-
         if ( req.body.ticketDetails.ticketType==='firsttimeticket'&&req.body.ticketDetails.issueStatus==='identified' ) {
           return res.sendSuccess( 'Ticket already Addressed' );
         }