tango-app-api-infra 3.0.106-dev → 3.0.108-dev

package/package.json

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

package/src/controllers/clientInfra.controller.js

@@ -302,7 +302,7 @@ export async function installationCard( req, res ) {
       onboardedStoresCount: onboardedCount,
       inactiveStoresCount: deactiveCount,
       installedStoresCount: installedCount-yettoInstallCount.length,
-      yettoInstallCount: yettoInstallCount.length,
+      yettoInstallCount: yettoInstallCount.length-installFailedCount.length,
       installFailedCount: installFailedCount.length,
       infraIssues: response,
     } );
@@ -516,6 +516,43 @@ export async function infraIssuesTable( req, res ) {
           { $skip: ( req.body.offset - 1 ) * req.body.limit },
           { $limit: Number( req.body.limit ) },
       );
+      storesQuery.push( {
+        $lookup: {
+          from: 'clients',
+          let: { clientId: '$clientId' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $and: [
+                    { $eq: [ '$clientId', '$$clientId' ] },
+                  ],
+                },
+              },
+
+            },
+            {
+              $project: {
+                clientName: 1,
+              },
+            },
+          ], as: 'client',
+        },
+      },
+      {
+        $unwind: { path: '$client', preserveNullAndEmptyArrays: true },
+      },
+      {
+        $project: {
+          clientName: '$client.clientName',
+          storeId: 1,
+          clientId: 1,
+          storeName: 1,
+          status: 1,
+          createdAt: 1,
+        },
+      },
+      );
     }
     let result;
     if ( req.body.infrafilterIssue == 'Live Stores' || req.body.infrafilterIssue == 'Total Stores' ) {

package/src/controllers/infra.controllers.js

@@ -19,7 +19,9 @@ export async function createTicket( req, res ) {
   try {
     req.body.issueDate = new Date( req.body.Date );
     if ( req.body.issueType == 'infra' ) {
-      req.body.ticketId = 'TE_INF_' + new Date().valueOf();
+      if ( !req.body.ticketId ) {
+        req.body.ticketId = 'TE_INF_' + new Date().valueOf();
+      }
       req.body.ticketActivity = [ {
         actionType: 'defaultInfra',
         timeStamp: new Date(),
@@ -28,7 +30,7 @@ export async function createTicket( req, res ) {
       } ];
       let ticketExists= await findOneTangoTicket( { ticketId: req.body.ticketId } );
       if ( ticketExists ) {
-        res.status( 200 ).send( { storeId: req.body.storeId } );
+        return res.status( 200 ).send( { message: 'ticketId Exists', storeId: req.body.storeId } );
       }
     }
     if ( req.body.issueType == 'installation' ) {
@@ -70,7 +72,7 @@ export async function createTicket( req, res ) {
       downtimetotal = 0;
     }
 
-
+    console.log( req.body );
     let create = await createTangoTicket( req.body );
     let Timestamp = dayjs().format( 'YYYY-MM-DD HH:mm' );
     const attachments = null;
@@ -237,7 +239,16 @@ export async function updateTicketIssue( req, res ) {
         'status': 'inprogress',
       };
     }
+    if ( req.body.issueType === 'infra' ) {
+      let client = await findOneClient( { clientId: req.body.basicDetails.clientId } );
+      let refreshdate = dayjs().add( client.ticketConfigs.refreshAlert, 'days' );
+      console.log( new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ) );
+      query = { ...query, 'ticketDetails.ticketRefreshTime': new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
+      };
+    }
+    console.log( query );
     let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, query );
+
     if ( req.body.ticketDetails.ticketType === 'refreshticket' ) {
       await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketDetails.refreshTicketStatus': 'identified' } );
     }

package/src/controllers/internalInfra.controller.js

@@ -156,7 +156,7 @@ 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' } );
+      await updateOneTangoTicket( { ticketId: ticket.ticketId }, { 'ticketDetails.ticketType': 'refreshticket', 'ticketDetails.refreshTicketStatus': 'notidentified' } );
       await updateOneTangoTicketunset( { ticketId: ticket.ticketId }, { 'ticketDetails.addressingUser': 1 } );
       let downTimeQuery = {
         'size': 1,
@@ -901,7 +901,7 @@ export async function edgeApplogsCheck( req, res ) {
                 edgelog: findissue,
                 storeId: ticket.basicDetails.storeId,
                 primary: 'System Issues',
-                secondary: [ 'Malware or Viruses' ],
+                secondary: [ 'Antivirus blockages' ],
               };
               updateIssue( findissueEdgeApp );
               finalresult.push( findissueEdgeApp );
@@ -920,7 +920,7 @@ export async function edgeApplogsCheck( req, res ) {
                 storeId: ticket.basicDetails.storeId,
                 edgelog: findissue.edgelog.data,
                 primary: 'Camera Issues',
-                secondary: [ 'Camera Not working/RTSP port not working' ],
+                secondary: [ 'Camera not working' ],
               };
               updateIssue( findissueEdgeApp );
               finalresult.push( findissueEdgeApp );
@@ -951,7 +951,7 @@ export async function edgeApplogsCheck( req, res ) {
                 edgelog: findissue,
                 storeId: ticket.basicDetails.storeId,
                 primary: 'Internet Issues',
-                secondary: [ 'Slow Internet Speed' ],
+                secondary: [ 'Internet slow' ],
               };
               updateIssue( findissueEdgeApp );
               finalresult.push( findissueEdgeApp );

package/src/controllers/storeInfra.controlller.js

@@ -62,7 +62,12 @@ export async function storeTicketList( req, res ) {
           $filter: {
             input: '$ticketActivity',
             as: 'item',
-            cond: { $ne: [ '$$item.actionType', 'statusChange' ] },
+            cond: {
+              $and: [
+                { $ne: [ '$$item.actionType', 'statusChange' ] },
+                { $ne: [ '$$item.actionType', 'statusCheck' ] },
+              ],
+            },
           },
         },
         primaryIssue: {
@@ -284,173 +289,136 @@ export async function edgeAppLogTable( req, res ) {
   try {
     const store = await findOneStore( { storeId: req.body.storeId } );
     if ( !store ) {
-      return res.sendError( 'Stores Not fond', 204 );
+      return res.sendError( 'Store Not found', 204 );
     }
-    let startHour = store.storeProfile.open.split( ':' )[0];
-    let endHour = store.storeProfile.close.split( ':' )[0];
+
+    let startHour = parseInt( store.storeProfile.open.split( ':' )[0], 10 );
+    let endHour = parseInt( store.storeProfile.close.split( ':' )[0], 10 );
     const interval = 60; // 1 hour in minutes
     const timeSlots = generateTimeSlots( startHour, endHour, interval, req );
+
+    const date = dayjs( timeSlots[0].from ).format( 'DD-MM-YYYY' );
+    const storeId = req.body.storeId;
+
+    const internetSpeedQuery = {
+      size: 100,
+      query: {
+        bool: {
+          must: [
+            { term: { 'log_type.keyword': 'Application' } },
+            { term: { 'store_date.keyword': date } },
+            { term: { 'storeId.keyword': storeId } },
+            { term: { 'log_subtype.keyword': 'Speed_Test' } },
+          ],
+        },
+      },
+      sort: [ { timestamp: { order: 'desc' } } ],
+      _source: [ 'data.upload_Speed', 'data.occuringTime' ],
+    };
+
+    const fileCountQuery = {
+      size: 100,
+      query: {
+        bool: {
+          must: [
+            { term: { 'log_type.keyword': 'Application' } },
+            { term: { 'store_date.keyword': date } },
+            { term: { 'storeId.keyword': storeId } },
+            { term: { 'log_subtype.keyword': 'Zip_File_Count' } },
+          ],
+        },
+      },
+      sort: [ { timestamp: { order: 'desc' } } ],
+      _source: [ 'data.files_pushed', 'data.files_generated', 'data.occuringTime' ],
+    };
+
+    const downTimeQuery = {
+      size: 100,
+      query: {
+        bool: {
+          must: [
+            { term: { 'doc.date.keyword': date } },
+            { term: { 'doc.store_id.keyword': storeId } },
+          ],
+        },
+      },
+      _source: [ 'doc.streamwise_downtime', 'doc.hour' ],
+    };
+
+    // Execute all queries in parallel
+    const [ speedTestResult, fileCountResult, downtimeResult ] = await Promise.all( [
+      getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, internetSpeedQuery ),
+      getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, fileCountQuery ),
+      getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly, downTimeQuery ),
+    ] );
+    // Process results
+    const speedTestData = speedTestResult?.body?.hits?.hits ?? [];
+    const fileCountData = fileCountResult?.body?.hits?.hits ?? [];
+    const downtimeData = downtimeResult?.body?.hits?.hits ?? [];
+
     for ( const obj of timeSlots ) {
+      const hour = obj.hour;
       obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
       obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
-      let internetSpeedQuery = {
-        'query': {
-          'bool': {
-            'must': [
-              {
-                'term': {
-                  'log_type.keyword': 'Application',
-                },
-              },
-              {
-                'term': {
-                  'store_date.keyword': dayjs( obj.from ).format( 'DD-MM-YYYY' ),
-                },
-              },
-              {
-                'term': {
-                  'storeId.keyword': req.body.storeId,
-                },
-              },
-              {
-                'term': {
-                  'log_subtype.keyword': 'Speed_Test',
-                },
-              },
-            ],
-          },
-        },
-        'sort': [
-          { 'timestamp': { 'order': 'desc' } },
-        ],
-      };
-      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 ) {
-            if ( Number( sourcedata._source.data.occuringTime.split( ':' )[0] )==obj.hour ) {
-              const megabytes = bytesToMB( sourcedata._source.data.upload_Speed.split( '.' )[0] ).toFixed( 2 );
-              obj.Internetspeed = megabytes+ ' MB/sec';
-            }
-          }
-        }
-      } else {
-        obj.Internetspeed = '';
-      }
-      let FileCountQuery = {
-        'size': 1000,
-        'query': {
-          'bool': {
-            'must': [
-              {
-                'term': {
-                  'log_type.keyword': 'Application',
-                },
-              },
-              {
-                'term': {
-                  'store_date.keyword': dayjs( obj.from ).format( 'DD-MM-YYYY' ),
-                },
-              },
-              {
-                'term': {
-                  'storeId.keyword': req.body.storeId,
-                },
-              },
-              {
-                'term': {
-                  'log_subtype.keyword': 'Zip_File_Count',
-                },
-              },
-            ],
 
-          },
-        },
+      // Internet speed
 
-        'sort': [
-          { 'timestamp': { 'order': 'desc' } },
-        ],
-      };
-      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_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_generated = obj.files_generated+Number( sourcedata._source.data.files_generated );
-            }
-          }
-        }
-      } else {
-        obj.files_pushed = '';
-        obj.files_generated = '';
-      }
-      let downTimeQuery = {
-        'size': 1,
-        'query': {
-          'bool': {
-            'must': [
-              {
-                'term': {
-                  'doc.date.keyword': dayjs( obj.from ).format( 'DD-MM-YYYY' ),
-                },
-              },
-              {
-                'term': {
-                  'doc.store_id.keyword': req.body.storeId,
-                },
-              },
-              {
-                'terms': {
-                  'doc.hour.keyword': [ obj.hour ],
-                },
-              },
-            ],
+      const speedTest = speedTestData.find(
+          ( item ) => Number( item._source.data.occuringTime.split( ':' )[0] ) === hour,
+      );
+      obj.Internetspeed = speedTest ? `${bytesToMB( speedTest._source.data.upload_Speed.split( '.' )[0] ).toFixed( 2 )} MB/sec` : '';
 
-          },
-        },
-      };
-      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;
-        obj.downtime = Math.round( average );
+      // File counts
+      const fileCounts = fileCountData.filter(
+          ( item ) => Number( item._source.data.occuringTime.split( ':' )[0] ) === hour,
+      );
+      obj.files_pushed = fileCounts.reduce( ( sum, item ) => sum + Number( item._source.data.files_pushed ), 0 ) || '';
+      obj.files_generated = fileCounts.reduce( ( sum, item ) => sum + Number( item._source.data.files_generated ), 0 ) || '';
+
+      // Downtime
+
+      const downtime = downtimeData.find( ( item ) => Number( item._source.doc.hour ) === hour );
+
+      if ( downtime ) {
+        const streamwiseDowntime = downtime._source.doc.streamwise_downtime || [];
+        if ( streamwiseDowntime.length > 0 ) {
+          const sum = streamwiseDowntime.reduce( ( acc, cur ) => acc + cur.down_time, 0 );
+          const average = sum / streamwiseDowntime.length;
+          obj.downtime = Math.round( average );
+        } else {
+          obj.downtime = '';
+        }
       } else {
         obj.downtime = '';
       }
     }
