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

package/package.json

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

package/src/controllers/clientInfra.controller.js

@@ -314,21 +314,20 @@ export async function installationCard( req, res ) {
 export async function infraIssuesTable( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let issueStatus = [ 'identified' ];
+    let issueStatus = [ 'notidentified', 'identified' ];
+
     if ( req.body.infrafilterIssue == 'Issues Not Identified' ) {
       issueStatus = [ 'notidentified' ];
     };
-    if ( req.body.infrafilterIssue == 'All Issues' ) {
-      issueStatus = [ 'notidentified', 'identified' ];
-    };
-    if ( req.body.infrafilterIssue == 'Live Stores' ) {
-      issueStatus = [ 'notidentified', 'identified' ];
+    if ( req.body.infrafilterIssue == 'Identified Issues' ) {
+      issueStatus = [ 'identified' ];
     };
+
+
     let totalstores = await aggregateStore( [ {
       $match: {
         '$and': [
           { 'clientId': { $in: req.body.clientId } },
-          { 'edge.firstFile': true },
           { 'status': 'active' },
           { 'createdAt': { $lte: date.end } },
         ],
@@ -338,6 +337,23 @@ export async function infraIssuesTable( req, res ) {
     for ( let store of totalstores ) {
       totalnumberstores.push( store.storeId );
     }
+    let pendingquery = [];
+    pendingquery.push( {
+      $match: {
+        $and: [
+          { issueType: 'installation' },
+          { 'status': { $ne: 'closed' } },
+          { 'basicDetails.clientId': { $in: req.body.clientId } },
+          { createdAt: { $lte: date.end } },
+        ],
+      },
+    } );
+    let pendingstorecount = await aggregateTangoTicket( pendingquery );
+    let installpendingticket = [];
+    for ( let store of pendingstorecount ) {
+      installpendingticket.push( store.basicDetails.storeId );
+    }
+
     let query = [ {
       $match: {
         $and: [
@@ -346,7 +362,6 @@ export async function infraIssuesTable( req, res ) {
           { 'basicDetails.clientId': { $in: req.body.clientId } },
           { 'basicDetails.storeId': { $in: totalnumberstores } },
           { 'ticketDetails.issueStatus': { $in: issueStatus } },
-          // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
       },
@@ -426,8 +441,8 @@ export async function infraIssuesTable( req, res ) {
         $match: {
           '$and': [
             { 'clientId': { $in: req.body.clientId } },
-            { 'edge.firstFile': true },
             { 'status': 'active' },
+            { 'storeId': { $nin: installpendingticket } },
             { 'createdAt': { $lte: date.end } },
           ],
         },
@@ -442,7 +457,7 @@ export async function infraIssuesTable( req, res ) {
       }
       let result = [];
       for ( let data of totalnumberstores ) {
-        if ( infraissueStore.length > 0 && !infraissueStore.includes( data ) ) {
+        if ( infraissueStore.length > 0 && !infraissueStore.includes( data )&&!installpendingticket.includes( data ) ) {
           result.push( data );
         }
       }
@@ -494,12 +509,13 @@ export async function infraIssuesTable( req, res ) {
       );
     }
     if ( req.body.sortColumName && req.body.sortColumName !== '' && req.body.sortBy ) {
-      query.push( {
-        $sort: { [req.body.sortColumName]: req.body.sortBy },
-      } );
-      storesQuery.push( {
-        $sort: { [req.body.sortColumName]: req.body.sortBy },
-      } );
+      const sortOption = { $sort: { [req.body.sortColumName]: req.body.sortBy } };
+      query.push( sortOption );
+      storesQuery.push( sortOption );
+    } else {
+      const sortOption = { $sort: { 'storeId': -1 } };
+      query.push( sortOption );
+      storesQuery.push( sortOption );
     }
     let count;
     if ( req.body.infrafilterIssue == 'Live Stores' || req.body.infrafilterIssue == 'Total Stores' ) {
@@ -563,15 +579,24 @@ export async function infraIssuesTable( req, res ) {
     if ( req.body.export && result.length > 0 ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        exportdata.push( {
-          'Created On': element.createdAt,
-          'StoreID': element.storeId,
-          'StoreName': element.storeName,
-          'Primary Issue': element.primaryIssue,
-          'Sub Issue': element.secondaryIssue,
-          'Issue Identified on': element.issueIdentifiedDate? dayjs( element.issueIdentifiedDate ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm A' ):'',
-          'Status': element.status,
-        } );
+        if ( req.body.infrafilterIssue == 'Live Stores' || req.body.infrafilterIssue == 'Total Stores' ) {
+          exportdata.push( {
+            'Created On': element.createdAt,
+            'StoreID': element.storeId,
+            'StoreName': element.storeName,
+            'Status': element.status,
+          } );
+        } else {
+          exportdata.push( {
+            'Created On': element.createdAt,
+            'StoreID': element.storeId,
+            'StoreName': element.storeName,
+            'Primary Issue': element.primaryIssue,
+            'Sub Issue': element.secondaryIssue,
+            'Issue Identified on': element.issueIdentifiedDate? dayjs( element.issueIdentifiedDate ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm A' ):'',
+            'Status': element.status,
+          } );
+        }
       } );
       await download( exportdata, res );
       return;
@@ -998,7 +1023,6 @@ export async function hourWiseDownstores( req, res ) {
       $match: {
         '$and': [
           { 'clientId': req.body.clientId },
-          { 'edge.firstFile': true },
           { 'status': 'active' },
           { 'createdAt': { $lte: new Date( req.body.toDate ) } },
         ],

package/src/controllers/storeInfra.controlller.js

@@ -457,7 +457,7 @@ export async function viewedgeAppLog( req, res ) {
     if ( !store ) {
       return res.sendError( 'Stores Not fond', 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 = {};
@@ -475,12 +475,12 @@ export async function viewedgeAppLog( req, res ) {
             },
             {
               'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
+                'store_date.keyword': inputDate,
               },
             },
             {
               'term': {
-                'store_id.keyword': req.body.storeId,
+                'storeId.keyword': req.body.storeId,
               },
             },
             {
@@ -488,8 +488,12 @@ export async function viewedgeAppLog( req, res ) {
                 'log_subtype.keyword': 'AppStart_Time',
               },
             },
+            {
+              'term': {
+                'data.message.keyword': 'Login Success Event',
+              },
+            },
           ],
-
         },
       },
     };
@@ -509,17 +513,22 @@ export async function viewedgeAppLog( req, res ) {
             },
             {
               'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
+                'store_date.keyword': inputDate,
+              },
+            },
+            {
+              'term': {
+                'storeId.keyword': req.body.storeId,
               },
             },
             {
               'term': {
-                'store_id.keyword': req.body.storeId,
+                'log_subtype.keyword': 'App_Quit_Time',
               },
             },
             {
               'term': {
-                'log_subtype.keyword': 'App_Quit',
+                'data.message.keyword': 'App Quit With password',
               },
             },
           ],
@@ -550,17 +559,17 @@ export async function viewedgeAppLog( req, res ) {
             },
             {
               'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
+                'store_date.keyword': inputDate,
               },
             },
             {
               'term': {
-                'store_id.keyword': req.body.storeId,
+                'storeId.keyword': req.body.storeId,
               },
             },
             {
               'term': {
-                'log_subtype.keyword': 'App_Crash',
+                'log_subtype.keyword': 'App_Close_Event',
               },
             },
           ],
@@ -592,12 +601,12 @@ export async function viewedgeAppLog( req, res ) {
             },
             {
               'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
+                'store_date.keyword': inputDate,
               },
             },
             {
               'term': {
-                'store_id.keyword': req.body.storeId,
+                'storeId.keyword': req.body.storeId,
               },
             },
             {
@@ -618,7 +627,6 @@ export async function viewedgeAppLog( req, res ) {
       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] ) ) {
           if ( sourceData._source.data.message.trim() === 'SYSTEM SUSPENDED' ) {
@@ -653,7 +661,7 @@ export async function viewedgeAppLog( req, res ) {
             },
             {
               'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
+                'store_date.keyword': inputDate,
               },
             },
             {
@@ -705,12 +713,12 @@ export async function viewedgeAppLog( req, res ) {
             },
             {
               'term': {
-                'store_id.keyword': req.body.storeId,
+                'storeId.keyword': req.body.storeId,
               },
             },
             {
               'term': {
-                'store_date.keyword': dayjs( inputDate ).format( 'DD-MM-YYYY' ),
+                'store_date.keyword': inputDate,
               },
             },
             {
@@ -727,8 +735,16 @@ export async function viewedgeAppLog( req, res ) {
       ],
     },
     );
-    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 : '';
-
+    // 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 ( antiVirus.body.hits.hits&&antiVirus.body.hits.hits.length > 0 ) {
+      for ( const sourceData of antiVirus.body.hits.hits ) {
+        if ( Number( sourceData._source.data.occuringTime.split( ':' )[0] )== Number( fromTime.split( ':' )[0] ) ) {
+          if ( sourceData._source.data.message == 'st-launch-1.0.exe is deleted' ) {
+            response.antiVirus = antiVirus.body.hits.hits.length > 0 ? sourceData._source.data.occuringTime : '';
+          }
+        }
+      }
+    }
 
     res.sendSuccess( response );
   } catch ( error ) {

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(
           {