tango-app-api-infra 3.0.104-dev → 3.0.106-dev

package/package.json

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

package/src/controllers/clientInfra.controller.js

@@ -17,7 +17,6 @@ export async function infraCard( req, res ) {
           $and: [
             { issueType: 'installation' },
             { 'status': { $ne: 'closed' } },
-            { 'ticketDetails.issueStatus': 'notidentified' },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
             { createdAt: { $lte: date.end } },
           ],
@@ -570,7 +569,7 @@ export async function InstallationIssuesTable( req, res ) {
     if ( req.body.installtionfilterIssue == 'yettoInstallStores' ) {
       query.push( { $match: { 'ticketDetails.issueStatus': 'notidentified' } } );
     }
-    if ( req.body.installtionfilterIssue == 'installFailedStores' ) {
+    if ( req.body.installtionfilterIssue == 'installationFailedStores' ) {
       query.push( { $match: { 'ticketDetails.issueStatus': 'identified' } } );
     }
 
@@ -726,7 +725,7 @@ export async function InstallationIssuesTable( req, res ) {
         },
       } );
     }
-    if ( req.body.installtionfilterIssue && req.body.installtionfilterIssue != '' && req.body.installtionfilterIssue != 'yettoInstallStores' && req.body.installtionfilterIssue != 'installFailedStores' ) {
+    if ( req.body.installtionfilterIssue && req.body.installtionfilterIssue != '' && req.body.installtionfilterIssue != 'yettoInstallStores' && req.body.installtionfilterIssue != 'installationFailedStores' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.installtionfilterIssue,
@@ -772,7 +771,7 @@ export async function InstallationIssuesTable( req, res ) {
       const exportdata = [];
       storesList.forEach( ( element ) => {
         exportdata.push( {
-          'Client Name': element.clientName,
+          'Brand Name': element.clientName,
           'Store ID': element.storeId,
           'Store Name': element.storeName,
           'Status': element.status,
@@ -1342,14 +1341,16 @@ export async function overViewTable( req, res ) {
         },
       },
     ];
-    if ( inputData.searchValue ) {
-      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' } },
-        ],
+    if ( req.body.searchValue && req.body.searchValue != '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { storeId: { $regex: req.body.searchValue, $options: 'i' } },
+            { storeName: { $regex: req.body.searchValue, $options: 'i' } },
+            { clientName: { $regex: req.body.searchValue, $options: 'i' } },
+            { status: { $regex: req.body.searchValue, $options: 'i' } },
+          ],
+        },
       } );
     }
     if ( inputData.sortColumnName ) {

package/src/controllers/dataMismatch.controller.js

@@ -205,10 +205,10 @@ export async function activityList( req, res ) {
       } );
     }
 
-    if ( req.body.filter && req.body.filter !== '' ) {
+    if ( req.body.filter && req.body.filter.length ) {
       query.push( {
         $match: {
-          issueType: req.body.filter,
+          issueType: { $in: req.body.filter },
         },
       } );
     }

package/src/controllers/userInfra.controller.js

@@ -532,21 +532,32 @@ export async function workHistory( req, res ) {
     if ( req.body.export ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        let data = {
-          'CREATED ON': dayjs( element.createdAt ).format( 'DD-MM-YYYY' ),
-          'TICKET ID': element.ticketId,
-          'STORE ID': element.storeId,
-          'STORE NAME': element.storeName,
-          'CLIENT ID': element.clientId,
-          'CLIENT NAME': element.clientName,
-          'CLOSED ON': element.issueClosedDate,
-          'STATUS': element.status,
-        };
+        let data = {};
         if ( req.body.issueType === 'infra' || req.body.issueType === 'installation' ) {
-          data = { ...data, ...{ 'ISSUE': element.infraIssue ? element.infraIssue : '-', 'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate } };
+          data ={
+            'Created on': dayjs( element.createdAt ).format( 'DD MMM, YYYY' ),
+            'Ticket ID': element.ticketId,
+            'Brand Name': element.clientName,
+            'Brand ID': element.clientId,
+            'Store Name': element.storeName,
+            'Store ID': element.storeId,
+            'Closed on': element.issueClosedDate,
+            'Issue Identified on': element.issueIdentifiedDate,
+            'Issue Type': element.infraIssue ? element.infraIssue : '-',
+          };
         }
         if ( req.body.issueType === 'dataMismatch' ) {
-          data = { ...data, ...{ 'issueType': element.issueType ? element.issueType : '-', 'ISSUE DATE': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ) } };
+          data ={
+            'Created on': dayjs( element.createdAt ).format( 'DD MMM, YYYY' ),
+            'Ticket ID': element.ticketId,
+            'Brand Name': element.clientName,
+            'Brand ID': element.clientId,
+            'Store Name': element.storeName,
+            'Store ID': element.storeId,
+            'Issue date': dayjs( element.issueDate ).format( 'DD MMM, YYYY' ),
+            'Closed on': element.issueClosedDate,
+            'Issue Type': element.issueType ? element.issueType : '-',
+          };
         }
         exportdata.push( data );
       } );