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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.108-dev",
+    "version": "3.0.109-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 );
         }
       }
@@ -563,15 +578,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;