tango-app-api-infra 3.9.3 → 3.9.4

package/package.json

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

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';
@@ -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' } },
           ],
         },
@@ -366,7 +373,7 @@ export async function edgeAppLogTable( req, res ) {
           must: [
             { term: { 'log_type.keyword': 'Application' } },
             { term: { 'store_date.keyword': date } },
-            { term: { 'storeId.keyword': storeId } },
+            { term: { 'storeId.keyword': req.body.storeId } },
             { term: { 'log_subtype.keyword': 'VideoFileUpload_Status' } },
           ],
         },
@@ -381,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 } },
           ],
         },
       },
@@ -396,6 +403,7 @@ export async function edgeAppLogTable( req, res ) {
       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 ?? [];
@@ -895,6 +903,10 @@ export async function edgeAppCameralogs( req, res ) {
     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,
@@ -903,7 +915,7 @@ export async function edgeAppCameralogs( req, res ) {
           must: [
             { term: { 'log_type.keyword': 'Application' } },
             { term: { 'store_date.keyword': date } },
-            { term: { 'storeId.keyword': storeId } },
+            { term: { 'storeId.keyword': streamData.masterServer != null ? streamData.masterServer : storeId } },
             { term: { 'log_subtype.keyword': 'Speed_Test' } },
           ],
         },
@@ -919,7 +931,7 @@ export async function edgeAppCameralogs( req, res ) {
           must: [
             { term: { 'log_type.keyword': 'Application' } },
             { term: { 'store_date.keyword': date } },
-            { term: { 'storeId.keyword': storeId } },
+            // { term: { 'storeId.keyword': storeId } },
             { term: { 'data.stream_name.keyword': streamName } },
             { term: { 'log_subtype.keyword': 'Zip_File_Count' } },
           ],
@@ -935,7 +947,7 @@ export async function edgeAppCameralogs( req, res ) {
           must: [
             { term: { 'log_type.keyword': 'Application' } },
             { term: { 'store_date.keyword': date } },
-            { term: { 'storeId.keyword': storeId } },
+            // { term: { 'storeId.keyword': storeId } },
             { term: { 'data.stream_name.keyword': streamName } },
 
             { term: { 'log_subtype.keyword': 'VideoFileUpload_Status' } },
@@ -1050,7 +1062,12 @@ export async function edgeAppCameralogs( req, res ) {
             },
             {
               term: {
-                'store_id.keyword': req.body.storeId,
+                'store_id.keyword': storeId,
+              },
+            },
+            {
+              term: {
+                'stream_id.keyword': streamName,
               },
             },
           ],
@@ -1073,49 +1090,11 @@ export async function edgeAppCameralogs( req, res ) {
       totalCount += Number( count._source.fileSize );
     }
 
-    const queryAvg = {
-      query: {
-        bool: {
-          must: [
-            {
-              term: {
-                'store_date.keyword': dayjs( req.body.Date ).format( 'DD-MM-YYYY' ),
-              },
-            },
-            {
-              term: {
-                'store_id.keyword': req.body.storeId,
-              },
-            },
-          ],
-        },
-      },
-      sort: [ { timestamp: { order: 'desc' } } ],
-      _source: [ 'fileSize', 'store_id', 'stream_id' ],
-      aggs: {
-        // Grouping by store_id
-        grouped_by_store_id: {
-          terms: {
-            field: 'stream_id.keyword', // Group by store_id
-            size: 1000, // Limit the number of groups (adjust based on needs)
-          },
-        },
-      },
-    };
-
-    const storeAvgSizeData = await getOpenSearchData(
-        JSON.parse( process.env.OPENSEARCH ).edgeAppFilelogs,
-        queryAvg,
-    );
-
 
     res.sendSuccess( {
       result: timeSlots,
       totalData: {
         totalCount: totalCount,
-        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/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 } );
 }