tango-app-api-infra 3.0.109-dev → 3.0.111-dev

package/src/controllers/storeInfra.controlller.js

@@ -366,7 +366,12 @@ export async function edgeAppLogTable( req, res ) {
       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` : '';
+      if ( speedTest._source.data.upload_Speed !='0 bytes' ) {
+        obj.Internetspeed = speedTest ? `${bytesToMB( speedTest._source.data.upload_Speed.split( '.' )[0] ).toFixed( 2 )} MB/sec` : '';
+      } else {
+        obj.Internetspeed = '0  MB/sec';
+      }
+
 
       // File counts
       const fileCounts = fileCountData.filter(
@@ -396,7 +401,7 @@ export async function edgeAppLogTable( req, res ) {
     if ( req.body.export ) {
       const exportData = timeSlots.map( ( element ) => ( {
         'Time Stamp': `${element.startTime}-${element.endTime}`,
-        'Downtime': element.downtime,
+        'Downtime': element.downtime +'Mins',
         'Avg Internet Speed': element.Internetspeed,
         'Files Generated': element.files_generated,
         'Files Pushed': element.files_pushed,
@@ -413,7 +418,11 @@ export async function edgeAppLogTable( req, res ) {
 }
 
 function bytesToMB( bytes ) {
-  return bytes / ( 1024 * 1024 );
+  if ( bytes ) {
+    return bytes / ( 1024 * 1024 );
+  } else {
+    return 0;
+  }
 }
 function generateTimeSlots( startHour, endHour, interval, req ) {
   try {
@@ -455,172 +464,154 @@ export async function viewedgeAppLog( req, res ) {
   try {
     const store = await findOneStore( { storeId: req.body.storeId } );
     if ( !store ) {
-      return res.sendError( 'Stores Not fond', 204 );
+      return res.sendError( 'Stores Not found', 204 );
     }
-    const inputDate = dayjs( req.body.Date ).format( 'YYYY-MM-DD' ); // Specify the date you want to add the times to
+    const inputDate = dayjs( req.body.Date ).format( 'DD-MM-YYYY' );
     const fromTime = req.body.from;
     const toTime = req.body.to;
     let response = {};
 
-
-    let appStartTimeQuery = {
-      'size': 100,
-      'query': {
-        'bool': {
-          'must': [
-            {
-              'term': {
-                'log_type.keyword': 'Application',
-              },
-            },
-            {
-              'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
-              },
-            },
-            {
-              'term': {
-                'store_id.keyword': req.body.storeId,
-              },
-            },
-            {
-              'term': {
-                'log_subtype.keyword': 'AppStart_Time',
-              },
+    const queries = [
+      {
+        queryName: 'appStartTime',
+        query: {
+          size: 1,
+          query: {
+            bool: {
+              must: [
+                { term: { 'log_type.keyword': 'Application' } },
+                { term: { 'store_date.keyword': inputDate } },
+                { term: { 'storeId.keyword': req.body.storeId } },
+                { term: { 'log_subtype.keyword': 'AppStart_Time' } },
+                { term: { 'data.message.keyword': 'Login Success Event' } },
+              ],
             },
-          ],
-
+          },
         },
       },
-    };
-    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 = {
-      'size': 100,
-      'query': {
-        'bool': {
-          'must': [
-            {
-              'term': {
-                'log_type.keyword': 'Application',
-              },
-            },
-            {
-              'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
-              },
-            },
-            {
-              'term': {
-                'store_id.keyword': req.body.storeId,
-              },
-            },
-            {
-              'term': {
-                'log_subtype.keyword': 'App_Quit',
-              },
+      {
+        queryName: 'appQuitTime',
+        query: {
+          size: 1,
+          query: {
+            bool: {
+              must: [
+                { term: { 'log_type.keyword': 'Application' } },
+                { term: { 'store_date.keyword': inputDate } },
+                { term: { 'storeId.keyword': req.body.storeId } },
+                { term: { 'log_subtype.keyword': 'App_Quit_Time' } },
+                { term: { 'data.message.keyword': 'App Quit With password' } },
+              ],
             },
-          ],
-
+          },
+          sort: [ { timestamp: { order: 'desc' } } ],
         },
       },
-      'sort': [
-        { 'timestamp': { 'order': 'desc' } },
-      ],
-    };
-    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] ) ) {
-          response.appQuitTime = appQuitTime.body.hits.hits.length > 0 ? sourceData._source.data.occuringTime : '';
-        }
-      }
-    }
-    let appCrashTimeQuery = {
-      'size': 100,
-      'query': {
-        'bool': {
-          'must': [
-            {
-              'term': {
-                'log_type.keyword': 'Application',
-              },
+      {
+        queryName: 'appCrashTime',
+        query: {
+          size: 1,
+          query: {
+            bool: {
+              must: [
+                { term: { 'log_type.keyword': 'Application' } },
+                { term: { 'store_date.keyword': inputDate } },
+                { term: { 'storeId.keyword': req.body.storeId } },
+                { term: { 'log_subtype.keyword': 'App_Close_Event' } },
+              ],
             },
-            {
-              'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
-              },
+          },
+          sort: [ { timestamp: { order: 'desc' } } ],
+        },
+      },
+      {
+        queryName: 'screenStatus',
+        query: {
+          size: 100,
+          query: {
+            bool: {
+              must: [
+                { term: { 'log_type.keyword': 'Application' } },
+                { term: { 'store_date.keyword': inputDate } },
+                { term: { 'storeId.keyword': req.body.storeId } },
+                { term: { 'log_subtype.keyword': 'System_Status' } },
+              ],
             },
-            {
-              'term': {
-                'store_id.keyword': req.body.storeId,
-              },
+          },
+          sort: [ { timestamp: { order: 'asc' } } ],
+        },
+      },
+      {
+        queryName: 'fileCount',
+        query: {
+          size: 100,
+          query: {
+            bool: {
+              must: [
+                { term: { 'log_type.keyword': 'Application' } },
+                { term: { 'store_date.keyword': inputDate } },
+                { term: { 'storeId.keyword': req.body.storeId } },
+                { term: { 'log_subtype.keyword': 'Zip_File_Count' } },
+              ],
             },
-            {
-              'term': {
-                'log_subtype.keyword': 'App_Crash',
-              },
+          },
+          sort: [ { timestamp: { order: 'desc' } } ],
+        },
+      },
+      {
+        queryName: 'antiVirus',
+        query: {
+          size: 100,
+          query: {
+            bool: {
+              must: [
+                { term: { 'log_type.keyword': 'Application' } },
+                { term: { 'store_date.keyword': inputDate } },
+                { term: { 'storeId.keyword': req.body.storeId } },
+                { term: { 'log_subtype.keyword': 'Anti_Virus' } },
+              ],
             },
-          ],
-
+          },
+          sort: [ { timestamp: { order: 'desc' } } ],
         },
       },
-      'sort': [
-        { 'timestamp': { 'order': 'desc' } },
-      ],
-    };
+    ];
 
-    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] ) ) {
-          response.AppCrashtime = appCrashTime.body.hits.hits.length > 0 ? sourceData._source.data.occuringTime : '';
-        }
-      }
+    const fetchLogs = queries.map( ( q ) =>
+      getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, q.query ),
+    );
+
+    const results = await Promise.all( fetchLogs );
+
+    const appStartTimeResult = results[0];
+    const appQuitTimeResult = results[1];
+    const appCrashTimeResult = results[2];
+    const screenStatusResult = results[3];
+    const fileCountResult = results[4];
+    const antiVirusResult = results[5];
+
+    response.appStartTime = appStartTimeResult.body.hits.hits.length > 0 ? appStartTimeResult.body.hits.hits[0]._source.data.occuringTime : '';
+
+    if ( appQuitTimeResult.body.hits.hits && appQuitTimeResult.body.hits.hits.length > 0 ) {
+      const quitTime = appQuitTimeResult.body.hits.hits.find( ( sourceData ) =>
+        Number( sourceData._source.data.occuringTime.split( ':' )[0] ) === Number( fromTime.split( ':' )[0] ),
+      );
+      response.appQuitTime = quitTime ? quitTime._source.data.occuringTime : '';
     }
-    const screenStatus = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, {
-      'size': 100,
-      'query': {
-        'bool': {
-          'must': [
-            {
-              'term': {
-                'log_type.keyword': 'Application',
-              },
-            },
-            {
-              'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
-              },
-            },
-            {
-              'term': {
-                'store_id.keyword': req.body.storeId,
-              },
-            },
-            {
-              'term': {
-                'log_subtype.keyword': 'System_Status',
-              },
-            },
-          ],
 
-        },
-      },
-      'sort': [
-        { 'timestamp': { 'order': 'asc' } },
-      ],
+    if ( appCrashTimeResult.body.hits.hits && appCrashTimeResult.body.hits.hits.length > 0 ) {
+      const crashTime = appCrashTimeResult.body.hits.hits.find( ( sourceData ) =>
+        Number( sourceData._source.data.occuringTime.split( ':' )[0] ) === Number( fromTime.split( ':' )[0] ),
+      );
+      response.AppCrashtime = crashTime ? crashTime._source.data.occuringTime : '';
+    }
 
-    } );
-    if ( screenStatus&& screenStatus.body.hits.hits&&screenStatus.body.hits.hits.length > 0 ) {
+    if ( screenStatusResult.body.hits.hits && screenStatusResult.body.hits.hits.length > 0 ) {
       let suspendedTime;
       let resumedTime;
       const differences = [];
-
-      for ( const sourceData of screenStatus.body.hits.hits ) {
-        if ( Number( sourceData._source.data.occuringTime.split( ':' )[0] )== Number( fromTime.split( ':' )[0] ) ) {
+      for ( const sourceData of screenStatusResult.body.hits.hits ) {
+        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;
           } else if ( sourceData._source.data.message.trim() === 'SYSTEM RESUMED' ) {
@@ -639,96 +630,30 @@ export async function viewedgeAppLog( req, res ) {
           }
         }
       }
-      response.screenStatus = differences.length>0?`${differences[0].minutes}Mins ${differences[0].seconds}Sec`:'';
+      response.screenStatus = differences.length > 0 ? `${differences[0].minutes}Mins ${differences[0].seconds}Sec` : '';
     }
-    const FileCountQuery = {
-      'size': 100,
-      'query': {
-        'bool': {
-          'must': [
-            {
-              'term': {
-                'log_type.keyword': 'Application',
-              },
-            },
-            {
-              'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
-              },
-            },
-            {
-              'term': {
-                'storeId.keyword': req.body.storeId,
-              },
-            },
-            {
-              'term': {
-                'log_subtype.keyword': 'Zip_File_Count',
-              },
-            },
-          ],
-
-        },
-      },
 
-      'sort': [
-        { 'timestamp': { 'order': 'desc' } },
-      ],
-    };
-    const newFilesCount = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, FileCountQuery );
-    if ( newFilesCount&& newFilesCount.body.hits && newFilesCount.body.hits.hits.length > 0 ) {
+    if ( fileCountResult.body.hits.hits && fileCountResult.body.hits.hits.length > 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] )==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 );
-          }
+      response.files_generated = 0;
+      for ( const sourceData of fileCountResult.body.hits.hits ) {
+        if ( sourceData._source && Number( sourceData._source.data.occuringTime.split( ':' )[0] ) === Number( fromTime.split( ':' )[0] ) ) {
+          response.filesPushed += Number( sourceData._source.data.files_pushed );
+          response.files_generated += Number( sourceData._source.data.files_generated );
         }
       }
     } else {
       response.filesPushed = '';
-      response.files_genrated = '';
+      response.files_generated = '';
     }
 
-
-    const antiVirus = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).edgeAppSystemLogs, {
-      'size': 100,
-      'query': {
-        'bool': {
-          'must': [
-            {
-              'term': {
-                'log_type.keyword': 'Application',
-              },
-            },
-            {
-              'term': {
-                'store_id.keyword': req.body.storeId,
-              },
-            },
-            {
-              'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
-              },
-            },
-            {
-              'term': {
-                'log_subtype.keyword': 'Anti_Virus',
-              },
-            },
-          ],
-
-        },
-      },
-      'sort': [
-        { 'timestamp': { 'order': 'desc' } },
-      ],
-    },
-    );
-    response.antiVirus = antiVirus.body.hits.hits.length > 0 && antiVirus.body.hits.hits[0]._source.data.message == 'st-launch-1.0.exe is deleted' ? antiVirus.body.hits.hits[0]._source.data.occuringTime : '';
-
+    if ( antiVirusResult.body.hits.hits && antiVirusResult.body.hits.hits.length > 0 ) {
+      const antivirusEvent = antiVirusResult.body.hits.hits.find( ( sourceData ) =>
+        Number( sourceData._source.data.occuringTime.split( ':' )[0] ) === Number( fromTime.split( ':' )[0] ) &&
+        sourceData._source.data.message === 'st-launch-1.0.exe is deleted',
+      );
+      response.antiVirus = antivirusEvent ? antivirusEvent._source.data.occuringTime : '';
+    }
 
     res.sendSuccess( response );
   } catch ( error ) {
@@ -737,6 +662,7 @@ export async function viewedgeAppLog( req, res ) {
   }
 }
 
+
 export async function cameraAngleChange( req, res ) {
   try {
     const angleChange = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).cameraAngleChange,

package/src/validations/infra.validation.js

@@ -55,24 +55,24 @@ export async function validateTicket( req, res, next ) {
           {
             'basicDetails.storeId': req.body.basicDetails.storeId,
             'issueType': 'infra',
-            'issueDate': new Date( req.body.Date ),
+            'status': { $ne: 'closed' },
           },
       );
       if ( Ticket ) {
-        return res.sendSuccess( 'Infra Ticket Already Exists for the day' );
+        return res.sendSuccess( 'Infra Ticket Already Exists' );
       }
 
-      let refreshTicket = await findOneTangoTicket(
-          {
-            'basicDetails.storeId': req.body.basicDetails.storeId,
-            'issueType': 'infra',
-            'status': { $ne: 'closed' },
-            'ticketDetails.ticketRefreshTime': { $lte: new Date() },
-          },
-      );
-      if ( refreshTicket ) {
-        return res.sendSuccess( 'refreshTicket Ticket Already Exists for the Store' );
-      }
+      // let refreshTicket = await findOneTangoTicket(
+      //     {
+      //       'basicDetails.storeId': req.body.basicDetails.storeId,
+      //       'issueType': 'infra',
+      //       'status': { $ne: 'closed' },
+      //       'ticketDetails.ticketRefreshTime': { $lte: new Date() },
+      //     },
+      // );
+      // if ( refreshTicket ) {
+      //   return res.sendSuccess( 'refreshTicket Ticket Already Exists for the Store' );
+      // }
     } else if ( req.body.issueType == 'installation' ) {
       let Ticket = await findOneTangoTicket(
           {