+
     if ( req.body.export ) {
-      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 );
+      const exportData = timeSlots.map( ( element ) => ( {
+        'Time Stamp': `${element.startTime}-${element.endTime}`,
+        'Downtime': element.downtime,
+        'Avg Internet Speed': element.Internetspeed,
+        'Files Generated': element.files_generated,
+        'Files Pushed': element.files_pushed,
+      } ) );
+      await download( exportData, res );
       return;
     }
+
     res.sendSuccess( timeSlots );
   } catch ( error ) {
-    logger.error( { error: error, function: 'edgeAppLog' } );
+    logger.error( { error, function: 'edgeAppLog' } );
     return res.sendError( error, 500 );
   }
 }
+
 function bytesToMB( bytes ) {
   return bytes / ( 1024 * 1024 );
 }
 function generateTimeSlots( startHour, endHour, interval, req ) {
   try {
     const timeSlots = [];
-    for ( let hour = startHour; hour <= endHour; hour++ ) {
+    for ( let hour = startHour; hour < endHour; hour++ ) {
       for ( let minute = 0; minute < 60; minute += interval ) {
         let isoDate = new Date();
 
@@ -496,7 +464,7 @@ export async function viewedgeAppLog( req, res ) {
 
 
     let appStartTimeQuery = {
-      'size': 1000,
+      'size': 100,
       'query': {
         'bool': {
           'must': [
@@ -530,7 +498,7 @@ export async function viewedgeAppLog( req, res ) {
     response.appStartTime = appStartTime.body.hits.hits.length > 0 ? appStartTime.body.hits.hits[0]._source.data.occuringTime : '';
 
     let appQuitTimeQuery = {
-      'size': 1,
+      'size': 100,
       'query': {
         'bool': {
           'must': [
@@ -571,7 +539,7 @@ export async function viewedgeAppLog( req, res ) {
       }
     }
     let appCrashTimeQuery = {
-      'size': 1,
+      'size': 100,
       'query': {
         'bool': {
           'must': [
@@ -613,7 +581,7 @@ export async function viewedgeAppLog( req, res ) {
       }
     }
     const screenStatus = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, {
-      'size': 1000,
+      'size': 100,
       'query': {
         'bool': {
           'must': [
@@ -674,7 +642,7 @@ export async function viewedgeAppLog( req, res ) {
       response.screenStatus = differences.length>0?`${differences[0].minutes}Mins ${differences[0].seconds}Sec`:'';
     }
     const FileCountQuery = {
-      'size': 1000,
+      'size': 100,
       'query': {
         'bool': {
           'must': [
@@ -726,7 +694,7 @@ export async function viewedgeAppLog( req, res ) {
 
 
     const antiVirus = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, {
-      'size': 1,
+      'size': 100,
       'query': {
         'bool': {
           'must': [
@@ -849,27 +817,30 @@ export async function datewiseDowntime( req, res ) {
   try {
     const store = await findOneStore( { storeId: req.body.storeId } );
     if ( !store ) {
-      return res.sendError( 'Stores Not fond', 204 );
+      return res.sendError( 'Store Not Found', 204 );
     }
-    let startHour = store.storeProfile.open.split( ':' )[0];
-    let endHour = store.storeProfile.close.split( ':' )[0];
-
-    let datesArray = getDatesArray( req.body.fromDate, req.body.toDate );
-    let paginatedDates = paginateArray( datesArray, req.body.offset, req.body.limit );
-    let result = [];
-    for ( const singleDate of paginatedDates ) {
-      let inputData = {
+
+    const startHour = parseInt( store.storeProfile.open.split( ':' )[0], 10 );
+    const endHour = parseInt( store.storeProfile.close.split( ':' )[0], 10 );
+
+    const datesArray = getDatesArray( req.body.fromDate, req.body.toDate );
+    const paginatedDates = paginateArray( datesArray, req.body.offset, req.body.limit );
+
+    const resultPromises = paginatedDates.map( ( singleDate ) => {
+      const inputData = {
         start: startHour,
         end: endHour,
         interval: 60,
       };
       req.body.Date = singleDate;
-      let storedata = await livecountCheck( inputData, req );
-      result.push( storedata[0] );
-    }
+      return livecountCheck( inputData, singleDate, req );
+    } );
+
+    const result = await Promise.all( resultPromises );
+
     res.sendSuccess( {
       count: datesArray.length,
-      data: result,
+      data: result.flat(), // Flatten the array of arrays
     } );
   } catch ( error ) {
     logger.error( { error: error, function: 'datewiseDowntime' } );
@@ -880,55 +851,47 @@ export async function streamwiseDowntime( req, res ) {
   try {
     const store = await findOneStore( { storeId: req.body.storeId } );
     if ( !store ) {
-      return res.sendError( 'Stores Not fond', 204 );
+      return res.sendError( 'Store not found', 204 );
     }
-    let startHour = store.storeProfile.open.split( ':' )[0];
-    let endHour = store.storeProfile.close.split( ':' )[0];
+
+    const startHour = store.storeProfile.open.split( ':' )[0];
+    const endHour = store.storeProfile.close.split( ':' )[0];
     const interval = 60; // 1 hour in minutes
     const TimeSlots = generateTimeSlots( startHour, endHour, interval, req );
-    let timewise = [];
-    for ( const obj of TimeSlots ) {
-      obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
-      obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
-      let downTimeQuery = {
-        'size': 1,
-        'query': {
-          'bool': {
-            'must': [
-              {
-                'term': {
-                  'doc.date.keyword': dayjs( obj.from ).format( 'DD-MM-YYYY' ),
-                },
-              },
-              {
-                'term': {
-                  'doc.store_id.keyword': req.body.storeId,
-                },
-              },
-              {
-                'term': {
-                  'doc.hour.keyword': obj.hour,
-                },
-              },
-            ],
 
+    const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
+    const downTimeIndex = parsedOpenSearch.downTimeHourly;
+
+    const batchRequests = TimeSlots.map( async ( obj ) => {
+      const formattedDate = dayjs( obj.from ).format( 'DD-MM-YYYY' );
+      const downTimeQuery = {
+        size: 1,
+        query: {
+          bool: {
+            must: [
+              { term: { 'doc.date.keyword': formattedDate } },
+              { term: { 'doc.store_id.keyword': req.body.storeId } },
+              { term: { 'doc.hour.keyword': obj.hour } },
+            ],
           },
         },
       };
-      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= '';
-      }
-      timewise.push( obj );
-    }
+      const downtime = await getOpenSearchData( downTimeIndex, downTimeQuery );
+      const streamwiseDowntime = downtime.body.hits.hits.length > 0 ?
+        downtime.body.hits.hits[0]._source.doc.streamwise_downtime : [];
+
+      const foundStream = streamwiseDowntime.find( ( stream ) => stream.stream === req.body.stream );
+      return {
+        startTime: dayjs( obj.from ).format( 'hh:mm A' ),
+        endTime: dayjs( obj.to ).format( 'hh:mm A' ),
+        downTime: foundStream ? foundStream.down_time : '',
+        hour: obj.hour,
+
+      };
+    } );
+
+    const timewise = await Promise.all( batchRequests );
     res.sendSuccess( timewise );
   } catch ( error ) {
     logger.error( { error: error, function: 'streamwiseDowntime' } );
@@ -936,73 +899,61 @@ export async function streamwiseDowntime( req, res ) {
   }
 }
 
-export async function livecountCheck( inputData, req ) {
-  return new Promise( async ( Resolve, Reject ) => {
-    try {
-      let TimeSlots = generateTimeSlots( inputData.start, inputData.end, inputData.interval, req );
-      let timewise = [];
-      for ( const obj of TimeSlots ) {
-        obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
-        obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
-        let downTimeQuery = {
-          'size': 1,
-          'query': {
-            'bool': {
-              'must': [
-                {
-                  'term': {
-                    'doc.date.keyword': dayjs( obj.from ).format( 'DD-MM-YYYY' ),
-                  },
-                },
-                {
-                  'term': {
-                    'doc.store_id.keyword': req.body.storeId,
-                  },
-                },
-                {
-                  'terms': {
-                    'doc.hour.keyword': [ obj.hour ],
-                  },
-                },
-              ],
 
-            },
+export async function livecountCheck( inputData, singleDate, req ) {
+  try {
+    const TimeSlots = generateTimeSlots( inputData.start, inputData.end, inputData.interval, req );
+
+    const queryPromises = TimeSlots.map( async ( obj ) => {
+      obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
+      obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
+
+      const downTimeQuery = {
+        size: 1,
+        query: {
+          bool: {
+            must: [
+              { term: { 'doc.date.keyword': dayjs( obj.from ).format( 'DD-MM-YYYY' ) } },
+              { term: { 'doc.store_id.keyword': req.body.storeId } },
+              { terms: { 'doc.hour.keyword': [ obj.hour ] } },
+            ],
           },
-        };
-        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;
-          obj[obj.startTime + '-' + obj.endTime] = Math.round( average );
-        } else {
-          obj[obj.startTime + '-' + obj.endTime] = '';
-        }
+        },
+      };
 
-        timewise.push( obj );
+      const downtime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly, downTimeQuery );
+      const 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 ) => accumulator + currentValue.down_time, 0 );
+        const average = sum / streamwiseDowntime.length;
+        obj[obj.startTime + '-' + obj.endTime] = Math.round( average );
+      } else {
+        obj[obj.startTime + '-' + obj.endTime] = '';
       }
-      const mergedData = {
-        Date: dayjs( req.body.Date ).format( 'YYYY-MM-DD' ),
-      };
-      timewise.forEach( ( obj ) => {
-        for ( const key in obj ) {
-          if ( key !== 'hour' && key !== 'from' && key !== 'to' && key !== 'startTime' && key !== 'endTime' && key !== 'clientId' ) {
-            if ( mergedData[key] ) {
-              mergedData[key] += obj[key];
-            } else {
-              mergedData[key] = obj[key];
-            }
+      return obj;
+    } );
+
+    const timewise = await Promise.all( queryPromises );
+
+
+    const mergedData = {
+      Date: dayjs( singleDate ).format( 'YYYY-MM-DD' ),
+    };
+
+    timewise.forEach( ( obj ) => {
+      for ( const key in obj ) {
+        if ( key !== 'hour' && key !== 'from' && key !== 'to' && key !== 'startTime' && key !== 'endTime' && key !== 'clientId' ) {
+          if ( mergedData[key] ) {
+            mergedData[key] += obj[key];
+          } else {
+            mergedData[key] = obj[key];
           }
         }
-      } );
+      }
+    } );
 
-      // Create an array with the merged data.
-      const mergedArray = [ mergedData ];
-      Resolve( mergedArray );
-    } catch ( err ) {
-      Reject( err );
-    }
-  } );
+    return [ mergedData ];
+  } catch ( err ) {
+    throw err;
+  }
 }

package/src/controllers/userInfra.controller.js

@@ -24,7 +24,8 @@ export async function userTakeTicket( req, res ) {
     if ( req.body.issueType == 'infra' ) {
       let query = {
         'status': { $ne: 'closed' },
-        'issueType': 'infra', 'ticketDetails.assigntoUser': true,
+        'issueType': 'infra',
+        'ticketDetails.assigntoUser': true,
         'ticketDetails.addressingUser': { $exists: false },
         'ticketDetails.issueStatus': 'notidentified',
         'ticketDetails.addressingClient': { $exists: false },
@@ -37,11 +38,12 @@ export async function userTakeTicket( req, res ) {
       if ( !userTicket ) {
         let query = {
           'status': { $ne: 'closed' },
-          'basicDetails.clientId': { $in: assignedClients },
           'issueType': 'infra',
-          'ticketType': 'refreshticket',
+          'ticketDetails.ticketType': 'refreshticket',
           'ticketDetails.refreshTicketStatus': 'notidentified',
         };
+        console.log( query, assignedClients );
+
         if ( assignedClients.length > 0 ) {
           query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
         }
@@ -130,22 +132,15 @@ export async function userTicketList( req, res ) {
         },
       } );
     }
-    if ( req.body.status != 'closed' || req.body.export ) {
-      query.push( {
-        $match: {
-          $and: [
-            { updatedAt: { $gte: date.start } },
-            { updatedAt: { $lte: date.end } },
-          ],
-        },
-      } );
-    } else {
-      query.push( {
-        $match: {
-          updatedAt: { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) },
-        },
-      } );
-    }
+
+    query.push( {
+      $match: {
+        $and: [
+          { updatedAt: { $gte: date.start } },
+          { updatedAt: { $lte: date.end } },
+        ],
+      },
+    } );
     if ( req.body.status && req.body.status != '' ) {
       query.push( {
         $match: {
@@ -359,7 +354,6 @@ export async function workHistory( req, res ) {
         $match: {
           $and: [
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { 'status': 'closed' },
             { issueType: req.body.issueType },
             { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
           ],
@@ -370,7 +364,6 @@ export async function workHistory( req, res ) {
         $match: {
           $and: [
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { 'status': 'closed' },
             { issueType: { $in: [ 'highcount', 'lowcount' ] } },
             { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
           ],
@@ -427,6 +420,18 @@ export async function workHistory( req, res ) {
             },
         );
       }
+    } else {
+      query.push(
+          {
+            $match: {
+              $and: [
+                { createdAt: { $gte: date.start } },
+                { createdAt: { $lte: date.end } },
+              ],
+
+            },
+          },
+      );
     }
 
     if ( req.body.storeFilter && req.body.storeFilter.length > 0 ) {
@@ -544,6 +549,8 @@ export async function workHistory( req, res ) {
             'Closed on': element.issueClosedDate,
             'Issue Identified on': element.issueIdentifiedDate,
             'Issue Type': element.infraIssue ? element.infraIssue : '-',
+            'Status': element.status,
+
           };
         }
         if ( req.body.issueType === 'dataMismatch' ) {
@@ -557,6 +564,7 @@ export async function workHistory( req, res ) {
             'Issue date': dayjs( element.issueDate ).format( 'DD MMM, YYYY' ),
             'Closed on': element.issueClosedDate,
             'Issue Type': element.issueType ? element.issueType : '-',
+            'Status': element.status,
           };
         }
         exportdata.push( data );

package/src/validations/infra.validation.js

@@ -29,19 +29,18 @@ export async function validateDetails( req, res, next ) {
       clientName: client.clientName,
     };
     req.body.emailAlert = client.ticketConfigs.emailAlert;
-    if ( req.body.issueType == 'infra' ) {
-      let refreshdate = dayjs().add( client.ticketConfigs.refreshAlert, 'days' );
-      req.body.ticketDetails = {
-        ticketRefreshTime: new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
-      };
-    } else if ( req.body.issueType == 'installation' ) {
+    // if ( req.body.issueType == 'infra' ) {
+    //   let refreshdate = dayjs().add( client.ticketConfigs.refreshAlert, 'days' );
+    //   req.body.ticketDetails = {
+    //     ticketRefreshTime: new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
+    //   };
+    // }
+    if ( req.body.issueType == 'installation' ) {
       let refreshdate = dayjs().add( client.ticketConfigs.installationReAssign, 'days' );
       req.body.ticketDetails = {
         ticketRefreshTime: new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
       };
     }
-
-
     next();
   } catch ( error ) {
     logger.error( { error: error, function: 'validateDetails' } );