tango-app-api-infra 3.1.34-beta.0 → 3.1.35-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.34-beta.0",
+    "version": "3.1.35-alpha.0",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/infra.controllers.js

@@ -29,7 +29,7 @@ export async function createTicket( req, res ) {
         actionBy: 'Tango',
         IdentifiedBy: 'Tango',
       } ];
-      let ticketExists = await findOneTangoTicket( { ticketId: req.body.ticketId } );
+      let ticketExists= await findOneTangoTicket( { ticketId: req.body.ticketId } );
       if ( ticketExists ) {
         return res.status( 200 ).send( { message: 'ticketId Exists', storeId: req.body.storeId } );
       }
@@ -243,8 +243,7 @@ export async function updateTicketIssue( req, res ) {
       let client = await findOneClient( { clientId: req.body.basicDetails.clientId } );
       let refreshdate = dayjs().add( client.ticketConfigs.refreshAlert, 'days' );
 
-      query = {
-        ...query, 'ticketDetails.ticketRefreshTime': new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
+      query = { ...query, 'ticketDetails.ticketRefreshTime': new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
       };
     }
 
@@ -662,7 +661,7 @@ export async function invoice( req, res ) {
 export async function getInfraIssues( req, res ) {
   try {
     const inputData = req.body;
-    const query = [
+    const query=[
       {
         $match: {
           $and: [
@@ -762,7 +761,7 @@ export async function getInfraIssues( req, res ) {
 
     const result = await aggregateTangoTicket( query );
 
-    const mergeValue = _.values(
+    const mergeValue =_.values(
         _.merge(
             _.keyBy( retVal, 'issueDate' ),
             _.keyBy( result, 'issueDate' ),
@@ -772,7 +771,7 @@ export async function getInfraIssues( req, res ) {
     if ( mergeValue.length == 0 ) {
       return res.sendError( 'NO Data Found', 204 );
     }
-    for ( let i = 0; i < mergeValue.length; i++ ) {
+    for ( let i =0; i< mergeValue.length; i++ ) {
       const downTime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly,
           {
             'size': 100,
@@ -837,7 +836,7 @@ export async function getInfraIssues( req, res ) {
 
       if ( downTime.body.hits.hits.length > 0 ) {
         let down = 0;
-        for ( let j = 0; j < downTime.body.hits.hits.length; j++ ) {
+        for ( let j = 0; j< downTime.body.hits.hits.length; j++ ) {
           const sum = streamwiseDowntime[j]?._source?.doc?.streamwise_downtime?.reduce( ( accumulator, currentValue ) => {
             return accumulator + currentValue.down_time;
           }, 0 );
@@ -852,8 +851,8 @@ export async function getInfraIssues( req, res ) {
       }
 
       if ( speedTest.body.hits.hits.length > 0 ) {
-        const uploadspeed = Number( speedTest.body.hits.hits[0]?._source?.data?.upload_Speed.split( ' ' )[0] );
-        const converToMb = ( uploadspeed / 1048576 ).toFixed( 1 );
+        const uploadspeed =Number( speedTest.body.hits.hits[0]?._source?.data?.upload_Speed.split( ' ' )[0] );
+        const converToMb = ( uploadspeed/ 1048576 ).toFixed( 1 );
         mergeValue[i].speedTest = Number( converToMb );
       }
     }
@@ -877,7 +876,7 @@ export async function getInfraIssues( req, res ) {
       },
     ];
 
-    const highCountQuery = [
+    const highCountQuery =[
       {
         $match: {
           $and: [
@@ -902,7 +901,7 @@ export async function getInfraIssues( req, res ) {
         },
       },
     ];
-    const defaultValue = {
+    const defaultValue= {
       total: 0,
       successRate: 0,
     };
@@ -944,7 +943,7 @@ function inWords( num ) {
 export async function allCounts( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let countQuery = [];
+    let countQuery=[];
 
     if ( req.body.permittedStores && req.body.permittedStores.length > 0 ) {
       countQuery.push(
@@ -1242,10 +1241,10 @@ export async function infraTable( req, res ) {
       'count': ticketList.length,
     } );
     let notIdentifiedCount = ticketList.reduce( ( count, ticket ) => {
-      return ticket.ticketStatus === 'notidentified' && ticket.status != 'closed' ? count + 1 : count;
+      return ticket.ticketStatus === 'notidentified'&&ticket.status!='closed' ? count + 1 : count;
     }, 0 );
     let AutoClosedCount = ticketList.reduce( ( count, ticket ) => {
-      return ticket.ticketStatus === 'notidentified' && ticket.status == 'closed' ? count + 1 : count;
+      return ticket.ticketStatus === 'notidentified'&&ticket.status=='closed' ? count + 1 : count;
     }, 0 );
     response.unshift( {
       'name': 'Yet to Address',
@@ -1255,7 +1254,7 @@ export async function infraTable( req, res ) {
       'name': 'Auto Closed',
       'count': AutoClosedCount,
     } );
-    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'total' && req.body.filterIssue != 'Yet to Address' && req.body.filterIssue != 'Auto Closed' ) {
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'total'&&req.body.filterIssue != 'Yet to Address'&&req.body.filterIssue != 'Auto Closed' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.filterIssue,
@@ -1299,7 +1298,7 @@ export async function infraTable( req, res ) {
     let result = await aggregateTangoTicket( query );
     if ( req.body.export && result.length > 0 ) {
       const exportdata = [];
-      if ( req.user.userType === 'tango' ) {
+      if ( req.user.userType ==='tango' ) {
         result.forEach( ( element ) => {
           exportdata.push( {
             'Ticket ID': element.ticketId,
@@ -1310,9 +1309,9 @@ export async function infraTable( req, res ) {
             'Store ID': element.storeId,
             'Resloved By': element.userName,
             'Status': element.status,
-            'Primary Issues': element.primaryIssue,
+            'Primary Issues': element.primaryIssue=='-'?'Issue not identified':element.primaryIssue,
             'Secondary Issues': element.secondaryIssue,
-            'Comment': element.otherscomment ? element.otherscomment : ( element.commentText ? element.commentText : '-' ),
+            'Comment': element.otherscomment ? element.otherscomment : ( element.commentText?element.commentText:'-' ),
           } );
         } );
       } else {
@@ -1323,9 +1322,9 @@ export async function infraTable( req, res ) {
             'Store Name': element.storeName,
             'Store ID': element.storeId,
             'Status': element.status,
-            'Primary Issues': element.primaryIssue,
+            'Primary Issues': element.primaryIssue=='-'?'Issue not identified':element.primaryIssue,
             'Secondary Issues': element.secondaryIssue,
-            'Comment': element.otherscomment ? element.otherscomment : ( element.commentText ? element.commentText : '-' ),
+            'Comment': element.otherscomment ? element.otherscomment : ( element.commentText?element.commentText:'-' ),
           } );
         } );
       }
@@ -1514,7 +1513,7 @@ export async function installationTable( req, res ) {
     let response;
     if ( ticketList.length > 0 ) {
       ticketList.forEach( ( item ) => {
-        if ( item.installationStatus != 'deployed' ) {
+        if ( item.installationStatus!='deployed' ) {
           const categoryName = item.primaryIssue;
           if ( categoryCounts[categoryName] ) {
             categoryCounts[categoryName]++;
@@ -1538,7 +1537,7 @@ export async function installationTable( req, res ) {
       'count': ticketList.length,
     } );
     let notIdentifiedCount = ticketList.reduce( ( count, ticket ) => {
-      return ticket.ticketStatus === 'notidentified' && ( ticket.installationStatus == 'onboarded' || ticket.installationStatus == 'paired' ) ? count + 1 : count;
+      return ticket.ticketStatus === 'notidentified'&&( ticket.installationStatus=='onboarded'||ticket.installationStatus=='paired' ) ? count + 1 : count;
     }, 0 );
     let AutoClosedCount = ticketList.reduce( ( count, ticket ) => {
       return ticket.installationStatus === 'deployed' ? count + 1 : count;
@@ -1551,7 +1550,7 @@ export async function installationTable( req, res ) {
       'name': 'Deployed',
       'count': AutoClosedCount,
     } );
-    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'total' && req.body.filterIssue != 'Yet to Address' && req.body.filterIssue != 'Deployed' ) {
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'total'&&req.body.filterIssue != 'Yet to Address'&&req.body.filterIssue != 'Deployed' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.filterIssue,
@@ -1605,7 +1604,7 @@ export async function installationTable( req, res ) {
 
     if ( req.body.export && result.length > 0 ) {
       const exportdata = [];
-      if ( req.user.userType === 'tango' ) {
+      if ( req.user.userType ==='tango' ) {
         result.forEach( ( element ) => {
           exportdata.push( {
             'Ticket ID': element.ticketId,
@@ -1616,7 +1615,7 @@ export async function installationTable( req, res ) {
             'Store ID': element.storeId,
             'Installed By': element.userName,
             'Deployed Status': element.installationStatus,
-            'Primary Issues': element.primaryIssue == '-' ? 'Issue not identified' : element.primaryIssue,
+            'Primary Issues': element.primaryIssue=='-'?'Issue not identified':element.primaryIssue,
             'Secondary Issues': element.secondaryIssue,
           } );
         } );
@@ -1628,7 +1627,7 @@ export async function installationTable( req, res ) {
             'Store Name': element.storeName,
             'Store ID': element.storeId,
             'Deployed Status': element.installationStatus,
-            'Primary Issues': element.primaryIssue == '-' ? 'Issue not identified' : element.primaryIssue,
+            'Primary Issues': element.primaryIssue=='-'?'Issue not identified':element.primaryIssue,
             'Secondary Issues': element.secondaryIssue,
           } );
         } );
@@ -1826,7 +1825,7 @@ export async function storeFilter( req, res ) {
     const inputData = req.body;
     let query = { 'issueType': inputData.issueType, 'basicDetails.clientId': inputData.clientId, 'basicDetails.storeId': { $exists: true } };
     if ( inputData.issueType == 'dataMismatch' ) {
-      query = {
+      query ={
         'issueType': { '$in': [ 'highcount', 'lowcount' ] }, 'basicDetails.clientId': inputData.clientId, 'basicDetails.storeId': { $exists: true },
       };
     }
@@ -1957,6 +1956,7 @@ export async function dataMismatchTable( req, res ) {
           clientId: '$basicDetails.clientId',
           storeName: '$basicDetails.storeName',
           storeId: '$basicDetails.storeId',
+          type: '$dataMismatch.showToClient',
           userId: { $ifNull: [ '$ticketDetails.addressingUser', '$$REMOVE' ] },
           issueType: 1,
           status: 1,
@@ -2017,6 +2017,7 @@ export async function dataMismatchTable( req, res ) {
           userInfo: { $first: '$userInfo' },
           issueType: { $first: '$issueType' },
           status: { $first: '$status' },
+          type: { $first: '$type' },
           otherscomment: { $last: '$otherscomment.comment' },
         },
       },
@@ -2031,7 +2032,7 @@ export async function dataMismatchTable( req, res ) {
           storeId: 1,
           userName: { $ifNull: [ '$userInfo.userName', '' ] },
           email: { $ifNull: [ '$userInfo.email', '' ] },
-          type: { $ifNull: [ { $cond: [ { $eq: [ '$userInfo.userType', 'client' ] }, 'external', { $cond: [ { $eq: [ '$userInfo.userType', 'tango' ] }, 'internal', '' ] } ] }, '' ] },
+          type: { $ifNull: [ { $cond: [ { $eq: [ '$type', false ] }, 'internal', { $cond: [ { $eq: [ '$type', true ] }, 'external', '' ] } ] }, '' ] },
           issueType: 1,
           status: 1,
           otherscomment: 1,
@@ -2042,31 +2043,20 @@ export async function dataMismatchTable( req, res ) {
 
     if ( inputData?.filterIssue && inputData?.filterIssue != '' ) {
       const issueType = inputData.filterIssue == 'total' ? [ 'highcount', 'lowcount' ] : [ inputData.filterIssue ];
-      query.push( {
-        $match: {
-          issueType: { $in: issueType },
-        },
+      filter.push( {
+        issueType: { $in: issueType },
       } );
     }
 
-
     if ( inputData?.filterByStores && inputData?.filterByStores?.length > 0 ) {
-      query.push( {
-
-        $match: {
-          'storeId': { $in: inputData.filterByStores },
-
-        },
-
+      filter.push( {
+        'storeId': { $in: inputData.filterByStores },
       } );
     }
 
     if ( inputData?.filterByStatus && inputData?.filterByStatus?.length > 0 ) {
-      query.push( {
-
-        $match: {
-          status: { $in: inputData.filterByStatus },
-        },
+      filter.push( {
+        status: { $in: inputData.filterByStatus },
       } );
     }
 
@@ -2079,17 +2069,15 @@ export async function dataMismatchTable( req, res ) {
     }
 
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
-      query.push( {
-        $match: {
-          $or: [
-            { 'clientName': { $regex: req.body.searchValue, $options: 'i' } },
-            { 'storeId': { $regex: req.body.searchValue, $options: 'i' } },
-            { 'storeName': { $regex: req.body.searchValue, $options: 'i' } },
-            { 'status': { $regex: req.body.searchValue, $options: 'i' } },
-            { 'ticketId': { $regex: req.body.searchValue, $options: 'i' } },
-            { 'issueType': { $regex: req.body.searchValue, $options: 'i' } },
-          ],
-        },
+      filter.push( {
+        $or: [
+          { 'clientName': { $regex: req.body.searchValue, $options: 'i' } },
+          { 'storeId': { $regex: req.body.searchValue, $options: 'i' } },
+          { 'storeName': { $regex: req.body.searchValue, $options: 'i' } },
+          { 'status': { $regex: req.body.searchValue, $options: 'i' } },
+          { 'ticketId': { $regex: req.body.searchValue, $options: 'i' } },
+          { 'issueType': { $regex: req.body.searchValue, $options: 'i' } },
+        ],
       } );
     }
 
@@ -2103,13 +2091,13 @@ export async function dataMismatchTable( req, res ) {
     }
 
     const count = await aggregateTangoTicket( query );
-
     query.push(
         { $skip: offset },
         { $limit: limit },
     );
     const result = await aggregateTangoTicket( query );
 
+
     if ( inputData.export ) {
       const resultChunk = await chunkArray( count, 10 );
       const promises = resultChunk.map( async ( chunk ) => {
@@ -2158,7 +2146,7 @@ export async function dataMismatchTable( 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 ) {
@@ -2250,9 +2238,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.permittedStores = uniqueArray;
+        req.body.permittedStores =uniqueArray;
       }
     }
     next();

package/src/controllers/internalInfra.controller.js

@@ -1053,6 +1053,7 @@ export async function updateIssue( data ) {
         timeStamp: statusCheckAlertTime,
         actionBy: 'Tango',
         IdentifiedBy: 'Tango',
+        timeStamp: new Date(),
         statusCheckAlertTime: statusCheckAlertTime,
       } );
     }

package/src/controllers/userInfra.controller.js

@@ -42,6 +42,7 @@ export async function userTakeTicket( req, res ) {
           'ticketDetails.ticketType': 'refreshticket',
           'ticketDetails.refreshTicketStatus': 'notidentified',
         };
+        console.log( query, assignedClients );
 
         if ( assignedClients.length > 0 ) {
           query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );

package/src/routes/clientInfra.routes.js

@@ -8,38 +8,38 @@ export const clientInfraRouter = express.Router();
 
 clientInfraRouter.post( '/infraCard', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), checkPermission, infraCard );
 clientInfraRouter.post( '/infraIssuesTable', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), checkPermission, infraIssuesTable );
 clientInfraRouter.post( '/installationCard', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), checkPermission, installationCard );
 clientInfraRouter.post( '/InstallationIssuesTable', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), checkPermission, InstallationIssuesTable );
 clientInfraRouter.post( '/hourWiseDownClients', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), hourWiseDownClients );
 clientInfraRouter.post( '/hourWiseDownstores', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), checkPermission, hourWiseDownstores );
 
 clientInfraRouter.post( '/ticket-count', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), checkPermission, ticketCount );
 clientInfraRouter.post( '/ticket-count-split', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), checkPermission, ticketCountSplit );
 clientInfraRouter.post( '/overview-table', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
-    { featureName: 'manage', name: 'overview', permissions: [ 'isView' ] } ],
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), checkPermission, overViewTable );

package/src/validations/infra.validation.js

@@ -366,6 +366,7 @@ export async function InfraAlert( req, res, next ) {
           timeStamp: statusCheckAlertTime,
           actionBy: 'Tango',
           IdentifiedBy: 'Tango',
+          timeStamp: new Date(),
           statusCheckAlertTime: statusCheckAlertTime,
         } );
       }