tango-app-api-infra 3.0.102-dev → 3.0.103-dev

package/package.json

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

package/src/controllers/clientInfra.controller.js

@@ -573,9 +573,7 @@ export async function InstallationIssuesTable( req, res ) {
     if ( req.body.installtionfilterIssue == 'installFailedStores' ) {
       query.push( { $match: { 'ticketDetails.issueStatus': 'identified' } } );
     }
-    if ( req.body.installtionfilterIssue == 'installedStores' ) {
-      query.push( { $match: { 'ticketDetails.issueStatus': 'notidentified' } } );
-    }
+
     query.push( {
       $project: {
         createdAt: 1,

package/src/controllers/infra.controllers.js

@@ -203,6 +203,8 @@ export async function secondaryReason( req, res ) {
         count: list.length,
         result: list,
       } );
+    } else {
+      res.sendError( 'No data found', 204 );
     }
   } catch ( error ) {
     logger.error( { error: error, function: 'secondaryReason' } );

package/src/controllers/storeInfra.controlller.js

@@ -137,10 +137,10 @@ export async function storeTicketList( req, res ) {
     },
     );
 
-    if ( req.body.filter && req.body.filter !== '' ) {
+    if ( req.body.filter &&req.body.filter.length>0 ) {
       query.push( {
         $match: {
-          primaryIssue: req.body.filter,
+          primaryIssue: { $in: req.body.filter },
         },
       } );
     }
@@ -374,7 +374,7 @@ export async function edgeAppLogTable( req, res ) {
       let newFilesCount = await getOpenSearchData( 'edgeapp_systemlogs', FileCountQuery );
       if ( newFilesCount&& newFilesCount.body.hits && newFilesCount.body.hits.hits.length > 0 ) {
         obj.files_pushed = 0;
-        obj.files_genrated = 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 ) {
@@ -385,9 +385,8 @@ export async function edgeAppLogTable( req, res ) {
         }
       } else {
         obj.files_pushed = '';
-        obj.files_genrated = '';
+        obj.files_generated = '';
       }
-
       let downTimeQuery = {
         'size': 1,
         'query': {
@@ -426,7 +425,17 @@ export async function edgeAppLogTable( req, res ) {
       }
     }
     if ( req.body.export ) {
-      await download( timeSlots, res );
+      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 );
       return;
     }
     res.sendSuccess( timeSlots );
@@ -465,7 +474,6 @@ function generateTimeSlots( startHour, endHour, interval, req ) {
 };
 
 function getTimeDifference( start, end ) {
-  console.log( start, end );
   let startTime = new Date( `1970-01-01T${start}Z` );
   let endTime = new Date( `1970-01-01T${end}Z` );
   let differenceInMilliseconds = endTime - startTime;
@@ -518,6 +526,7 @@ export async function viewedgeAppLog( req, res ) {
       },
     };
     const appStartTime = await getOpenSearchData( 'edgeapp_systemlogs', appStartTimeQuery );
+
     response.appStartTime = appStartTime.body.hits.hits.length > 0 ? appStartTime.body.hits.hits[0]._source.data.occuringTime : '';
 
     let appQuitTimeQuery = {
@@ -638,13 +647,11 @@ export async function viewedgeAppLog( req, res ) {
 
     } );
     if ( screenStatus&& screenStatus.body.hits.hits&&screenStatus.body.hits.hits.length > 0 ) {
-      console.log( '==========', screenStatus.body.hits.hits.length );
       let suspendedTime;
       let resumedTime;
       const differences = [];
 
       for ( const sourceData of screenStatus.body.hits.hits ) {
-        console.log( sourceData._source.data.occuringTime );
         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;
@@ -664,7 +671,6 @@ export async function viewedgeAppLog( req, res ) {
           }
         }
       }
-      console.log( differences );
       response.screenStatus = differences.length>0?`${differences[0].minutes}Mins ${differences[0].seconds}Sec`:'';
     }
     const FileCountQuery = {
@@ -703,18 +709,18 @@ export async function viewedgeAppLog( req, res ) {
     };
     const newFilesCount = await getOpenSearchData( 'edgeapp_systemlogs', FileCountQuery );
     if ( newFilesCount&& newFilesCount.body.hits && newFilesCount.body.hits.hits.length > 0 ) {
-      response.files_pushed = 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] )==response.hour ) {
-            response.files_pushed = response.files_pushed+Number( sourcedata._source.data.files_pushed );
+          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 );
           }
         }
       }
     } else {
-      response.files_pushed = '';
+      response.filesPushed = '';
       response.files_genrated = '';
     }
 

