tango-app-api-infra 3.0.83-dev → 3.0.85-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.83-dev",
+    "version": "3.0.85-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -27,7 +27,7 @@
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
         "tango-api-schema": "^2.0.103",
-        "tango-app-api-middleware": "^1.0.73-dev",
+        "tango-app-api-middleware": "^1.0.71-test",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/clientInfra.controller.js

@@ -1,16 +1,16 @@
 
-import { aggregateStore, countDocumentsStore } from '../services/store.service.js';
+import { countDocumentsStore } from '../services/store.service.js';
 import { logger, download, getUTC } from 'tango-app-api-middleware';
 import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findinfraReason } from '../services/infraReason.service.js';
-import { aggregateClient } from '../services/client.service.js';
+import { aggregateClient, findClient } from '../services/client.service.js';
 import dayjs from 'dayjs';
 import { getOpenSearchData } from 'tango-app-api-middleware';
 
 export async function infraCard( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let storeCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId }, 'edge.firstFile': true, 'status': 'active' } );
+    let storeCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId }, 'createdAt': { $lte: date.end }, 'edge.firstFile': true, 'status': 'active' } );
     let infraStoreCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -18,7 +18,7 @@ export async function infraCard( req, res ) {
             { issueType: 'infra' },
             { status: { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: date.start } },
+            // { createdAt: { $gte: date.start } },
             { createdAt: { $lte: date.end } },
           ],
         },
@@ -54,7 +54,7 @@ export async function infraCard( req, res ) {
           { status: { $ne: 'closed' } },
           { 'ticketDetails.issueStatus': 'identified' },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
-          { createdAt: { $gte: date.start } },
+          // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
       },
@@ -134,6 +134,14 @@ export async function infraCard( req, res ) {
         count: 0,
       } ) );
     }
+    response.unshift( {
+      name: 'All Issues',
+      count: infraStoreCount.length > 0 ? infraStoreCount[0].identifiedcount : 0,
+    } );
+    response.push( {
+      name: 'Issues Not Identified',
+      count: infraStoreCount.length > 0 ? infraStoreCount[0].infraCount - infraStoreCount[0].identifiedcount : 0,
+    } );
     res.sendSuccess( {
       total: storeCount,
       liveStoreCount: infraStoreCount.length > 0 ? storeCount - infraStoreCount[0].infraCount : 0,
@@ -149,15 +157,21 @@ export async function infraCard( req, res ) {
 }
 export async function installationCard( req, res ) {
   try {
+    let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
     let onboardedCount = await countDocumentsStore( {
       '$and': [
         { 'clientId': { $in: req.body.clientId } },
+        { 'createdAt': { $lte: date.end } },
       ],
     } );
-    let installedCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId },
-      'edge.firstFile': true, 'status': 'active' } );
-    let deactiveCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId },
-      'status': 'deactive' } );
+    let installedCount = await countDocumentsStore( {
+      'clientId': { $in: req.body.clientId },
+      'edge.firstFile': true, 'status': 'active', 'createdAt': { $lte: date.end },
+    } );
+    let deactiveCount = await countDocumentsStore( {
+      'clientId': { $in: req.body.clientId },
+      'status': 'deactive',
+    } );
     let yettoInstallCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -166,7 +180,7 @@ export async function installationCard( req, res ) {
             { 'status': { $ne: 'closed' } },
             { 'ticketDetails.issueStatus': 'notidentified' },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: new Date( req.body.fromDate ) } },
+            { createdAt: { $lte: new Date( req.body.toDate ) } },
           ],
         },
       },
@@ -178,7 +192,7 @@ export async function installationCard( req, res ) {
           { 'status': { $ne: 'closed' } },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
           { 'ticketDetails.issueStatus': 'identified' },
-          { createdAt: { $gte: new Date( req.body.fromDate ) } },
+          { createdAt: { $lte: new Date( req.body.toDate ) } },
         ],
       },
     },
