tango-app-api-infra 3.1.34-beta.45 → 3.1.34-beta.46

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.34-beta.45",
+    "version": "3.1.34-beta.46",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/clientInfra.controller.js

@@ -210,18 +210,18 @@ export async function infraCard( req, res ) {
     } );
     response.unshift( {
       name: 'All Issues',
-      count: infraStoreCount.length > 0 ? infraStoreCount[0].notidentifiedcount+ticketList.length: 0,
+      count: infraStoreCount.length > 0 ? req.body.filter && req.body.filter.length > 0?ticketList.length:( infraStoreCount[0].notidentifiedcount+ticketList.length ): 0,
     } );
     response.push( {
       name: 'Issues Not Identified',
-      count: infraStoreCount.length > 0 ? infraStoreCount[0].notidentifiedcount : 0,
+      count: infraStoreCount.length > 0 ?( req.body.filter && req.body.filter.length > 0 )?0: infraStoreCount[0].notidentifiedcount : 0,
     } );
     res.sendSuccess( {
       total: storeCount,
       liveStoreCount: infraStoreCount.length > 0 ? storeCount - infraStoreCount[0].infraCount : storeCount,
       infraStoreCount: infraStoreCount.length > 0 ? infraStoreCount[0].notidentifiedcount+ticketList.length : 0,
       identifiedcount: infraStoreCount.length > 0 ? ticketList.length : 0,
-      notidentifiedcount: infraStoreCount.length > 0 ? infraStoreCount[0].notidentifiedcount : 0,
+      notidentifiedcount: infraStoreCount.length > 0 ?( req.body.filter && req.body.filter.length > 0 )?0: infraStoreCount[0].notidentifiedcount : 0,
       infraIssues: response,
     } );
   } catch ( error ) {
@@ -586,7 +586,7 @@ export async function infraIssuesTable( req, res ) {
 
 
     if ( req.body.filter && req.body.filter.length > 0 ) {
-      req.body.filter.push( '' );
+      // req.body.filter.push( '' );
       query.push(
           {
             $match: {

package/src/controllers/infra.controllers.js

@@ -874,7 +874,7 @@ export async function OutsideUserListv2( req, res ) {
       query.push( {
         $match: {
           $or: [
-            { userName: { $regex: req.body.searchValue, $options: 'i' } },
+            { name: { $regex: req.body.searchValue, $options: 'i' } },
             { email: { $regex: req.body.searchValue, $options: 'i' } },
           ],
         },
@@ -899,7 +899,6 @@ export async function OutsideUserListv2( req, res ) {
     const result = await aggregatemailonlyuser( query );
 
     for ( let data of result ) {
-      console.log( data );
       let storelist = data.clusters.map( ( data ) => data.storeId );
       data.Finalstores = [ ...data.stores, ...storelist ];
       data.Finalstores = [ ...new Set( data.Finalstores ) ];
@@ -1581,6 +1580,14 @@ export async function infraTable( req, res ) {
         refreshTicketStatus: '$ticketDetails.refreshTicketStatus',
         status: 1,
         createdAt: 1,
+        issueClosedDate: 1,
+        issueTime: {
+          $dateToString: {
+            format: '%H:%M',
+            date: '$createdAt',
+            timezone: 'Asia/Kolkata', // Replace with your desired timezone
+          },
+        },
         issueDate: 1,
         addressingUser: { $toObjectId: '$ticketDetails.addressingUser' },
         primaryIssue: {
@@ -1636,6 +1643,8 @@ export async function infraTable( req, res ) {
         addressingUser: 1,
         ticketStatus: 1,
         ticketType: 1,
+        issueTime: 1,
+        issueClosedDate: 1,
         refreshTicketStatus: 1,
         ticketId: 1,
         issueDate: { $ifNull: [ '$issueDate', '' ] },
@@ -1685,6 +1694,8 @@ export async function infraTable( req, res ) {
         storeName: { $first: '$storeName' },
         ticketStatus: { $first: '$ticketStatus' },
         ticketType: { $first: '$ticketType' },
+        issueTime: { $first: '$issueTime' },
+        issueClosedDate: { $first: '$issueClosedDate' },
         refreshTicketStatus: { $first: '$refreshTicketStatus' },
         userName: { $first: { $ifNull: [ '$user.userName', '-' ] } },
         userEmail: { $first: { $ifNull: [ '$user.email', '-' ] } },
@@ -1836,6 +1847,8 @@ export async function infraTable( req, res ) {
           exportdata.push( {
             'Ticket ID': element.ticketId,
             'Created Date': dayjs( element.issueDate ).format( 'DD MMM, YYYY' ),
+            'Created Time': dayjs( element.createdAt ).format( 'hh:mm a' ),
+            'Closed Time': element.issueClosedDate? dayjs( element.issueClosedDate ).format( 'hh:mm a' ):'--',
             'Brand Name': element.clientName,
             'Brand ID': element.clientId,
             'Store Name': element.storeName,

package/src/controllers/internalInfra.controller.js

@@ -168,63 +168,66 @@ export async function updateRefreshTicket( req, res ) {
   try {
     for ( let ticket of req.body.TicketList ) {
       let getTicket = await findOneTangoTicket( { ticketId: ticket.ticketId } );
-      await updateOneTangoTicket( { ticketId: ticket.ticketId }, { 'ticketDetails.ticketType': 'refreshticket', 'ticketDetails.refreshTicketStatus': 'notidentified' } );
-      await updateOneTangoTicketunset( { ticketId: ticket.ticketId }, { 'ticketDetails.addressingUser': 1 } );
-      if ( getTicket && getTicket.basicDetails ) {
-        let getclient = await findOneClient( { clientId: getTicket.basicDetails.clientId } );
-        if ( getclient && getclient.ticketConfigs && getclient.ticketConfigs.emailAlert ) {
-          let downTimeQuery = {
-            'size': 1,
-            'query': {
-              'bool': {
-                'must': [
-                  {
-                    'term': {
-                      'doc.date.keyword': dayjs( getTicket.issueDate ).format( 'DD-MM-YYYY' ),
+      let findStore = await findOneStore( { storeId: getTicket.basicDetails.storeId, status: 'active' } );
+      if ( findStore ) {
+        await updateOneTangoTicket( { ticketId: ticket.ticketId }, { 'ticketDetails.ticketType': 'refreshticket', 'ticketDetails.refreshTicketStatus': 'notidentified' } );
+        await updateOneTangoTicketunset( { ticketId: ticket.ticketId }, { 'ticketDetails.addressingUser': 1 } );
+        if ( getTicket && getTicket.basicDetails ) {
+          let getclient = await findOneClient( { clientId: getTicket.basicDetails.clientId } );
+          if ( getclient && getclient.ticketConfigs && getclient.ticketConfigs.emailAlert ) {
+            let downTimeQuery = {
+              'size': 1,
+              'query': {
+                'bool': {
+                  'must': [
+                    {
+                      'term': {
+                        'doc.date.keyword': dayjs( getTicket.issueDate ).format( 'DD-MM-YYYY' ),
+                      },
                     },
-                  },
-                  {
-                    'term': {
-                      'doc.store_id.keyword': getTicket.basicDetails.storeId,
+                    {
+                      'term': {
+                        'doc.store_id.keyword': getTicket.basicDetails.storeId,
+                      },
                     },
-                  },
 
-                ],
+                  ],
 
+                },
               },
-            },
-          };
-          let downtimetotal;
-          const downtime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly, downTimeQuery );
-          let streamwiseDowntime = downtime.body.hits.hits.length > 0 ? downtime.body.hits.hits[0]._source.doc.streamwise_downtime : [];
-          if ( streamwiseDowntime.length > 0 ) {
-            const sum = streamwiseDowntime.reduce( ( accumulator, currentValue ) => {
-              return accumulator + currentValue.down_time;
-            }, 0 );
-            const average = sum / streamwiseDowntime.length;
-            downtimetotal = Math.round( average );
-          } else {
-            downtimetotal = 0;
-          }
-          let Timestamp = dayjs().format( 'YYYY-MM-DD HH:mm' );
-          const attachments = null;
-          const subject = `Tango Eye - Infra Ticket Closed for ${getTicket.basicDetails.storeName} `;
-          const fileContent = readFileSync( join() + '/src/hbs/refreshTicket.hbs', 'utf8' );
-          const htmlContent = handlebars.compile( fileContent );
-          let store = await findOneStore( { storeId: getTicket.basicDetails.storeId } );
-          if ( store.spocDetails && store.spocDetails.length > 0 ) {
-            let spocEmail = store.spocDetails[0].email;
-            let spocName = store.spocDetails[0].name;
-            let Issue = getTicket.ticketActivity.filter( ( a ) => a.actionType == 'issueUpdate' );
-            let primaryIssue = 'Not Identified';
-            if ( Issue.length > 0 && Issue[0].reasons.length > 0 ) {
-              primaryIssue = Issue[0].reasons[0].primaryIssue;
+            };
+            let downtimetotal;
+            const downtime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly, downTimeQuery );
+            let streamwiseDowntime = downtime.body.hits.hits.length > 0 ? downtime.body.hits.hits[0]._source.doc.streamwise_downtime : [];
+            if ( streamwiseDowntime.length > 0 ) {
+              const sum = streamwiseDowntime.reduce( ( accumulator, currentValue ) => {
+                return accumulator + currentValue.down_time;
+              }, 0 );
+              const average = sum / streamwiseDowntime.length;
+              downtimetotal = Math.round( average );
+            } else {
+              downtimetotal = 0;
             }
-            let Uidomain = `${JSON.parse( process.env.URL ).domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
+            let Timestamp = dayjs().format( 'YYYY-MM-DD HH:mm' );
+            const attachments = null;
+            const subject = `Tango Eye - Infra Ticket Closed for ${getTicket.basicDetails.storeName} `;
+            const fileContent = readFileSync( join() + '/src/hbs/refreshTicket.hbs', 'utf8' );
+            const htmlContent = handlebars.compile( fileContent );
+            let store = await findOneStore( { storeId: getTicket.basicDetails.storeId } );
+            if ( store.spocDetails && store.spocDetails.length > 0 ) {
+              let spocEmail = store.spocDetails[0].email;
+              let spocName = store.spocDetails[0].name;
+              let Issue = getTicket.ticketActivity.filter( ( a ) => a.actionType == 'issueUpdate' );
+              let primaryIssue = 'Not Identified';
+              if ( Issue.length > 0 && Issue[0].reasons.length > 0 ) {
+                primaryIssue = Issue[0].reasons[0].primaryIssue;
+              }
+              let Uidomain = `${JSON.parse( process.env.URL ).domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
 
-            const html = htmlContent( { ...getTicket, Uidomain: Uidomain, primary: primaryIssue, storeName: getTicket.basicDetails.storeName, hibernation: '', spocName: spocName, date: dayjs( getTicket.issueDate ).format( 'YYYY-MM-DD' ), downtimetotal: downtimetotal, Timestamp: Timestamp, domain: JSON.parse( process.env.URL ).apiDomain } );
-            if ( spocEmail && isValidEmail( spocEmail ) ) {
-              await sendEmailWithSES( spocEmail, subject, html, attachments, JSON.parse( process.env.SES ).adminEmail );
+              const html = htmlContent( { ...getTicket, Uidomain: Uidomain, primary: primaryIssue, storeName: getTicket.basicDetails.storeName, hibernation: '', spocName: spocName, date: dayjs( getTicket.issueDate ).format( 'YYYY-MM-DD' ), downtimetotal: downtimetotal, Timestamp: Timestamp, domain: JSON.parse( process.env.URL ).apiDomain } );
+              if ( spocEmail && isValidEmail( spocEmail ) ) {
+                await sendEmailWithSES( spocEmail, subject, html, attachments, JSON.parse( process.env.SES ).adminEmail );
+              }
             }
           }
         }

package/src/controllers/storeInfra.controlller.js

@@ -156,8 +156,8 @@ export async function storeTicketList( req, res ) {
         exportdata.push( {
           'STORE ID': element.storeId,
           'TICKET ID': element.ticketId,
-          'DATE': element.Date,
-          'ISSUE CLOSED DATE': element.issueClosedDate,
+          'DATE': dayjs( element.Date ).format( 'DD MMM, YYYY' ),
+          'ISSUE CLOSED DATE': dayjs( element.issueClosedDate ).format( 'DD MMM, YYYY' ),
           'PRIMARY ISSUE': element.primaryIssue,
           'SECONDARY ISSUE': element.secondaryIssue,
           'STATUS': element.status,