package/src/controllers/userInfra.controller.js

@@ -234,13 +234,13 @@ export async function userTicketList( req, res ) {
         },
       } );
     }
-    if ( req.body.filter && req.body.filter !== '' ) {
+    if ( req.body.filter && req.body.filter.length>0 ) {
       query.push( {
         $match: {
           $or: [
-            { issueStatus: req.body.filter },
-            { infraIssue: req.body.filter },
-            { issueType: req.body.filter },
+            { issueStatus: { $in: req.body.filter } },
+            { infraIssue: { $in: req.body.filter } },
+            { issueType: { $in: req.body.filter } },
           ],
         },
       } );

package/src/validations/infra.validation.js

@@ -198,7 +198,7 @@ export async function ticketExists( req, res, next ) {
 export async function validateTicketstatus( req, res, next ) {
   try {
     if ( req.body.issueType == 'infra' ) {
-      if ( req.body.secondary.length>0 ) {
+      if ( req.body.secondary&&req.body.secondary.length>0 ) {
         if ( req.body.status == 'closed' ) {
           return res.sendSuccess( 'Ticket already closed' );
         }
@@ -269,28 +269,29 @@ export async function infraReasonExists( req, res, next ) {
         } ],
       },
       );
-    } else {
-      if ( req.body.primary == 'Application Issues' ) {
-        let actionBy = '';
-        if ( req.user.userType == 'tango' ) {
-          actionBy = 'Tango';
-        } else if ( req.user.userType == 'client' ) {
-          actionBy = 'User';
-        }
-        req.body.ticketActivity.push( {
-          actionType: 'issueUpdate',
-          actionBy: actionBy,
-          timeStamp: new Date(),
-          IdentifiedBy: req.user.userName,
-          comment: req.body.comment,
-          reasons: [ {
-            primaryIssue: req.body.primary,
-            secondaryIssue: [],
-          } ],
-        },
-        );
-      }
     }
+    // else {
+    //   if ( req.body.primary == 'Application Issues' ) {
+    //     let actionBy = '';
+    //     if ( req.user.userType == 'tango' ) {
+    //       actionBy = 'Tango';
+    //     } else if ( req.user.userType == 'client' ) {
+    //       actionBy = 'User';
+    //     }
+    //     req.body.ticketActivity.push( {
+    //       actionType: 'issueUpdate',
+    //       actionBy: actionBy,
+    //       timeStamp: new Date(),
+    //       IdentifiedBy: req.user.userName,
+    //       comment: req.body.comment,
+    //       reasons: [ {
+    //         primaryIssue: req.body.primary,
+    //         secondaryIssue: [],
+    //       } ],
+    //     },
+    //     );
+    //   }
+    // }
 
 
     next();
@@ -313,20 +314,19 @@ export async function InfrastepstoResolve( req, res, next ) {
           secondaryIsssue: [ ...secondaryReason.stepstoResolve ],
         } );
       }
-      if ( req.body.primary != 'Store Operation Issues' && req.body.primary != 'Application Issues' ) {
-        req.body.ticketActivity.push( {
-          actionType: 'stepsToResolve',
-          actionBy: 'Tango',
-          timeStamp: new Date(),
-          IdentifiedBy: 'Tango',
-          reasons: steptoReslove.map( ( item ) => ( {
-            primaryIssue: item.primaryIssue,
-            secondaryIssue: item.secondaryIsssue.map( ( issue ) => ( {
-              name: issue.name, // Assuming each object has a 'name' property
-            } ) ),
+
+      req.body.ticketActivity.push( {
+        actionType: 'stepsToResolve',
+        actionBy: 'Tango',
+        timeStamp: new Date(),
+        IdentifiedBy: 'Tango',
+        reasons: steptoReslove.map( ( item ) => ( {
+          primaryIssue: item.primaryIssue,
+          secondaryIssue: item.secondaryIsssue.map( ( issue ) => ( {
+            name: issue.name, // Assuming each object has a 'name' property
           } ) ),
-        } );
-      }
+        } ) ),
+      } );
     }
     next();
   } catch ( error ) {