tango-app-api-infra 3.0.102-dev → 3.0.104-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.102-dev",
+    "version": "3.0.104-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.115",
-        "tango-app-api-middleware": "^1.0.73-test",
+        "tango-app-api-middleware": "^3.1.19",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/clientInfra.controller.js

@@ -573,9 +573,7 @@ export async function InstallationIssuesTable( req, res ) {
     if ( req.body.installtionfilterIssue == 'installFailedStores' ) {
       query.push( { $match: { 'ticketDetails.issueStatus': 'identified' } } );
     }
-    if ( req.body.installtionfilterIssue == 'installedStores' ) {
-      query.push( { $match: { 'ticketDetails.issueStatus': 'notidentified' } } );
-    }
+
     query.push( {
       $project: {
         createdAt: 1,
@@ -867,7 +865,7 @@ export async function livecountCheck( data, inputData ) {
       for ( const obj of TimeSlots ) {
         obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
         obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
-        const liveCount = await getOpenSearchData( 'data_not_received_hour',
+        const liveCount = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).dataNotReceivedHour,
             {
               'size': 1,
               'query': {
@@ -1154,7 +1152,7 @@ function downStoresCheck( data, inputData ) {
       for ( const obj of TimeSlots ) {
         obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
         obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
-        const downTime = await getOpenSearchData( 'live_downtime_hourly_test1',
+        const downTime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly,
             {
               'size': 1,
               'query': {

package/src/controllers/dataMismatch.controller.js

@@ -1,6 +1,6 @@
 
 import { findOneTangoTicket, createTangoTicket, updateOneTangoTicket, aggregateTangoTicket, countDocumentsTangoTicket } from '../services/tangoTicket.service.js';
-import { logger, getUTC, appConfig, fileUpload, signedUrl, sendMessageToQueue, listFileByPath } from 'tango-app-api-middleware';
+import { logger, getUTC, fileUpload, signedUrl, sendMessageToQueue, listFileByPath } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
 
 export async function createTicket( req, res ) {
@@ -12,14 +12,14 @@ export async function createTicket( req, res ) {
     }
 
     let param = {
-      Bucket: appConfig.cloud.aws.bucket.auditInput,
+      Bucket: JSON.parse( process.env.BUCKET ).auditInput,
       file_path: `${dayjs( new Date( req.body.Date ) ).format( 'DD-MM-YYYY' )}/${req.body.storeId}/`,
       MaxKeys: 1,
     };
 
     const auditInputData = await listFileByPath( param );
 
-    param.Bucket = appConfig.cloud.aws.bucket.auditOutput;
+    param.Bucket = JSON.parse( process.env.BUCKET ).auditOutput;
 
     param.file_path = `${req.body.storeId}/${dayjs( new Date( req.body.Date ) ).format( 'DD-MM-YYYY' )}/`;
 
@@ -27,7 +27,7 @@ export async function createTicket( req, res ) {
 
 
     if ( req.body.issueType === 'highcount' ) {
-      param.Bucket = appConfig.cloud.aws.bucket.edgeAppSource;
+      param.Bucket = JSON.parse( process.env.BUCKET ).edgeAppSource;
 
       const edgeAppSource = await listFileByPath( param );
 
@@ -56,7 +56,7 @@ export async function createTicket( req, res ) {
     let getObject = {};
     if ( req.files ) {
       let params = {
-        Bucket: appConfig.cloud.aws.bucket.ticket,
+        Bucket: JSON.parse( process.env.BUCKET ).ticket,
         Key: create.ticketId + '/',
         ContentType: 'multipart/form-data',
         body: req.files.img.data,
@@ -88,7 +88,7 @@ export async function createTicket( req, res ) {
     };
 
     if ( req.body.issueType === 'highcount' ) {
-      await sendMessageToQueue( `${appConfig.cloud.aws.sqs.url}${appConfig.cloud.aws.sqs.highcountTopic}`, JSON.stringify( obj ) );
+      await sendMessageToQueue( `${JSON.parse( process.env.SQS ).url}${JSON.parse( process.env.SQS ).highcountTopic}`, JSON.stringify( obj ) );
     }
     if ( create ) {
       res.sendSuccess( 'Ticket Created Successfully' );
@@ -268,7 +268,7 @@ export async function showActivity( req, res ) {
       if ( activity.attachments&&activity.attachments.length>0 ) {
         for ( let attchment of activity.attachments ) {
           let params = {
-            Bucket: appConfig.cloud.aws.bucket.ticket,
+            Bucket: JSON.parse( process.env.BUCKET ).ticket,
             file_path: attchment.filePath,
           };
           let attachments = await signedUrl( params );

package/src/controllers/infra.controllers.js

@@ -3,7 +3,7 @@
 import { aggregateTangoTicket, createTangoTicket, findOneTangoTicket, updateOneTangoTicket, updateManyTangoTicket, findTangoTicket } from '../services/tangoTicket.service.js';
 import { createinfraReason, findinfraReason } from '../services/infraReason.service.js';
 import { updateOneStore, findStore } from '../services/store.service.js';
-import { logger, fileUpload, signedUrl, chunkArray, sendEmailWithSES, getOpenSearchData, insertOpenSearchData, download, appConfig, getUTC } from 'tango-app-api-middleware';
+import { logger, fileUpload, signedUrl, chunkArray, sendEmailWithSES, getOpenSearchData, insertOpenSearchData, download, getUTC } from 'tango-app-api-middleware';
 import { aggregateUser, updateOneUser } from '../services/user.service.js';
 import { findOneClient, updateoneClient } from '../services/client.service.js';
 import dayjs from 'dayjs';
@@ -58,7 +58,7 @@ export async function createTicket( req, res ) {
       },
     };
     let downtimetotal;
-    const downtime = await getOpenSearchData( 'live_downtime_hourly_test1', downTimeQuery );
+    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 ) => {
@@ -77,11 +77,11 @@ export async function createTicket( req, res ) {
     const subject = `Tango Eye - Ticket Created for ${req.body.basicDetails.storeName}`;
     const fileContent = readFileSync( join() + '/src/hbs/createTicket.hbs', 'utf8' );
     const htmlContent = handlebars.compile( fileContent );
-    let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${req.body.basicDetails.storeId}`;
+    let Uidomain = `${JSON.parse( process.env.URL ).domain}/manage/stores/infra-ticket?storeId=${req.body.basicDetails.storeId}`;
 
-    const html = htmlContent( { ...req.body, Uidomain: Uidomain, domain: appConfig.url.apiDomain, date: dayjs( req.body.issueDate ).format( 'YYYY-MM-DD' ), downtimetotal: downtimetotal, Timestamp: Timestamp } );
+    const html = htmlContent( { ...req.body, Uidomain: Uidomain, domain: JSON.parse( process.env.URL ).apiDomain, date: dayjs( req.body.issueDate ).format( 'YYYY-MM-DD' ), downtimetotal: downtimetotal, Timestamp: Timestamp } );
     if ( req.body.emailAlert && req.body.spocEmail && req.body.issueType == 'infra' && isValidEmail( req.body.spocEmail ) ) {
-      await sendEmailWithSES( req.body.spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+      await sendEmailWithSES( req.body.spocEmail, subject, html, attachments, JSON.parse( process.env.SES ).adminEmail );
     }
     if ( create ) {
       res.sendSuccess( 'Ticket Created Successfully' );
@@ -203,6 +203,8 @@ export async function secondaryReason( req, res ) {
         count: list.length,
         result: list,
       } );
+    } else {
+      res.sendError( 'No data found', 204 );
     }
   } catch ( error ) {
     logger.error( { error: error, function: 'secondaryReason' } );
@@ -292,7 +294,7 @@ export async function viewTicket( req, res ) {
         if ( ticket.attachments.hasOwnProperty( index ) ) {
           let file = ticket.attachments[index];
           let params = {
-            Bucket: appConfig.cloud.aws.bucket.ticket,
+            Bucket: JSON.parse( process.env.BUCKET ).ticket,
             file_path: file.filePath,
           };
           let attachments = await signedUrl( params );
@@ -355,7 +357,7 @@ export async function uploadAttachments( req, res ) {
       for ( let singleImg in req.files.img ) {
         if ( req.files.img.hasOwnProperty( singleImg ) ) {
           let params = {
-            Bucket: appConfig.cloud.aws.bucket.ticket,
+            Bucket: JSON.parse( process.env.BUCKET ).ticket,
             Key: req.params.ticketId + '/',
             ContentType: 'multipart/form-data',
             body: req.files.img[singleImg].data,
@@ -379,7 +381,7 @@ export async function uploadAttachments( req, res ) {
       let oldticket = await findOneTangoTicket( { ticketId: req.params.ticketId } );
       let attachments = oldticket.attachments;
       let params = {
-        Bucket: appConfig.cloud.aws.bucket.ticket,
+        Bucket: JSON.parse( process.env.BUCKET ).ticket,
         Key: req.params.ticketId + '/',
         ContentType: 'multipart/form-data',
         body: req.files.img.data,
@@ -555,7 +557,7 @@ export async function saveInfraEmailConfig( req, res ) {
       },
     };
 
-    await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+    await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
 
 
     res.sendSuccess( 'Updated Successfully' );
@@ -759,7 +761,7 @@ export async function getInfraIssues( req, res ) {
       return res.sendError( 'NO Data Found', 204 );
     }
     for ( let i =0; i< mergeValue.length; i++ ) {
-      const downTime = await getOpenSearchData( 'live_downtime_hourly_test1',
+      const downTime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly,
           {
             'size': 100,
             'query': {
@@ -783,7 +785,7 @@ export async function getInfraIssues( req, res ) {
 
           } );
 
-      const speedTest = await getOpenSearchData( 'edgeapp_systemlogs',
+      const speedTest = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs,
           {
             'size': 1,
             'query': {
@@ -896,7 +898,7 @@ export async function getInfraIssues( req, res ) {
     const camera = await aggregateCamera( camQuery );
     for ( let index = 0; index < camera.length; index++ ) {
       if ( camera?.[index]?.thumbnailImage ) {
-        camera[index].thumbnailImage = await signedUrl( { Bucket: appConfig.cloud.aws.bucket.baseImage, file_path: camera[index].thumbnailImage } );
+        camera[index].thumbnailImage = await signedUrl( { Bucket: JSON.parse( process.env.BUCKET ).baseImage, file_path: camera[index].thumbnailImage } );
       }
     }
     logger.info( { message: camera } );

package/src/controllers/internalInfra.controller.js

@@ -1,5 +1,5 @@
 
-import { logger, getOpenSearchData, appConfig } from 'tango-app-api-middleware';
+import { logger, getOpenSearchData } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc.js';
 import timezone from 'dayjs/plugin/timezone.js';
@@ -180,7 +180,7 @@ export async function updateRefreshTicket( req, res ) {
         },
       };
       let downtimetotal;
-      const downtime = await getOpenSearchData( 'live_downtime_hourly_test1', downTimeQuery );
+      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 ) => {
@@ -205,11 +205,11 @@ export async function updateRefreshTicket( req, res ) {
         if ( Issue.length > 0 && Issue[0].reasons.length > 0 ) {
           primaryIssue = Issue[0].reasons[0].primaryIssue;
         }
-        let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
+        let Uidomain = `${JSON.parse( process.env.URL ).domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
         let getclient = await findOneClient( { clientId: getTicket.basicDetails.clientId } );
-        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: appConfig.url.apiDomain } );
+        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 ( getclient.ticketConfigs.emailAlert && spocEmail && isValidEmail( spocEmail ) ) {
-          await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+          await sendEmailWithSES( spocEmail, subject, html, attachments, JSON.parse( process.env.SES ).adminEmail );
         }
       }
     }
@@ -261,7 +261,7 @@ export async function closeTicket( req, res ) {
           },
         };
         let downtimetotal;
-        const downtime = await getOpenSearchData( 'live_downtime_hourly_test1', downTimeQuery );
+        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 ) => {
@@ -288,11 +288,11 @@ export async function closeTicket( req, res ) {
         if ( store.spocDetails && store.spocDetails.length > 0 ) {
           let spocEmail = store.spocDetails[0].email;
           let spocName = store.spocDetails[0].name;
-          let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
+          let Uidomain = `${JSON.parse( process.env.URL ).domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
           let getclient = await findOneClient( { clientId: getTicket.basicDetails.clientId } );
-          const html = htmlContent( { ...getTicket, Uidomain: Uidomain, primaryIssue: primaryIssue, storeName: getTicket.basicDetails.storeName, spocName: spocName, date: dayjs( getTicket.issueDate ).format( 'YYYY-MM-DD HH:mm' ), downtimetotal: downtimetotal, Timestamp: Timestamp, domain: appConfig.url.apiDomain } );
+          const html = htmlContent( { ...getTicket, Uidomain: Uidomain, primaryIssue: primaryIssue, storeName: getTicket.basicDetails.storeName, spocName: spocName, date: dayjs( getTicket.issueDate ).format( 'YYYY-MM-DD HH:mm' ), downtimetotal: downtimetotal, Timestamp: Timestamp, domain: JSON.parse( process.env.URL ).apiDomain } );
           if ( getclient.ticketConfigs.emailAlert && spocEmail && isValidEmail( spocEmail ) ) {
-            await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+            await sendEmailWithSES( spocEmail, subject, html, attachments, JSON.parse( process.env.SES ).adminEmail );
           }
         }
       }
@@ -559,7 +559,7 @@ export async function infraReportSent( req, res ) {
         'Latest Comment': element.otherscomment ? element.otherscomment : element.commentText,
         'Activity Log': {
           label: 'Link',
-          url: `${appConfig.url.domain + '/manage/stores/infra-ticket?storeId=' + element.basicDetails.storeId}`,
+          url: `${JSON.parse( process.env.URL ).domain + '/manage/stores/infra-ticket?storeId=' + element.basicDetails.storeId}`,
         },
       } );
     }
@@ -608,12 +608,12 @@ export async function infraReportSent( req, res ) {
     const subject = `Daily Digest - Infra Downtime Report - ${date}`;
     const fileContent = readFileSync( join() + '/src/hbs/dailyInfraReport.hbs', 'utf8' );
     const htmlContent = handlebars.compile( fileContent );
-    let Uidomain = `${appConfig.url.domain}`;
+    let Uidomain = `${JSON.parse( process.env.URL ).domain}`;
 
 
-    const html = htmlContent( { ...req.body, Uidomain: Uidomain, issueCount: issueCount, avgDownTime: avgDownTime, reportdate: date, content: response, date: date, domain: appConfig.url.apiDomain } );
+    const html = htmlContent( { ...req.body, Uidomain: Uidomain, issueCount: issueCount, avgDownTime: avgDownTime, reportdate: date, content: response, date: date, domain: JSON.parse( process.env.URL ).apiDomain } );
     if ( isValidEmail( req.body.email ) ) {
-      const result = await sendEmailWithSES( req.body.email, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+      const result = await sendEmailWithSES( req.body.email, subject, html, attachments, JSON.parse( process.env.SES ).adminEmail );
       res.sendSuccess( result );
     }
   } catch ( error ) {
@@ -645,7 +645,7 @@ export async function camAngleChangeReport( req, res ) {
 
 
     const formattedPreviousDay = previousDay.format( 'DD-MM-YYYY' );
-    const angleChange = await getOpenSearchData( 'camera-angle-change',
+    const angleChange = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).cameraAngleChange,
         {
           'query': {
             'bool': {
@@ -673,7 +673,7 @@ export async function camAngleChangeReport( req, res ) {
         if ( result && result.cameraAngleChangeStatus && result.camera_info.length > 0 ) {
           for ( let stream of result.camera_info ) {
             let params = {
-              Bucket: appConfig.cloud.aws.bucket.cameraAngle,
+              Bucket: JSON.parse( process.env.BUCKET ).cameraAngle,
               file_path: stream.path,
             };
             let Image = await signedUrl( params );
@@ -703,7 +703,7 @@ export async function camAngleChangeReport( req, res ) {
       };
       let subject = `Camera Angle Modified - ${formattedPreviousDay}`;
       let html = `<div>We wanted to inform you that the camera angle in your stores has been adjusted recently.</div>`;
-      let result = await sendEmailWithSES( req.body.toMail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+      let result = await sendEmailWithSES( req.body.toMail, subject, html, attachments, JSON.parse( process.env.SES ).adminEmail );
       if ( result ) {
         res.sendSuccess( 'Email send successfully' );
       }
@@ -777,7 +777,7 @@ export async function edgeApplogsCheck( req, res ) {
           { 'timestamp': { 'order': 'desc' } },
         ],
       };
-      const errorLogList = await getOpenSearchData( 'edgeapp_systemlogs', errorLog );
+      const errorLogList = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, errorLog );
 
       let result = [];
 

package/src/controllers/storeInfra.controlller.js

@@ -4,7 +4,7 @@ import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findOneStore } from '../services/store.service.js';
 import dayjs from 'dayjs';
 import { findinfraReason } from '../services/infraReason.service.js';
-import { signedUrl, appConfig } from 'tango-app-api-middleware';
+import { signedUrl } from 'tango-app-api-middleware';
 export async function storeTicketList( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
@@ -137,10 +137,10 @@ export async function storeTicketList( req, res ) {
     },
     );
 
-    if ( req.body.filter && req.body.filter !== '' ) {
+    if ( req.body.filter &&req.body.filter.length>0 ) {
       query.push( {
         $match: {
-          primaryIssue: req.body.filter,
+          primaryIssue: { $in: req.body.filter },
         },
       } );
     }
@@ -324,7 +324,7 @@ export async function edgeAppLogTable( req, res ) {
           { 'timestamp': { 'order': 'desc' } },
         ],
       };
-      let speedTest = await getOpenSearchData( 'edgeapp_systemlogs', internetSpeedQuery );
+      let speedTest = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, internetSpeedQuery );
       if ( speedTest&& speedTest.body.hits && speedTest.body.hits.hits.length > 0 ) {
         for ( const sourcedata of speedTest.body.hits.hits ) {
           if ( sourcedata._source ) {
@@ -371,23 +371,22 @@ export async function edgeAppLogTable( req, res ) {
           { 'timestamp': { 'order': 'desc' } },
         ],
       };
-      let newFilesCount = await getOpenSearchData( 'edgeapp_systemlogs', FileCountQuery );
+      let newFilesCount = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, FileCountQuery );
       if ( newFilesCount&& newFilesCount.body.hits && newFilesCount.body.hits.hits.length > 0 ) {
         obj.files_pushed = 0;
-        obj.files_genrated = 0;
+        obj.files_generated = 0;
         for ( let sourcedata of newFilesCount.body.hits.hits ) {
           if ( sourcedata._source ) {
             if ( Number( sourcedata._source.data.occuringTime.split( ':' )[0] )==obj.hour ) {
               obj.files_pushed = obj.files_pushed+Number( sourcedata._source.data.files_pushed );
-              obj.files_genrated = obj.files_generated+Number( sourcedata._source.data.files_generated );
+              obj.files_generated = obj.files_generated+Number( sourcedata._source.data.files_generated );
             }
           }
         }
       } else {
         obj.files_pushed = '';
-        obj.files_genrated = '';
+        obj.files_generated = '';
       }
-
       let downTimeQuery = {
         'size': 1,
         'query': {
@@ -413,7 +412,7 @@ export async function edgeAppLogTable( req, res ) {
           },
         },
       };
-      const downtime = await getOpenSearchData( 'live_downtime_hourly_test1', downTimeQuery );
+      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 ) => {
@@ -426,7 +425,17 @@ export async function edgeAppLogTable( req, res ) {
       }
     }
     if ( req.body.export ) {
-      await download( timeSlots, res );
+      const exportdata = [];
+      timeSlots.forEach( ( element ) => {
+        exportdata.push( {
+          'Time Stamp': element.startTime+ '-'+ element.endTime,
+          'Downtime': element.ticketId,
+          'Avg Internet Speed': element.Date,
+          'Files Genarated': element.issueClosedDate,
+          'Files Pushed': element.primaryIssue,
+        } );
+      } );
+      await download( exportdata, res );
       return;
     }
     res.sendSuccess( timeSlots );
@@ -465,7 +474,6 @@ function generateTimeSlots( startHour, endHour, interval, req ) {
 };
 
 function getTimeDifference( start, end ) {
-  console.log( start, end );
   let startTime = new Date( `1970-01-01T${start}Z` );
   let endTime = new Date( `1970-01-01T${end}Z` );
   let differenceInMilliseconds = endTime - startTime;
@@ -517,7 +525,8 @@ export async function viewedgeAppLog( req, res ) {
         },
       },
     };
-    const appStartTime = await getOpenSearchData( 'edgeapp_systemlogs', appStartTimeQuery );
+    const appStartTime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, appStartTimeQuery );
+
     response.appStartTime = appStartTime.body.hits.hits.length > 0 ? appStartTime.body.hits.hits[0]._source.data.occuringTime : '';
 
     let appQuitTimeQuery = {
@@ -553,7 +562,7 @@ export async function viewedgeAppLog( req, res ) {
         { 'timestamp': { 'order': 'desc' } },
       ],
     };
-    const appQuitTime = await getOpenSearchData( 'edgeapp_systemlogs', appQuitTimeQuery );
+    const appQuitTime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, appQuitTimeQuery );
     if ( appQuitTime.body.hits.hits&&appQuitTime.body.hits.hits.length > 0 ) {
       for ( const sourceData of appQuitTime.body.hits.hits ) {
         if ( Number( sourceData._source.data.occuringTime.split( ':' )[0] )== Number( fromTime.split( ':' )[0] ) ) {
@@ -595,7 +604,7 @@ export async function viewedgeAppLog( req, res ) {
       ],
     };
 
-    const appCrashTime = await getOpenSearchData( 'edgeapp_systemlogs', appCrashTimeQuery );
+    const appCrashTime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, appCrashTimeQuery );
     if ( appCrashTime.body.hits.hits&&appCrashTime.body.hits.hits.length > 0 ) {
       for ( const sourceData of appCrashTime.body.hits.hits ) {
         if ( Number( sourceData._source.data.occuringTime.split( ':' )[0] )== Number( fromTime.split( ':' )[0] ) ) {
@@ -603,7 +612,7 @@ export async function viewedgeAppLog( req, res ) {
         }
       }
     }
-    const screenStatus = await getOpenSearchData( 'edgeapp_systemlogs', {
+    const screenStatus = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, {
       'size': 1000,
       'query': {
         'bool': {
@@ -638,13 +647,11 @@ export async function viewedgeAppLog( req, res ) {
 
     } );
     if ( screenStatus&& screenStatus.body.hits.hits&&screenStatus.body.hits.hits.length > 0 ) {
-      console.log( '==========', screenStatus.body.hits.hits.length );
       let suspendedTime;
       let resumedTime;
       const differences = [];
 
       for ( const sourceData of screenStatus.body.hits.hits ) {
-        console.log( sourceData._source.data.occuringTime );
         if ( Number( sourceData._source.data.occuringTime.split( ':' )[0] )== Number( fromTime.split( ':' )[0] ) ) {
           if ( sourceData._source.data.message.trim() === 'SYSTEM SUSPENDED' ) {
             suspendedTime = sourceData._source.data.occuringTime;
@@ -664,7 +671,6 @@ export async function viewedgeAppLog( req, res ) {
           }
         }
       }
-      console.log( differences );
       response.screenStatus = differences.length>0?`${differences[0].minutes}Mins ${differences[0].seconds}Sec`:'';
     }
     const FileCountQuery = {
@@ -701,25 +707,25 @@ export async function viewedgeAppLog( req, res ) {
         { 'timestamp': { 'order': 'desc' } },
       ],
     };
-    const newFilesCount = await getOpenSearchData( 'edgeapp_systemlogs', FileCountQuery );
+    const newFilesCount = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, FileCountQuery );
     if ( newFilesCount&& newFilesCount.body.hits && newFilesCount.body.hits.hits.length > 0 ) {
-      response.files_pushed = 0;
+      response.filesPushed = 0;
       response.files_genrated = 0;
       for ( const sourcedata of newFilesCount.body.hits.hits ) {
         if ( sourcedata._source ) {
-          if ( Number( sourcedata._source.data.occuringTime.split( ':' )[0] )==response.hour ) {
-            response.files_pushed = response.files_pushed+Number( sourcedata._source.data.files_pushed );
+          if ( Number( sourcedata._source.data.occuringTime.split( ':' )[0] )==Number( fromTime.split( ':' )[0] ) ) {
+            response.filesPushed = response.filesPushed+Number( sourcedata._source.data.files_pushed );
             response.files_genrated = response.files_generated+Number( sourcedata._source.data.files_generated );
           }
         }
       }
     } else {
-      response.files_pushed = '';
+      response.filesPushed = '';
       response.files_genrated = '';
     }
 
 
-    const antiVirus = await getOpenSearchData( 'edgeapp_systemlogs', {
+    const antiVirus = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, {
       'size': 1,
       'query': {
         'bool': {
@@ -765,7 +771,7 @@ export async function viewedgeAppLog( req, res ) {
 
 export async function cameraAngleChange( req, res ) {
   try {
-    const angleChange = await getOpenSearchData( 'camera-angle-change',
+    const angleChange = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).cameraAngleChange,
         {
           'size': 1,
           'query': {
@@ -790,17 +796,17 @@ export async function cameraAngleChange( req, res ) {
       let changeDetected = result.camera_info.filter( ( cam ) => cam.stream == req.body.StreamName );
       if ( changeDetected.length == 1 ) {
         let params = {
-          Bucket: appConfig.cloud.aws.bucket.cameraAngle,
+          Bucket: JSON.parse( process.env.BUCKET ).cameraAngle,
           file_path: changeDetected[0].path,
         };
         let Image = await signedUrl( params );
         let expectedparams = {
-          Bucket: appConfig.cloud.aws.bucket.cameraAngle,
+          Bucket: JSON.parse( process.env.BUCKET ).cameraAngle,
           file_path: changeDetected[0].expected,
         };
         let expectedImage = await signedUrl( expectedparams );
         let actualparams = {
-          Bucket: appConfig.cloud.aws.bucket.cameraAngle,
+          Bucket: JSON.parse( process.env.BUCKET ).cameraAngle,
           file_path: changeDetected[0].actual,
         };
         let actualImage = await signedUrl( actualparams );
@@ -900,8 +906,8 @@ export async function streamwiseDowntime( req, res ) {
                 },
               },
               {
-                'terms': {
-                  'doc.hour.keyword': [ obj.hour ],
+                'term': {
+                  'doc.hour.keyword': obj.hour,
                 },
               },
             ],
@@ -909,21 +915,18 @@ export async function streamwiseDowntime( req, res ) {
           },
         },
       };
-      const downtime = await getOpenSearchData( 'live_downtime_hourly_test1', downTimeQuery );
+      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 ) {
         for ( let stream of streamwiseDowntime ) {
           if ( stream.stream === req.body.stream ) {
             obj.downTime= stream.down_time;
-          } else {
-            obj.downTime= '';
           }
         }
       } else {
         obj.downTime= '';
       }
-
       timewise.push( obj );
     }
     res.sendSuccess( timewise );
@@ -966,7 +969,7 @@ export async function livecountCheck( inputData, req ) {
             },
           },
         };
-        const downtime = await getOpenSearchData( 'live_downtime_hourly_test1', downTimeQuery );
+        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 ) => {

package/src/controllers/userInfra.controller.js

@@ -158,6 +158,7 @@ export async function userTicketList( req, res ) {
         storeId: '$basicDetails.storeId',
         storeName: '$basicDetails.storeName',
         clientId: '$basicDetails.clientId',
+        clientName: '$basicDetails.clientName',
         Date: { $dateToString: { format: '%d-%m-%Y', date: '$issueDate' } },
         updatedAt: 1,
         ticketId: 1,
@@ -190,6 +191,7 @@ export async function userTicketList( req, res ) {
       $project: {
         storeId: 1,
         storeName: 1,
+        clientName: 1,
         updatedAt: 1,
         clientId: 1,
         Date: 1,
@@ -208,6 +210,7 @@ export async function userTicketList( req, res ) {
         _id: '$ticketId',
         storeId: { $first: '$storeId' },
         storeName: { $first: '$storeName' },
+        clientName: { $first: '$clientName' },
         clientId: { $first: '$clientId' },
         updatedAt: { $first: '$updatedAt' },
         Date: { $first: '$Date' },
@@ -234,13 +237,13 @@ export async function userTicketList( req, res ) {
         },
       } );
     }
-    if ( req.body.filter && req.body.filter !== '' ) {
+    if ( req.body.filter && req.body.filter.length>0 ) {
       query.push( {
         $match: {
           $or: [
-            { issueStatus: req.body.filter },
-            { infraIssue: req.body.filter },
-            { issueType: req.body.filter },
+            { issueStatus: { $in: req.body.filter } },
+            { infraIssue: { $in: req.body.filter } },
+            { issueType: { $in: req.body.filter } },
           ],
         },
       } );

package/src/validations/infra.validation.js

@@ -198,7 +198,7 @@ export async function ticketExists( req, res, next ) {
 export async function validateTicketstatus( req, res, next ) {
   try {
     if ( req.body.issueType == 'infra' ) {
-      if ( req.body.secondary.length>0 ) {
+      if ( req.body.secondary&&req.body.secondary.length>0 ) {
         if ( req.body.status == 'closed' ) {
           return res.sendSuccess( 'Ticket already closed' );
         }
@@ -269,28 +269,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,
-          timeStamp: new Date(),
-          IdentifiedBy: req.user.userName,
-          comment: req.body.comment,
-          reasons: [ {
-            primaryIssue: req.body.primary,
-            secondaryIssue: [],
-          } ],
-        },
-        );
-      }
     }
+    // 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,
+    //       timeStamp: new Date(),
+    //       IdentifiedBy: req.user.userName,
+    //       comment: req.body.comment,
+    //       reasons: [ {
+    //         primaryIssue: req.body.primary,
+    //         secondaryIssue: [],
+    //       } ],
+    //     },
+    //     );
+    //   }
+    // }
 
 
     next();
@@ -313,20 +314,19 @@ export async function InfrastepstoResolve( req, res, next ) {
           secondaryIsssue: [ ...secondaryReason.stepstoResolve ],
         } );
       }
-      if ( req.body.primary != 'Store Operation Issues' && req.body.primary != 'Application Issues' ) {
-        req.body.ticketActivity.push( {
-          actionType: 'stepsToResolve',
-          actionBy: 'Tango',
-          timeStamp: new Date(),
-          IdentifiedBy: 'Tango',
-          reasons: steptoReslove.map( ( item ) => ( {
-            primaryIssue: item.primaryIssue,
-            secondaryIssue: item.secondaryIsssue.map( ( issue ) => ( {
-              name: issue.name, // Assuming each object has a 'name' property
-            } ) ),
+
+      req.body.ticketActivity.push( {
+        actionType: 'stepsToResolve',
+        actionBy: 'Tango',
+        timeStamp: new Date(),
+        IdentifiedBy: '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 ) {