tango-app-api-infra 3.9.2 → 3.9.4

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.9.2",
+    "version": "3.9.4",
     "description": "infra",
     "main": "index.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node app.js\""
+        "start": "nodemon --exec \"eslint --fix . && node index.js\""
     },
     "engines": {
         "node": ">=18.10.0"

package/src/controllers/clientInfra.controller.js

@@ -15,9 +15,9 @@ import { countDocumentsClusters } from '../services/cluster.service.js';
 export async function infraCard( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let storecountQuery ={ 'clientId': { $in: req.body.clientId }, 'createdAt': { $lte: date.end }, 'status': 'active' };
+    let storecountQuery = { 'clientId': { $in: req.body.clientId }, 'createdAt': { $lte: date.end }, 'status': 'active' };
 
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       storecountQuery = { ...storecountQuery, ...{ storeId: { $in: req.body.assignedStores } } };
     }
 
@@ -39,7 +39,7 @@ export async function infraCard( req, res ) {
       },
     ];
 
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       yetToInstallQuery.push(
           {
             $match: {
@@ -49,8 +49,8 @@ export async function infraCard( req, res ) {
       );
     }
     let yettoInstallCount = await aggregateTangoTicket( yetToInstallQuery );
-    storeCount = storeCount-yettoInstallCount.length;
-    let totalStoreQuery =[ {
+    storeCount = storeCount - yettoInstallCount.length;
+    let totalStoreQuery = [ {
       $match: {
         '$and': [
           { 'clientId': { $in: req.body.clientId } },
@@ -59,7 +59,7 @@ export async function infraCard( req, res ) {
         ],
       },
     } ];
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       totalStoreQuery.push(
           {
             $match: {
@@ -210,18 +210,18 @@ export async function infraCard( req, res ) {
     } );
     response.unshift( {
       name: 'All Issues',
-      count: infraStoreCount.length > 0 ? req.body.filter && req.body.filter.length > 0?ticketList.length:( 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 ?( req.body.filter && req.body.filter.length > 0 )?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,
+      infraStoreCount: infraStoreCount.length > 0 ? infraStoreCount[0].notidentifiedcount + ticketList.length : 0,
       identifiedcount: infraStoreCount.length > 0 ? ticketList.length : 0,
-      notidentifiedcount: infraStoreCount.length > 0 ?( req.body.filter && req.body.filter.length > 0 )?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 ) {
@@ -238,7 +238,7 @@ export async function installationCard( req, res ) {
     };
 
 
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       baseQuery = { ...baseQuery, ...{ storeId: { $in: req.body.assignedStores } } };
     }
     let onboardQuery = { ...baseQuery };
@@ -264,7 +264,7 @@ export async function installationCard( req, res ) {
         },
       },
     ];
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       ticketbaseQuery.push(
           {
             $match: {
@@ -350,8 +350,8 @@ export async function installationCard( req, res ) {
     res.sendSuccess( {
       onboardedStoresCount: onboardedCount,
       inactiveStoresCount: deactiveCount,
-      installedStoresCount: installedCount-yettoInstallCount.length,
-      yettoInstallCount: yettoInstallCount.length-installFailedCount.length,
+      installedStoresCount: installedCount - yettoInstallCount.length,
+      yettoInstallCount: yettoInstallCount.length - installFailedCount.length,
       installFailedCount: installFailedCount.length,
       infraIssues: response,
     } );
@@ -381,7 +381,7 @@ export async function infraIssuesTable( req, res ) {
         ],
       },
     } ];
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       totalStoreQuery.push(
           {
             $match: {
@@ -406,7 +406,7 @@ export async function infraIssuesTable( req, res ) {
         ],
       },
     } );
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       pendingquery.push(
           {
             $match: {
@@ -443,6 +443,13 @@ export async function infraIssuesTable( req, res ) {
           createdAt: 1,
           issueIdentifiedDate: '$ticketDetails.issueIdentifiedDate',
           issueClosedDate: '$issueClosedDate',
+          otherscomment: {
+            $filter: {
+              input: '$ticketActivity',
+              as: 'item',
+              cond: { $eq: [ '$$item.actionType', 'comment' ] },
+            },
+          },
           primaryIssue: {
             $filter: {
               input: '$ticketActivity',
@@ -452,6 +459,11 @@ export async function infraIssuesTable( req, res ) {
           },
         },
       },
+      {
+        $unwind: {
+          path: '$otherscomment', preserveNullAndEmptyArrays: true,
+        },
+      },
       {
         $unwind: {
           path: '$primaryIssue',
@@ -478,6 +490,8 @@ export async function infraIssuesTable( req, res ) {
           createdAt: 1,
           ticketId: 1,
           clientName: 1,
+          commentText: { $ifNull: [ '$primaryIssue.comment', '-' ] },
+          otherscomment: { $ifNull: [ '$otherscomment.comment', '-' ] },
           issueIdentifiedBy: { $ifNull: [ '$primaryIssue.actionBy', '' ] },
           issueIdentifiedDate: { $ifNull: [ '$issueIdentifiedDate', '' ] },
           issueClosedDate: { $ifNull: [ '$issueClosedDate', '' ] },
@@ -501,6 +515,7 @@ export async function infraIssuesTable( req, res ) {
           status: { $last: '$status' },
           primaryIssue: { $last: '$primaryIssue' },
           secondaryIssue: { $last: '$secondaryIssue' },
+          commentText: { $last: '$commentText' },
         },
       },
     ];
@@ -539,7 +554,7 @@ export async function infraIssuesTable( req, res ) {
           },
       );
 
-      if ( infraissueStore&&infraissueStore.length==0 ) {
+      if ( infraissueStore && infraissueStore.length == 0 ) {
         storesQuery = [ {
           $match: {
             '$and': [
@@ -552,7 +567,7 @@ export async function infraIssuesTable( req, res ) {
         } ];
       }
     }
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       storesQuery.push(
           {
             $match: {
@@ -682,10 +697,12 @@ export async function infraIssuesTable( req, res ) {
             'Created On': dayjs( element.createdAt ).format( 'DD MMM, YYYY' ),
             'StoreID': element.storeId,
             'StoreName': element.storeName,
+            'clientName': element.clientName,
             'Primary Issue': element.primaryIssue,
             'Sub Issue': element.secondaryIssue,
             'Issue Identified on': element.issueIdentifiedDate ? dayjs( element.issueIdentifiedDate ).format( 'DD MMM, YYYY' ) : '',
             'Status': element.status,
+            'Comment': element.otherscomment ? element.otherscomment : element.commentText,
           };
         }
       } );
@@ -720,7 +737,7 @@ export async function InstallationIssuesTable( req, res ) {
         ],
       },
     } );
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       query.push(
           {
             $match: {
@@ -792,7 +809,7 @@ export async function InstallationIssuesTable( req, res ) {
     },
     );
     let storesQuery = [];
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       storesQuery.push(
           {
             $match: {
@@ -1154,7 +1171,7 @@ export async function hourWiseDownstores( req, res ) {
         ],
       },
     } ];
-    if ( req.user&&req.user.userType ==='client' &&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       totalStoreQuery.push(
           {
             $match: {
@@ -1179,7 +1196,7 @@ export async function hourWiseDownstores( req, res ) {
         ],
       },
     } );
-    if ( req.user&&req.user.userType ==='client' &&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       pendingquery.push(
           {
             $match: {
@@ -1311,7 +1328,7 @@ export async function hourWiseDownstores( req, res ) {
             },
           },
       );
-      if ( infraissueStore&&infraissueStore.length==0 ) {
+      if ( infraissueStore && infraissueStore.length == 0 ) {
         storesQuery = [ {
           $match: {
             '$and': [
@@ -1324,7 +1341,7 @@ export async function hourWiseDownstores( req, res ) {
         } ];
       }
     }
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user && req.user.userType === 'client' ) {
       storesQuery.push(
           {
             $match: {
@@ -1475,7 +1492,7 @@ async function downStoresCheck( data, inputData ) {
       startTime: dayjs( slot.from ).format( 'hh:mm A' ),
       endTime: dayjs( slot.to ).format( 'hh:mm A' ),
     } ) );
-    let Totaldowntime=0;
+    let Totaldowntime = 0;
 
     const downTimePromises = formattedTimeSlots.map( async ( obj ) => {
       const downTime = await getOpenSearchData(
@@ -1500,7 +1517,7 @@ async function downStoresCheck( data, inputData ) {
       const average = streamwiseDowntime.length ?
         Math.round( streamwiseDowntime.reduce( ( acc, curr ) => acc + curr.down_time, 0 ) / streamwiseDowntime.length ) :
         '';
-      Totaldowntime= Number( Totaldowntime ) + Number( average );
+      Totaldowntime = Number( Totaldowntime ) + Number( average );
       return { ...obj, [`${obj.startTime}-${obj.endTime}`]: average };
     } );
 
@@ -1538,7 +1555,7 @@ export async function ticketCountSplit( req, res ) {
       { issueType: { $in: [ 'highcount', 'lowcount' ] } },
 
     ];
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       filter.push( { 'basicDetails.storeId': { $in: req.body.assignedStores } } );
     }
     if ( req.user.userType === 'client' ) {
@@ -1619,7 +1636,7 @@ export async function overViewTable( req, res ) {
         'basicDetails.clientId': { $in: inputData.clientId },
       },
     ];
-    if ( req.user&&req.user.userType ==='client' ) {
+    if ( req.user && req.user.userType === 'client' ) {
       filter.push( { 'basicDetails.storeId': { $in: req.body.assignedStores } } );
     }
     if ( req.user.userType === 'client' ) {
@@ -1630,7 +1647,7 @@ export async function overViewTable( req, res ) {
         issueType: { $in: inputData.issueType },
       } );
     }
-    if ( inputData?.status && inputData?.status!='' ) {
+    if ( inputData?.status && inputData?.status != '' ) {
       filter.push( {
         status: inputData?.status,
       } );
@@ -1670,7 +1687,8 @@ export async function overViewTable( req, res ) {
     if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
       query.push( {
-        $sort: { [inputData.sortColumnName]: sortBy,
+        $sort: {
+          [inputData.sortColumnName]: sortBy,
         },
       } );
     }
@@ -1717,7 +1735,7 @@ export async function ticketCount( req, res ) {
       },
 
     ];
-    if ( req.user&&req.user.userType ==='client' &&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       filter.push( { 'basicDetails.storeId': { $in: req.body.assignedStores } } );
     }
     if ( req.user.userType === 'client' ) {
@@ -1783,7 +1801,7 @@ export async function ticketCount( req, res ) {
 };
 export async function checkPermission( req, res, next ) {
   try {
-    let result =[];
+    let result = [];
     if ( req.user.role !== 'superadmin' && req.user.userType == 'client' ) {
       const assignedUser = await findUserAssignedStore( { userEmail: req.user.email } );
       if ( assignedUser.length == 0 ) {
@@ -1875,9 +1893,9 @@ export async function checkPermission( req, res, next ) {
           result = await aggregateUserAssignedStore( assignedQuery );
           break;
       }
-      if ( result&&result.length>0 ) {
+      if ( result && result.length > 0 ) {
         const uniqueArray = [ ...new Set( result[0].storeList ) ];
-        req.body.assignedStores =uniqueArray;
+        req.body.assignedStores = uniqueArray;
       }
     }
     next();
@@ -1889,9 +1907,9 @@ export async function checkPermission( req, res, next ) {
 
 export async function getcount( req, res ) {
   try {
-    let storecountQuery ={ 'clientId': { $in: req.body.clientId }, 'status': 'active' };
+    let storecountQuery = { 'clientId': { $in: req.body.clientId }, 'status': 'active' };
 
-    if ( req.user&&req.user.userType ==='client'&&req.user.role!='superadmin' ) {
+    if ( req.user && req.user.userType === 'client' && req.user.role != 'superadmin' ) {
       storecountQuery = { ...storecountQuery, ...{ storeId: { $in: req.body.assignedStores } } };
     }
 

package/src/controllers/internalInfra.controller.js

@@ -826,7 +826,7 @@ export async function checkStoreTimezoneMatchesInterval( times, storeTimezone )
     const currentStoreTime = dayjs().tz( storeTimezone );
     const intervalTime = dayjs.tz( `${currentStoreTime.format( 'YYYY-MM-DD' )} ${interval}`, 'YYYY-MM-DD HH:mm', storeTimezone );
     const diffInMinutes = intervalTime.diff( currentStoreTime, 'minute' );
-    // console.log( diffInMinutes );
+    console.log( diffInMinutes );
     return diffInMinutes >= 0 && diffInMinutes <= 15;
   } );
 };
@@ -917,7 +917,7 @@ export async function infraReportSent( req, res ) {
         status: 1,
         ticketDetails: 1,
         issueClosedDate: 1,
-        ommentText: { $ifNull: [ '$primaryIssue.comment', '-' ] },
+        commentText: { $ifNull: [ '$primaryIssue.comment', '-' ] },
         otherscomment: { $ifNull: [ '$otherscomment.comment', '-' ] },
         primaryIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '-' ] },
         secondaryIssue: { $ifNull: [ '$primaryIssue.reasons.secondaryIssue.name', '-' ] },
@@ -1436,7 +1436,7 @@ export async function edgeApplogsCheck( req, res ) {
               item.ticketId === ticket.ticketId,
             );
             if ( !existsInArray ) {
-              if ( diffInMinutes>60 ) {
+              if ( diffInMinutes>60 &&diffInMinutes<=180 ) {
                 findissueEdgeApp = {
                   ticketId: ticket.ticketId,
                   edgelog: findissue,

package/src/controllers/storeInfra.controlller.js

@@ -2,6 +2,7 @@
 import { logger, getOpenSearchData, download, getUTC } from 'tango-app-api-middleware';
 import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findOneStore } from '../services/store.service.js';
+import { findOneCamera, findCamera } from '../services/camera.service.js';
 import dayjs from 'dayjs';
 import { findinfraReason } from '../services/infraReason.service.js';
 import { signedUrl } from 'tango-app-api-middleware';
@@ -160,7 +161,7 @@ export async function storeTicketList( req, res ) {
         primaryIssue: { $last: '$primaryIssue' },
         secondaryIssue: { $last: '$secondaryIssue' },
         otherscomment: { $last: '$otherscomment' },
-
+        otherscomment: { $last: '$otherscomment' },
       },
     },
     {
@@ -170,7 +171,7 @@ export async function storeTicketList( req, res ) {
     },
     );
 
-    if ( req.body.filter &&req.body.filter.length>0 ) {
+    if ( req.body.filter && req.body.filter.length > 0 ) {
       query.push( {
         $match: {
           primaryIssue: { $in: req.body.filter },
@@ -185,7 +186,7 @@ export async function storeTicketList( req, res ) {
           'STORE ID': element.storeId,
           'TICKET ID': element.ticketId,
           'DATE': dayjs( element.createdAt ).format( 'DD MMM, YYYY' ),
-          'ISSUE CLOSED DATE': element.issueClosedDate?dayjs( element.issueClosedDate ).format( 'DD MMM, YYYY' ):'',
+          'ISSUE CLOSED DATE': element.issueClosedDate ? dayjs( element.issueClosedDate ).format( 'DD MMM, YYYY' ) : '',
           'PRIMARY ISSUE': element.primaryIssue,
           'SECONDARY ISSUE': element.secondaryIssue,
           'STATUS': element.status,
@@ -326,8 +327,14 @@ export async function edgeAppLogTable( req, res ) {
     const timeSlots = generateTimeSlots( startHour, endHour, interval, req );
 
     const date = dayjs( timeSlots[0].from ).format( 'DD-MM-YYYY' );
-    const storeId = req.body.storeId;
-
+    let storeId = req.body.storeId;
+    let camera = await findCamera( { storeId: req.body.storeId, isActivated: true, isUp: true } );
+    let findMasterServer = camera.find( ( data ) => data.masterServer != null );
+    if ( findMasterServer && findMasterServer.masterServer && findMasterServer.masterServer != null ) {
+      storeId = findMasterServer.masterServer;
+    }
+    let allstreams = camera.map( ( data ) => data.streamName );
+    console.log( allstreams, storeId );
     const internetSpeedQuery = {
       size: 100,
       query: {
@@ -351,7 +358,7 @@ export async function edgeAppLogTable( req, res ) {
           must: [
             { term: { 'log_type.keyword': 'Application' } },
             { term: { 'store_date.keyword': date } },
-            { term: { 'storeId.keyword': storeId } },
+            { term: { 'data.store_id.keyword': req.body.storeId } },
             { term: { 'log_subtype.keyword': 'Zip_File_Count' } },
           ],
         },
@@ -359,6 +366,21 @@ export async function edgeAppLogTable( req, res ) {
       sort: [ { timestamp: { order: 'desc' } } ],
       _source: [ 'data.files_pushed', 'data.files_generated', 'data.occuringTime' ],
     };
+    const videoCountQuery = {
+      size: 100,
+      query: {
+        bool: {
+          must: [
+            { term: { 'log_type.keyword': 'Application' } },
+            { term: { 'store_date.keyword': date } },
+            { term: { 'storeId.keyword': req.body.storeId } },
+            { term: { 'log_subtype.keyword': 'VideoFileUpload_Status' } },
+          ],
+        },
+      },
+      sort: [ { timestamp: { order: 'desc' } } ],
+      _source: [ 'data.files_pushed', 'data.files_generated', 'data.occuringTime' ],
+    };
 
     const downTimeQuery = {
       size: 100,
@@ -366,7 +388,7 @@ export async function edgeAppLogTable( req, res ) {
         bool: {
           must: [
             { term: { 'doc.date.keyword': date } },
-            { term: { 'doc.store_id.keyword': storeId } },
+            { term: { 'doc.store_id.keyword': req.body.storeId } },
           ],
         },
       },
@@ -374,15 +396,18 @@ export async function edgeAppLogTable( req, res ) {
     };
 
     // Execute all queries in parallel
-    const [ speedTestResult, fileCountResult, downtimeResult ] = await Promise.all( [
+    const [ speedTestResult, fileCountResult, videoCountResult, 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 ).edgeAppSystemLogs, videoCountQuery ),
       getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly, downTimeQuery ),
     ] );
     // Process results
+    console.log( fileCountResult );
     const speedTestData = speedTestResult?.body?.hits?.hits ?? [];
     const fileCountData = fileCountResult?.body?.hits?.hits ?? [];
     const downtimeData = downtimeResult?.body?.hits?.hits ?? [];
+    const videofileCountData = videoCountResult?.body?.hits?.hits ?? [];
 
     for ( const obj of timeSlots ) {
       if ( ( obj.hour ).toString().length === 1 ) {
@@ -397,7 +422,7 @@ export async function edgeAppLogTable( req, res ) {
       const speedTest = speedTestData.find(
           ( item ) => Number( item._source.data.occuringTime.split( ':' )[0] ) === Number( hour ),
       );
-      if ( speedTest&&speedTest._source.data.upload_Speed =='0 bytes' ) {
+      if ( speedTest && speedTest._source.data.upload_Speed == '0 bytes' ) {
         obj.Internetspeed = '0 MB/sec';
       } else {
         obj.Internetspeed = speedTest ? `${bytesToMB( speedTest._source.data.upload_Speed.split( '.' )[0] ).toFixed( 2 )} MB/sec` : '';
@@ -411,6 +436,13 @@ export async function edgeAppLogTable( req, res ) {
 
       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 ) || '';
+      // video File counts
+      const videofileCounts = videofileCountData.filter(
+          ( item ) => Number( item._source.data.occuringTime.split( ':' )[0] ) === Number( hour ),
+      );
+
+      obj.videofiles_pushed = videofileCounts.reduce( ( sum, item ) => sum + Number( item._source.data.files_pushed ), 0 ) || '';
+      obj.videofiles_generated = videofileCounts.reduce( ( sum, item ) => sum + Number( item._source.data.files_generated ), 0 ) || '';
 
       // Downtime
       const downtime = downtimeData.find( ( item ) => Number( item._source.doc.hour ) === Number( hour ) );
@@ -431,10 +463,12 @@ export async function edgeAppLogTable( req, res ) {
     if ( req.body.export ) {
       const exportData = timeSlots.map( ( element ) => ( {
         'Time Stamp': `${element.startTime}-${element.endTime}`,
-        'Downtime': element.downtime?element.downtime +' Mins':'--',
+        'Downtime': element.downtime ? element.downtime + ' Mins' : '--',
         'Avg Internet Speed': element.Internetspeed,
-        'Files Generated': element.files_generated,
-        'Files Pushed': element.files_pushed,
+        'Tracking Files Generated': element.videofiles_generated,
+        'Tracking Files Pushed': element.videofiles_pushed,
+        'Traffic Files Generated': element.files_generated,
+        'Traffic Files Pushed': element.files_pushed,
       } ) );
       await download( exportData, res );
       return;
@@ -815,7 +849,7 @@ export async function streamwiseDowntime( req, res ) {
     const downTimeIndex = parsedOpenSearch.downTimeHourly;
 
     const batchRequests = TimeSlots.map( async ( obj ) => {
-      if ( ( obj.hour ).toString().length ===1 ) {
+      if ( ( obj.hour ).toString().length === 1 ) {
         obj.hour = obj.hour.toString().padStart( 2, '0' );
       }
 
@@ -854,6 +888,220 @@ export async function streamwiseDowntime( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+export async function edgeAppCameralogs( req, res ) {
+  try {
+    const store = await findOneStore( { storeId: req.body.storeId } );
+    if ( !store ) {
+      return res.sendError( 'Store Not found', 204 );
+    }
+
+    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 streamName = req.body.stream;
+    const streamData = await findOneCamera( { streamName: streamName } );
+    if ( !streamData ) {
+      return res.sendError( 'camera Not found', 204 );
+    }
+
+    const internetSpeedQuery = {
+      size: 100,
+      query: {
+        bool: {
+          must: [
+            { term: { 'log_type.keyword': 'Application' } },
+            { term: { 'store_date.keyword': date } },
+            { term: { 'storeId.keyword': streamData.masterServer != null ? streamData.masterServer : 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: { 'data.stream_name.keyword': streamName } },
+            { term: { 'log_subtype.keyword': 'Zip_File_Count' } },
+          ],
+        },
+      },
+      sort: [ { timestamp: { order: 'desc' } } ],
+      _source: [ 'data.files_pushed', 'data.files_generated', 'data.occuringTime' ],
+    };
+    const videoCountQuery = {
+      size: 100,
+      query: {
+        bool: {
+          must: [
+            { term: { 'log_type.keyword': 'Application' } },
+            { term: { 'store_date.keyword': date } },
+            // { term: { 'storeId.keyword': storeId } },
+            { term: { 'data.stream_name.keyword': streamName } },
+
+            { term: { 'log_subtype.keyword': 'VideoFileUpload_Status' } },
+          ],
+        },
+      },
+      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, videoCountResult, 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 ).edgeAppSystemLogs, videoCountQuery ),
+      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 ?? [];
+    const videofileCountData = videoCountResult?.body?.hits?.hits ?? [];
+
+    for ( const obj of timeSlots ) {
+      if ( ( obj.hour ).toString().length === 1 ) {
+        obj.hour = obj.hour.toString().padStart( 2, '0' );
+      }
+      const hour = obj.hour;
+      obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
+      obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
+
+      // Internet speed
+
+      const speedTest = speedTestData.find(
+          ( item ) => Number( item._source.data.occuringTime.split( ':' )[0] ) === Number( hour ),
+      );
+      if ( speedTest && speedTest._source.data.upload_Speed == '0 bytes' ) {
+        obj.Internetspeed = '0 MB/sec';
+      } else {
+        obj.Internetspeed = speedTest ? `${bytesToMB( speedTest._source.data.upload_Speed.split( '.' )[0] ).toFixed( 2 )} MB/sec` : '';
+      }
+
+
+      // File counts
+      const fileCounts = fileCountData.filter(
+          ( item ) => Number( item._source.data.occuringTime.split( ':' )[0] ) === Number( 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 ) || '';
+      // video File counts
+      const videofileCounts = videofileCountData.filter(
+          ( item ) => Number( item._source.data.occuringTime.split( ':' )[0] ) === Number( hour ),
+      );
+
+      obj.videofiles_pushed = videofileCounts.reduce( ( sum, item ) => sum + Number( item._source.data.files_pushed ), 0 ) || '';
+      obj.videofiles_generated = videofileCounts.reduce( ( sum, item ) => sum + Number( item._source.data.files_generated ), 0 ) || '';
+
+      // Downtime
+      const downtime = downtimeData.find( ( item ) => Number( item._source.doc.hour ) === Number( hour ) );
+
+      if ( downtime ) {
+        const streamwiseDowntime = downtime._source.doc.streamwise_downtime || [];
+
+        const downtimeData = streamwiseDowntime.find( ( item ) => item.stream === streamName );
+        if ( downtimeData ) {
+          obj.downtime = downtimeData?.down_time;
+        } else {
+          obj.downtime = '';
+        }
+      } else {
+        obj.downtime = '';
+      }
+    }
+
+    if ( req.body.export ) {
+      const exportData = timeSlots.map( ( element ) => ( {
+        'Time Stamp': `${element.startTime}-${element.endTime}`,
+        'Downtime': element.downtime ? element.downtime + ' Mins' : '--',
+        'Avg Internet Speed': element.Internetspeed,
+        'Tracking Files Generated': element.videofiles_generated,
+        'Tracking Files Pushed': element.videofiles_pushed,
+        'Traffic Files Generated': element.files_generated,
+        'Traffic Files Pushed': element.files_pushed,
+      } ) );
+      await download( exportData, res );
+      return;
+    }
+    let totalCount = 0;
+    const query = {
+      'size': 10000,
+      'query': {
+        bool: {
+          must: [
+            {
+              term: {
+                'store_date.keyword': dayjs( req.body.Date ).format( 'DD-MM-YYYY' ),
+              },
+            },
+            {
+              term: {
+                'store_id.keyword': storeId,
+              },
+            },
+            {
+              term: {
+                'stream_id.keyword': streamName,
+              },
+            },
+          ],
+        },
+      },
+      'sort': [ { timestamp: { order: 'desc' } } ],
+      '_source': [ 'fileSize', 'store_id', 'stream_id' ],
+
+    };
+
+    const storeSizeData = await getOpenSearchData(
+        JSON.parse( process.env.OPENSEARCH ).edgeAppFilelogs,
+        query,
+    );
+    if ( storeSizeData?.body?.hits?.hits == undefined || storeSizeData?.body?.hits?.hits == null ) {
+      return res.sendError( { message: 'Data not found' }, 204 );
+    }
+
+    for ( const count of storeSizeData.body?.hits?.hits ) {
+      totalCount += Number( count._source.fileSize );
+    }
+
+
+    res.sendSuccess( {
+      result: timeSlots,
+      totalData: {
+        totalCount: totalCount,
+      },
+    } );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'streamwiseDowntime' } );
+    return res.sendError( error, 500 );
+  }
+}
 
 
 export async function livecountCheck( inputData, singleDate, req ) {
@@ -916,7 +1164,7 @@ export async function livecountCheck( inputData, singleDate, req ) {
 
 export async function edgeappFileSize( req, res ) {
   try {
-    let totalCount=0;
+    let totalCount = 0;
     const query = {
       'size': 10000,
       'query': {
@@ -944,12 +1192,12 @@ export async function edgeappFileSize( req, res ) {
         JSON.parse( process.env.OPENSEARCH ).edgeAppFilelogs,
         query,
     );
-    if ( storeSizeData?.body?.hits?.hits ==undefined|| storeSizeData?.body?.hits?.hits ==null ) {
+    if ( storeSizeData?.body?.hits?.hits == undefined || storeSizeData?.body?.hits?.hits == null ) {
       return res.sendError( { message: 'Data not found' }, 204 );
     }
 
     for ( const count of storeSizeData.body?.hits?.hits ) {
-      totalCount+=Number( count._source.fileSize );
+      totalCount += Number( count._source.fileSize );
     }
 
     const queryAvg = {
@@ -989,7 +1237,7 @@ export async function edgeappFileSize( req, res ) {
 
     res.sendSuccess( {
       totalCount: totalCount,
-      avgCount: totalCount/( storeAvgSizeData.body.aggregations.grouped_by_store_id.buckets.length ),
+      avgCount: totalCount / ( storeAvgSizeData.body.aggregations.grouped_by_store_id.buckets.length ),
       totalCam: storeAvgSizeData.body.aggregations.grouped_by_store_id.buckets.length,
     } );
   } catch ( error ) {

package/src/routes/storeInfra.routes.js

@@ -1,7 +1,7 @@
 
 import express from 'express';
 import { isAllowedSessionHandler } from 'tango-app-api-middleware';
-import { storeTicketList, storeTicketcard, edgeAppLogTable, viewedgeAppLog, isAllowedStore, cameraAngleChange, datewiseDowntime, streamwiseDowntime, edgeappFileSize } from '../controllers/storeInfra.controlller.js';
+import { storeTicketList, storeTicketcard, edgeAppLogTable, viewedgeAppLog, isAllowedStore, cameraAngleChange, edgeAppCameralogs, datewiseDowntime, streamwiseDowntime, edgeappFileSize } from '../controllers/storeInfra.controlller.js';
 export const storeInfraRouter = express.Router();
 
 storeInfraRouter.post( '/storeTicketList', isAllowedSessionHandler, isAllowedStore, storeTicketList );
@@ -11,5 +11,6 @@ storeInfraRouter.post( '/viewedgeAppLog', isAllowedSessionHandler, isAllowedStor
 storeInfraRouter.post( '/cameraAngleChange', isAllowedSessionHandler, isAllowedStore, cameraAngleChange );
 storeInfraRouter.post( '/datewiseDowntime', isAllowedSessionHandler, isAllowedStore, datewiseDowntime );
 storeInfraRouter.post( '/streamwiseDowntime', isAllowedSessionHandler, isAllowedStore, streamwiseDowntime );
+storeInfraRouter.post( '/edgeAppCameralogs', isAllowedSessionHandler, isAllowedStore, edgeAppCameralogs );
 
 storeInfraRouter.post( '/edgeappFileSize', isAllowedSessionHandler, isAllowedStore, edgeappFileSize );

package/src/services/camera.service.js

@@ -3,6 +3,12 @@ import cameraModel from 'tango-api-schema/schema/camera.model.js';
 export async function aggregateCamera( query ) {
   return await cameraModel.aggregate( query );
 }
+export async function findOneCamera( query ) {
+  return await cameraModel.findOne( query );
+}
+export async function findCamera( query ) {
+  return await cameraModel.find( query );
+}
 export async function updateOneCamera( query, record ) {
   return await cameraModel.updateOne( query, { $set: record } );
 }