@@ -265,14 +279,18 @@ 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';
+    if ( req.body.filterIssue == 'Issues Not Identified' ) {
+      issueStatus = 'notidentified';
+    };
     let query = [ {
       $match: {
         $and: [
           { issueType: 'infra' },
           { status: { $ne: 'closed' } },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
-          { 'ticketDetails.issueStatus': 'identified' },
-          { createdAt: { $gte: date.start } },
+          { 'ticketDetails.issueStatus': issueStatus },
+          // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
       },
@@ -343,7 +361,7 @@ export async function infraIssuesTable( req, res ) {
       },
     },
     ];
-    if ( req.body.filterIssue && req.body.filterIssue != '' ) {
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'All Issues' && req.body.filterIssue != 'Issues Not Identified' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.filterIssue,
@@ -418,9 +436,10 @@ export async function InstallationIssuesTable( req, res ) {
         $match: {
           $and: [
             { issueType: 'installation' },
+            { 'status': { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: new Date( req.body.fromDate ) } },
-            // { createdAt: { $lte: new Date( req.body.toDate ) } },
+            // { createdAt: { $gte: new Date( req.body.fromDate ) } },
+            { createdAt: { $lte: new Date( req.body.toDate ) } },
           ],
         },
       },
@@ -537,11 +556,15 @@ export async function InstallationIssuesTable( req, res ) {
 export async function hourWiseDownClients( req, res ) {
   try {
     let inputData = req.body;
-
+    let clientList = await findClient( { clientId: { $in: req.body.clientId }, status: 'active' } );
+    let activeClient = [];
+    for ( let client of clientList ) {
+      activeClient.push( client.clientId );
+    }
     let query = [
       {
         $match: {
-          clientId: { $in: req.body.clientId },
+          clientId: { $in: activeClient },
         },
       },
       {
@@ -685,22 +708,55 @@ function generateTimeSlots( startHour, endHour, interval, time ) {
 export async function hourWiseDownstores( req, res ) {
   try {
     let inputData = req.body;
-    inputData.Date = dayjs().format( 'YYYY-MM-DD' );
+    inputData.Date = dayjs( req.body.toDate ).format( 'YYYY-MM-DD' );
 
     let query = [ {
       $match: {
-        clientId: req.body.clientId,
-        status: 'active',
+        $and: [
+          { 'basicDetails.clientId': req.body.clientId },
+          { 'status': { $ne: 'closed' } },
+          { 'issueDate': { $lte: new Date( req.body.toDate ) } },
+        ],
+      },
+    },
+    {
+      $project: {
+        storeId: '$basicDetails.storeId',
+        storeName: '$basicDetails.storeName',
+        primaryIssue: {
+          $filter: {
+            input: '$ticketActivity',
+            as: 'item',
+            cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
+          },
+        },
+      },
+    },
+    {
+      $unwind: {
+        path: '$primaryIssue', preserveNullAndEmptyArrays: true,
+      },
+    },
+    {
+      $unwind: {
+        path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
       },
     },
     {
       $project: {
         storeId: 1,
         storeName: 1,
-        storeProfile: 1,
+        primaryIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', 'NotIdentified' ] },
+      },
+    },
+    {
+      $group: {
+        _id: '$storeId',
+        storeId: { $first: '$storeId' },
+        storeName: { $first: '$storeName' },
+        primaryIssue: { $last: '$primaryIssue' },
       },
     },
-
     ];
     if ( req.body.searchValue && req.body.searchValue !== '' ) {
       query.push( {
@@ -717,14 +773,21 @@ export async function hourWiseDownstores( req, res ) {
         $sort: { [req.body.sortColumName]: req.body.sortBy },
       } );
     }
-    let count = await aggregateStore( query );
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'All Issues' && req.body.filterIssue != 'Issues Not Identified' ) {
+      query.push( {
+        $match: {
+          primaryIssue: req.body.filterIssue,
+        },
+      } );
+    }
+    let count = await aggregateTangoTicket( query );
     if ( req.body.limit && req.body.offset && !req.body.export ) {
       query.push(
           { $skip: ( req.body.offset - 1 ) * req.body.limit },
           { $limit: Number( req.body.limit ) },
       );
     }
-    let storeslist = await aggregateStore( query );
+    let storeslist = await aggregateTangoTicket( query );
     if ( storeslist.length == 0 ) {
       return res.sendError( 'no data', 204 );
     }
@@ -733,6 +796,7 @@ export async function hourWiseDownstores( req, res ) {
     for ( const store of storeslist ) {
       data.storeId = store.storeId;
       data.storeName = store.storeName;
+      data.primaryIssue = store.primaryIssue;
       let storedata = await downStoresCheck( data, inputData );
       result.push( storedata[0] );
     }
@@ -801,7 +865,7 @@ function downStoresCheck( data, inputData ) {
       const mergedData = {
         storeName: data.storeName,
         storeId: data.storeId,
-
+        PrimaryIssue: data.primaryIssue,
       };
       timewise.forEach( ( obj ) => {
         for ( const key in obj ) {

package/src/controllers/infra.controllers.js

@@ -26,6 +26,10 @@ export async function createTicket( req, res ) {
         actionBy: 'Tango',
         IdentifiedBy: 'Tango',
       } ];
+      let ticketExists= await findOneTangoTicket( { ticketId: req.body.ticketId } );
+      if ( ticketExists ) {
+        res.status( 200 ).send( { storeId: req.body.storeId } );
+      }
     }
     if ( req.body.issueType == 'installation' ) {
       req.body.ticketId = 'TE_INS_' + new Date().valueOf();
@@ -332,6 +336,17 @@ export async function AlertTicketReply( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+export async function removeAttachment( req, res ) {
+  try {
+    let updateTicket = await updateOneTangoTicket( { ticketId: req.params.ticketId }, { attachments: req.body.attachments } );
+    if ( updateTicket ) {
+      res.sendSuccess( 'Removed successfully' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'uploadAttachments' } );
+    return res.sendError( error, 500 );
+  }
+}
 export async function uploadAttachments( req, res ) {
   try {
     if ( req.files.img && req.files.img.length > 0 ) {
@@ -692,7 +707,7 @@ export async function getInfraIssues( req, res ) {
           primaryIssue: 1,
           secondaryReason: 1,
           downTime: { $ifNull: [ 0, 0 ] },
-          speedTest: { $ifNull: [ 0.5, 0.5 ] },
+          speedTest: null,
         },
 
       },
@@ -704,7 +719,7 @@ export async function getInfraIssues( req, res ) {
     let end = new Date( inputData.toDate );
 
     while ( current <= end ) {
-      retVal.push( { issueDate: dayjs( current ).format( 'YYYY-MM-DD' ), downTime: 0, speedTest: 0.6 } );
+      retVal.push( { issueDate: dayjs( current ).format( 'YYYY-MM-DD' ), downTime: 0, speedTest: null } );
       current.setDate( current.getDate() + 1 );
     }
 
@@ -716,7 +731,6 @@ export async function getInfraIssues( req, res ) {
             _.keyBy( result, 'issueDate' ),
         ),
     );
-    logger.info( { message: mergeValue, value1: result } );
 
     if ( mergeValue.length == 0 ) {
       return res.sendError( 'NO Data Found', 204 );
@@ -745,17 +759,65 @@ export async function getInfraIssues( req, res ) {
             },
 
           } );
-      let streamwiseDowntime = [];
-      logger.info( { streamwiseDowntime: downTime.body.hits.hits.length } );
+
+      const speedTest = await getOpenSearchData( 'edgeapp_systemlogs',
+          {
+            'size': 1,
+            'query': {
+              'bool': {
+                'must': [
+                  {
+                    'term': {
+                      'store_date.keyword': dayjs( mergeValue[i].issueDate ).format( 'DD-MM-YYYY' ),
+                    },
+                  },
+                  {
+                    'term': {
+                      'storeId.keyword': inputData.storeId,
+                    },
+                  },
+                  {
+                    'term': {
+                      'log_subtype.keyword': 'Speed_Test',
+                    },
+                  },
+
+                ],
+
+              },
+            },
+
+            'sort': [
+              {
+                'timestamp': {
+                  'order': 'desc',
+                },
+              },
+            ],
+
+          } );
+      let streamwiseDowntime = downTime.body.hits.hits;
+
       if ( downTime.body.hits.hits.length > 0 ) {
-        for ( let i = 0; i< downTime.body.hits.hits.length; i++ ) {
-          const sum = streamwiseDowntime.reduce( ( accumulator, currentValue ) => {
+        let down = 0;
+        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 );
-          const average = sum / streamwiseDowntime.length;
-          mergeValue.downTime = Math.round( average );
-          // streamwiseDowntime.push( ...downTime.body.hits.hits[i]._source.doc.streamwise_downtime );
+          if ( streamwiseDowntime[j]?._source?.doc?.streamwise_downtime?.length > 0 ) {
+            const average = sum / streamwiseDowntime[j]?._source?.doc?.streamwise_downtime?.length;
+
+            down = down + Math.round( average );
+            logger.info( { down: down, downTine: mergeValue[i].downTime, streamwiseData: streamwiseDowntime[j]?._source?.doc?.streamwise_downtime } );
+          }
         }
+        mergeValue[i].downTime = down;
+      }
+
+      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 );
+        mergeValue[i].speedTest = Number( converToMb );
       }
     }
     const camQuery = [
@@ -808,7 +870,6 @@ export async function getInfraIssues( req, res ) {
       successRate: 0,
     };
     const getHighCountTicket = await aggregateTangoTicket( highCountQuery );
-    logger.info( { getHighCountTicket: getHighCountTicket } );
     const camera = await aggregateCamera( camQuery );
     for ( let index = 0; index < camera.length; index++ ) {
       if ( camera?.[index]?.thumbnailImage ) {
@@ -866,6 +927,7 @@ export async function infraTable( req, res ) {
         ticketId: 1,
         storeName: '$basicDetails.storeName',
         clientName: '$basicDetails.clientName',
+        ticketStatus: '$ticketDetails.issueStatus',
         status: 1,
         createdAt: 1,
         issueDate: 1,
@@ -877,6 +939,20 @@ export async function infraTable( req, res ) {
             cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
           },
         },
+        otherscomment: {
+          $filter: {
+            input: '$ticketActivity',
+            as: 'item',
+            cond: { $eq: [ '$$item.actionType', 'comment' ] },
+          },
+        },
+        comments: {
+          $filter: {
+            input: '$ticketActivity',
+            as: 'item',
+            cond: { $ne: [ '$$item.actionType', 'statusChange' ] },
+          },
+        },
       },
     },
     {
@@ -889,6 +965,11 @@ export async function infraTable( req, res ) {
         path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
       },
     },
+    {
+      $unwind: {
+        path: '$otherscomment', preserveNullAndEmptyArrays: true,
+      },
+    },
     {
       $unwind: {
         path: '$primaryIssue.reasons.secondaryIssue', preserveNullAndEmptyArrays: true,
@@ -902,9 +983,12 @@ export async function infraTable( req, res ) {
         clientName: 1,
         createdAt: 1,
         addressingUser: 1,
+        ticketStatus: 1,
         ticketId: 1,
         issueDate: { $ifNull: [ '$issueDate', '' ] },
         status: 1,
+        commentText: '$primaryIssue.comment',
+        otherscomment: '$otherscomment.comment',
         primaryIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '-' ] },
         secondaryIssue: { $ifNull: [ '$primaryIssue.reasons.secondaryIssue.name', '-' ] },
       },
@@ -946,12 +1030,15 @@ export async function infraTable( req, res ) {
         clientId: { $first: '$clientId' },
         ticketId: { $first: '$ticketId' },
         storeName: { $first: '$storeName' },
+        ticketStatus: { $first: '$ticketStatus' },
         userName: { $first: { $ifNull: [ '$user.userName', '-' ] } },
         userEmail: { $first: { $ifNull: [ '$user.email', '-' ] } },
         clientName: { $first: '$clientName' },
         createdAt: { $first: '$createdAt' },
         issueDate: { $last: '$issueDate' },
         status: { $last: '$status' },
+        commentText: { $last: '$commentText' },
+        otherscomment: { $last: '$otherscomment' },
         primaryIssue: { $last: '$primaryIssue' },
         secondaryIssue: { $last: '$secondaryIssue' },
       },
@@ -1011,19 +1098,48 @@ export async function infraTable( req, res ) {
         count: 0,
       } ) );
     }
+
     response.push( {
       'name': 'total',
       'count': ticketList.length,
-
     } );
-    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'total' ) {
+    let notIdentifiedCount = ticketList.reduce( ( count, ticket ) => {
+      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;
+    }, 0 );
+    response.unshift( {
+      'name': 'Yet to Address',
+      'count': notIdentifiedCount,
+    } );
+    response.unshift( {
+      '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' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.filterIssue,
         },
       } );
     }
-
+    if ( req.body.filterIssue == 'Yet to Address' ) {
+      query.push( {
+        $match: {
+          ticketStatus: 'notidentified',
+          status: { $ne: 'closed' },
+        },
+      } );
+    }
+    if ( req.body.filterIssue == 'Auto Closed' ) {
+      query.push( {
+        $match: {
+          ticketStatus: 'notidentified',
+          status: 'closed',
+        },
+      } );
+    }
     if ( req.body.searchValue && req.body.searchValue != '' ) {
       query.push( {
         $match: {
@@ -1058,6 +1174,7 @@ export async function infraTable( req, res ) {
           'Status': element.status,
           'StatusDetails': element.primaryIssue,
           'SubIssue': element.secondaryIssue,
+          'Comment': element.otherscomment ? element.otherscomment : ( element.commentText?element.commentText:'-' ),
         } );
       } );
       await download( exportdata, res );
@@ -1101,6 +1218,7 @@ export async function installationTable( req, res ) {
         ticketId: 1,
         storeName: '$basicDetails.storeName',
         clientName: '$basicDetails.clientName',
+        ticketStatus: '$ticketDetails.issueStatus',
         status: 1,
         createdAt: 1,
         addressingUser: '$ticketDetails.addressingUser',
@@ -1138,6 +1256,7 @@ export async function installationTable( req, res ) {
         clientName: 1,
         createdAt: 1,
         ticketId: 1,
+        ticketStatus: 1,
         addressingUser: 1,
         installationStatus: { $ifNull: [ '$installationStatus', '-' ] },
         issueDate: { $ifNull: [ '$issueDate', '' ] },
@@ -1183,6 +1302,7 @@ export async function installationTable( req, res ) {
         clientId: { $first: '$clientId' },
         ticketId: { $first: '$ticketId' },
         storeName: { $first: '$storeName' },
+        ticketStatus: { $first: '$ticketStatus' },
         userName: { $first: { $ifNull: [ '$user.userName', '-' ] } },
         userEmail: { $first: { $ifNull: [ '$user.email', '-' ] } },
         clientName: { $first: '$clientName' },
@@ -1232,11 +1352,13 @@ export async function installationTable( req, res ) {
     let response;
     if ( ticketList.length > 0 ) {
       ticketList.forEach( ( item ) => {
-        const categoryName = item.primaryIssue;
-        if ( categoryCounts[categoryName] ) {
-          categoryCounts[categoryName]++;
-        } else {
-          categoryCounts[categoryName] = 1;
+        if ( item.installationStatus!='deployed' ) {
+          const categoryName = item.primaryIssue;
+          if ( categoryCounts[categoryName] ) {
+            categoryCounts[categoryName]++;
+          } else {
+            categoryCounts[categoryName] = 1;
+          }
         }
       } );
       response = issueList.map( ( category ) => ( {
@@ -1252,15 +1374,54 @@ export async function installationTable( req, res ) {
     response.push( {
       'name': 'total',
       'count': ticketList.length,
-
     } );
-    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'total' ) {
+    let notIdentifiedCount = ticketList.reduce( ( count, ticket ) => {
+      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;
+    }, 0 );
+    response.unshift( {
+      'name': 'Yet to Address',
+      'count': notIdentifiedCount,
+    } );
+    response.unshift( {
+      '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' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.filterIssue,
         },
       } );
     }
+    if ( req.body.filterIssue == 'Yet to Address' ) {
+      query.push( {
+        $match: {
+          $and: [
+            {
+              $or: [
+                { installationStatus: 'onboarded' },
+                { installationStatus: 'paired' },
+              ],
+            },
+            {
+              ticketStatus: 'notidentified',
+            },
+          ],
+
+
+        },
+      } );
+    }
+    if ( req.body.filterIssue == 'Deployed' ) {
+      query.push( {
+        $match: {
+          installationStatus: 'deployed',
+        },
+      } );
+    }
     if ( req.body.searchValue && req.body.searchValue != '' ) {
       query.push( {
         $match: {

package/src/controllers/internalInfra.controller.js

@@ -12,7 +12,7 @@ dayjs.extend( timezone );
 import { sendEmailWithSES, signedUrl } from 'tango-app-api-middleware';
 import { createClient, findClient, aggregateClient, findOneClient } from '../services/client.service.js';
 import { createStore, findStore, updateOneStore, findOneStore } from '../services/store.service.js';
-import { findTangoTicket, findOneTangoTicket, countDocumentsTangoTicket, aggregateTangoTicket, updateOneTangoTicket } from '../services/tangoTicket.service.js';
+import { findTangoTicket, findOneTangoTicket, countDocumentsTangoTicket, updateOneTangoTicketunset, aggregateTangoTicket, updateOneTangoTicket } from '../services/tangoTicket.service.js';
 import { findOneGroup } from '../services/group.service.js';
 import { findinfraReason } from '../services/infraReason.service.js';
 import { findOneUser } from '../services/user.service.js';
@@ -85,7 +85,7 @@ export async function clientList( req, res ) {
 
 export async function basicList( req, res ) {
   try {
-    let storeList = await findStore( { status: 'active' },
+    let storeList = await findStore( { 'status': 'active', 'edge.firstFile': true },
         { 'storeName': 1, 'storeId': 1, 'ticketConfigs': 1, 'clientId': 1, 'storeProfile.open': 1, 'storeProfile.close': 1, 'storeProfile.timeZone': 1 } );
     res.sendSuccess( storeList );
   } catch ( error ) {
@@ -152,6 +152,7 @@ export async function updateRefreshTicket( req, res ) {
     for ( let ticket of req.body.TicketList ) {
       let getTicket = await findOneTangoTicket( { ticketId: ticket.ticketId } );
       await updateOneTangoTicket( { ticketId: ticket.ticketId }, { 'ticketDetails.ticketType': 'refreshticket' } );
+      await updateOneTangoTicketunset( { ticketId: ticket.ticketId }, { 'ticketDetails.addressingUser': 1 } );
       let downTimeQuery = {
         'size': 1,
         'query': {
@@ -453,7 +454,7 @@ export async function infraReportSent( req, res ) {
     let query = [ {
       $match: {
         $and: [
-          { issueDate: new Date( date ) },
+          { issueDate: { $lte: new Date( date ) } },
           { 'basicDetails.storeId': { $in: req.body.storeList } },
           { issueType: 'infra' },
         ],

package/src/controllers/storeInfra.controlller.js

@@ -8,12 +8,35 @@ import { signedUrl, appConfig } from 'tango-app-api-middleware';
 export async function storeTicketList( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let query = [ {
+    let query = [];
+    if ( req.body.fromDate == req.body.toDate ) {
+      query.push( {
+        $match: {
+          $and: [
+            { 'basicDetails.storeId': req.body.storeId },
+            { issueType: 'infra' },
+            { createdAt: { $lte: date.end } },
+          ],
+        },
+      } );
+    } else {
+      query.push( {
+        $match: {
+          $and: [
+            { 'basicDetails.storeId': req.body.storeId },
+            { issueType: 'infra' },
+            { createdAt: { $gte: date.start } },
+            { createdAt: { $lte: date.end } },
+          ],
+        },
+      } );
+    }
+    query.push( {
       $match: {
         $and: [
           { 'basicDetails.storeId': req.body.storeId },
           { issueType: 'infra' },
-          { createdAt: { $gte: date.start } },
+          // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
       },
@@ -112,7 +135,7 @@ export async function storeTicketList( req, res ) {
         issueDate: -1,
       },
     },
-    ];
+    );
 
     if ( req.body.filter && req.body.filter !== '' ) {
       query.push( {
@@ -133,7 +156,7 @@ export async function storeTicketList( req, res ) {
           'PRIMARY ISSUE': element.primaryIssue,
           'SECONDARY ISSUE': element.secondaryIssue,
           'STATUS': element.status,
-          'COMMENT': element.otherscomment?element.otherscomment:element.commentText,
+          'COMMENT': element.otherscomment ? element.otherscomment : element.commentText,
         } );
       } );
       await download( exportdata, res );
@@ -156,58 +179,74 @@ export async function storeTicketList( req, res ) {
 export async function storeTicketcard( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let query = [ {
-      $match: {
-        $and: [
-          { 'basicDetails.storeId': req.body.storeId },
-          { 'ticketDetails.issueStatus': 'identified' },
-          { issueType: 'infra' },
-          { createdAt: { $gte: date.start } },
-          { createdAt: { $lte: date.end } },
-        ],
+    let query = [];
+    if ( req.body.fromDate == req.body.toDate ) {
+      query.push( {
+        $match: {
+          $and: [
+            { 'basicDetails.storeId': req.body.storeId },
+            { 'ticketDetails.issueStatus': 'identified' },
+            { issueType: 'infra' },
+            { createdAt: { $lte: date.end } },
+          ],
+        },
+      } );
+    } else {
+      query.push( {
+        $match: {
+          $and: [
+            { 'basicDetails.storeId': req.body.storeId },
+            { 'ticketDetails.issueStatus': 'identified' },
+            { issueType: 'infra' },
+            { createdAt: { $gte: date.start } },
+            { createdAt: { $lte: date.end } },
+          ],
+        },
+      } );
+    }
 
-      },
-    },
-    {
-      $project: {
-        ticketId: 1,
-        issueStatus: '$ticketDetails.issueStatus',
-        primaryIssue: {
-          $filter: {
-            input: '$ticketActivity',
-            as: 'item',
-            cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
+
+    query.push(
+        {
+          $project: {
+            ticketId: 1,
+            issueStatus: '$ticketDetails.issueStatus',
+            primaryIssue: {
+              $filter: {
+                input: '$ticketActivity',
+                as: 'item',
+                cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
+              },
+            },
           },
         },
-      },
-    },
-    {
-      $unwind: {
-        path: '$primaryIssue', preserveNullAndEmptyArrays: true,
-      },
-    },
-    {
-      $unwind: {
-        path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
-      },
-    },
-    {
-      $project: {
-        ticketId: 1,
-        issueStatus: 1,
-        ticketType: 1,
-        primaryIssue: '$primaryIssue.reasons.primaryIssue',
-      },
-    }, {
-      $group: {
-        _id: '$ticketId',
-        ticketId: { $first: '$ticketId' },
-        issueStatus: { $first: '$issueStatus' },
-        ticketType: { $first: '$ticketType' },
-        primaryIssue: { $last: '$primaryIssue' },
-      },
-    },
-    ];
+        {
+          $unwind: {
+            path: '$primaryIssue', preserveNullAndEmptyArrays: true,
+          },
+        },
+        {
+          $unwind: {
+            path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
+          },
+        },
+        {
+          $project: {
+            ticketId: 1,
+            issueStatus: 1,
+            ticketType: 1,
+            primaryIssue: '$primaryIssue.reasons.primaryIssue',
+          },
+        }, {
+          $group: {
+            _id: '$ticketId',
+            ticketId: { $first: '$ticketId' },
+            issueStatus: { $first: '$issueStatus' },
+            ticketType: { $first: '$ticketType' },
+            primaryIssue: { $last: '$primaryIssue' },
+          },
+        } );
+
     let ticketList = await aggregateTangoTicket( query );
     let issueList = await findinfraReason( { parentId: { '$exists': false } } );
     const categoryCounts = {};
@@ -367,7 +406,7 @@ export async function edgeAppLogTable( req, res ) {
         const average = sum / streamwiseDowntime.length;
         obj.downtime = Math.round( average );
       } else {
-        obj.downtime ='';
+        obj.downtime = '';
       }
       let appStatusQuery = {
         'size': 1,

package/src/controllers/userInfra.controller.js

@@ -30,7 +30,7 @@ export async function userTakeTicket( req, res ) {
         'ticketDetails.addressingClient': { $exists: false },
       };
       if ( assignedClients.length > 0 ) {
-        query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+        query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
       }
       userTicket = await findOneTangoTicket( query );
 
@@ -43,7 +43,7 @@ export async function userTakeTicket( req, res ) {
           'ticketDetails.refreshTicketStatus': 'notidentified',
         };
         if ( assignedClients.length > 0 ) {
-          query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+          query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
         }
         userTicket = await findOneTangoTicket( query );
       }
@@ -56,7 +56,7 @@ export async function userTakeTicket( req, res ) {
         'ticketDetails.addressingClient': { $exists: false },
       };
       if ( assignedClients.length > 0 ) {
-        query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+        query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
       }
       userTicket = await findOneTangoTicket( query );
       if ( !userTicket ) {
@@ -67,7 +67,7 @@ export async function userTakeTicket( req, res ) {
           'ticketDetails.refreshTicketStatus': 'notidentified',
         };
         if ( assignedClients.length > 0 ) {
-          query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+          query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
         }
         userTicket = await findOneTangoTicket( query );
       }
@@ -78,7 +78,7 @@ export async function userTakeTicket( req, res ) {
         'ticketDetails.addressingUser': { $exists: false },
       };
       if ( assignedClients.length > 0 ) {
-        query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+        query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
       }
       userTicket = await findOneTangoTicket( query );
     } else if ( req.body.issueType == 'dataMismatch' ) {
@@ -88,11 +88,11 @@ export async function userTakeTicket( req, res ) {
         'ticketDetails.addressingUser': { $exists: false },
       };
       if ( assignedClients.length > 0 ) {
-        query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+        query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
       }
       userTicket = await findOneTangoTicket( query );
     }
-    if ( userTicket&&userTicket.ticketId ) {
+    if ( userTicket && userTicket.ticketId ) {
       let assignTicket = await updateOneTangoTicket( { ticketId: userTicket.ticketId }, { 'ticketDetails.addressingUser': req.body.userId } );
       if ( assignTicket ) {
         res.sendSuccess( 'Ticket Assigned Successfully' );
@@ -109,7 +109,7 @@ export async function userTicketList( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
     let query = [];
-    if ( req.body.issueType!='dataMismatch' ) {
+    if ( req.body.issueType != 'dataMismatch' ) {
       query.push( {
         $match: {
           $and: [
@@ -253,13 +253,13 @@ export async function userTicketList( req, res ) {
           'STORE NAME': element.storeName,
           'STATUS': element.status,
         };
-        if ( req.body.issueType ==='infra' ) {
+        if ( req.body.issueType === 'infra' ) {
           data = { ...data, ...{ 'ISSUE': element.issueStatus } };
         }
-        if ( req.body.issueType ==='installation' ) {
+        if ( req.body.issueType === 'installation' ) {
           data = { ...data, ...{ 'ISSUE': element.issueStatus } };
         }
-        if ( req.body.issueType ==='dataMismatch' ) {
+        if ( req.body.issueType === 'dataMismatch' ) {
           data = { ...data, ...{ 'ISSUE TYPE': element.issueType } };
         }
         exportdata.push( data );
@@ -326,15 +326,17 @@ export async function basicDetails( req, res ) {
     }
     let infraCount = await countDocumentsTangoTicket( { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ), 'issueType': 'infra' } );
     let installationCount = await countDocumentsTangoTicket( { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ), 'issueType': 'installation' } );
+    let dataMismatchCount = await countDocumentsTangoTicket( { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ), 'issueType': { $in: [ 'highcount', 'lowcount' ] } } );
+    let employeeTrainingCount = await countDocumentsTangoTicket( { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ), 'issueType': 'mat' } );
     res.sendSuccess( {
       userName: user.userName,
       userType: user.userType,
-      total: infraCount + installationCount,
+      total: infraCount + installationCount + dataMismatchCount + employeeTrainingCount,
       infraCount: infraCount,
       installationCount: installationCount,
-      dataMismatchCount: 0,
+      dataMismatchCount: dataMismatchCount,
       auditCount: 0,
-      employeeTrainingCount: 0,
+      employeeTrainingCount: employeeTrainingCount,
     } );
   } catch ( error ) {
     logger.error( { error: error, function: 'userTakeTicket' } );
@@ -345,8 +347,8 @@ export async function basicDetails( req, res ) {
 export async function workHistory( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let query = [ ];
-    if ( req.body.issueType!='dataMismatch' ) {
+    let query = [];
+    if ( req.body.issueType != 'dataMismatch' ) {
       query.push( {
         $match: {
           $and: [
@@ -480,14 +482,14 @@ export async function workHistory( req, res ) {
             infraIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '' ] },
           },
         } );
-    if ( req.body.issueFilter && req.body.issueFilter.length>0&&req.body.issueType!='dataMismatch' ) {
+    if ( req.body.issueFilter && req.body.issueFilter.length > 0 && req.body.issueType != 'dataMismatch' ) {
       query.push( {
         $match: {
           infraIssue: { $in: req.body.issueFilter },
         },
       } );
     }
-    if ( req.body.issueFilter && req.body.issueFilter.length>0&&req.body.issueType==='dataMismatch' ) {
+    if ( req.body.issueFilter && req.body.issueFilter.length > 0 && req.body.issueType === 'dataMismatch' ) {
       query.push( {
         $match: {
           issueType: { $in: req.body.issueFilter },
@@ -524,8 +526,8 @@ export async function workHistory( req, res ) {
     if ( req.body.export ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        let data ={
-          'CREATED ON': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ),
+        let data = {
+          'CREATED ON': dayjs( element.createdAt ).format( 'DD-MM-YYYY' ),
           'TICKET ID': element.ticketId,
           'STORE ID': element.storeId,
           'STORE NAME': element.storeName,
@@ -534,11 +536,11 @@ export async function workHistory( req, res ) {
           'CLOSED ON': element.issueClosedDate,
           'STATUS': element.status,
         };
-        if ( req.body.issueType==='infra'||req.body.issueType==='installation' ) {
-          data = { ...data, ...{ 'ISSUE': element.infraIssue?element.infraIssue:'-', 'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate } };
+        if ( req.body.issueType === 'infra' || req.body.issueType === 'installation' ) {
+          data = { ...data, ...{ 'ISSUE': element.infraIssue ? element.infraIssue : '-', 'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate } };
         }
-        if ( req.body.issueType==='dataMismatch' ) {
-          data = { ...data, ...{ 'issueType': element.issueType?element.issueType:'-' } };
+        if ( req.body.issueType === 'dataMismatch' ) {
+          data = { ...data, ...{ 'issueType': element.issueType ? element.issueType : '-', 'ISSUE DATE': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ) } };
         }
         exportdata.push( data );
       } );

package/src/routes/infra.routes.js

@@ -2,7 +2,7 @@
 import express from 'express';
 import { isAllowedSessionHandler, authorize, validate } from 'tango-app-api-middleware';
 import { validateDetails, bulkvalidateDetails, validateTicket, bulkvalidateTicket, validateTicketstatus, ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert } from '../validations/infra.validation.js';
-import { createTicket, bulkcreateTicket, updateStatus, createReason, PrimaryReasons, matTable,
+import { createTicket, bulkcreateTicket, updateStatus, createReason, PrimaryReasons, matTable, removeAttachment,
   secondaryReason, updateTicketIssue, viewTicket, AlertTicketReply, uploadAttachments, getInfraIssues,
   updateInstallationTicket, emailUserList, saveInfraEmailConfig, invoice, infraTable, storeFilter, assignTicket, installationTable } from '../controllers/infra.controllers.js';
 import { getInfraIssueValid } from '../dtos/infra.dtos.js';
@@ -43,6 +43,10 @@ infraRouter.put( '/uploadAttachments/:ticketId', isAllowedSessionHandler, author
   userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit', 'isView' ] } ],
 } ), ticketExists, uploadAttachments );
+infraRouter.put( '/removeAttachment/:ticketId', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit', 'isView' ] } ],
+} ), ticketExists, removeAttachment );
 infraRouter.post( '/updateInstallationTicket', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit', 'isView' ] } ],

package/src/services/tangoTicket.service.js

@@ -13,6 +13,9 @@ export async function findOneTangoTicket( query, project ) {
 export async function updateOneTangoTicket( query, data ) {
   return await dataModel.tangoTicketModel.updateOne( query, { $set: data } );
 }
+export async function updateOneTangoTicketunset( query, data ) {
+  return await dataModel.tangoTicketModel.updateOne( query, { $unset: data } );
+}
 export async function updateManyTangoTicket( query, data ) {
   return await dataModel.tangoTicketModel.updateMany( query, { $set: data } );
 }