tango-app-api-infra 3.0.95-dev → 3.0.98-dev

package/package.json

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

package/src/controllers/clientInfra.controller.js

@@ -345,6 +345,7 @@ export async function infraIssuesTable( req, res ) {
         clientId: '$basicDetails.clientId',
         ticketId: 1,
         storeName: '$basicDetails.storeName',
+        clientName: '$basicDetails.clientName',
         status: 1,
         createdAt: 1,
         issueIdentifiedDate: '$ticketDetails.issueIdentifiedDate',
@@ -380,6 +381,7 @@ export async function infraIssuesTable( req, res ) {
         storeName: 1,
         createdAt: 1,
         ticketId: 1,
+        clientName: 1,
         actionBy: '$primaryIssue.actionBy',
         issueIdentifiedDate: { $ifNull: [ '$issueIdentifiedDate', '' ] },
         issueClosedDate: { $ifNull: [ '$issueClosedDate', '' ] },
@@ -396,6 +398,7 @@ export async function infraIssuesTable( req, res ) {
         ticketId: { $first: '$ticketId' },
         actionBy: { $first: '$actionBy' },
         storeName: { $first: '$storeName' },
+        clientName: { $first: '$clientName' },
         createdAt: { $first: '$createdAt' },
         issueIdentifiedDate: { $last: '$issueIdentifiedDate' },
         issueClosedDate: { $last: '$issueClosedDate' },
@@ -512,13 +515,13 @@ export async function infraIssuesTable( req, res ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         exportdata.push( {
-          'CREATED AT': element.createdAt,
-          'STORE ID': element.storeId,
-          'STORE NAME': element.storeName,
-          'PRIMARY ISSUE': element.primaryIssue,
-          'SUB ISSUE': element.secondaryIssue,
-          'ISSUE IDENTIFIED ON': dayjs( element.issueIdentifiedDate ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm A' ),
-          'STATUS': element.status,
+          '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 );
@@ -758,10 +761,10 @@ export async function InstallationIssuesTable( req, res ) {
       const exportdata = [];
       storesList.forEach( ( element ) => {
         exportdata.push( {
-          'CLIENT NAME': element.clientName,
-          'STORE ID': element.storeId,
-          'STORE NAME': element.storeName,
-          'STATUS': element.status,
+          'Client Name': element.clientName,
+          'Store ID': element.storeId,
+          'Store Name': element.storeName,
+          'Status': element.status,
         } );
       } );
       await download( exportdata, res );
@@ -1330,23 +1333,18 @@ export async function overViewTable( req, res ) {
     ];
     if ( inputData.searchValue ) {
       filter.push( {
-
         $or: [
-          { 'basicDetails.clientName': { $regex: req.body.searchValue, $options: 'i' } },
-          { 'basicDetails.storeId': { $regex: req.body.searchValue, $options: 'i' } },
-          { 'basicDetails.storeName': { $regex: req.body.searchValue, $options: 'i' } },
+          { '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 ( inputData.sortColumName ) {
+    if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
       query.push( {
-        $sort: {
-          [inputData.sortColumName == 'storeId' ? 'basicDetails.storeId' :
-            inputData.sortColumName == 'clientName' ? 'basicDetails.clientName' :
-              inputData.sortColumName == 'storeName' ? 'basicDetails.storeName' : inputData.sortColumName]: sortBy,
+        $sort: { [inputData.sortColumnName]: sortBy,
         },
       } );
     }
@@ -1364,22 +1362,16 @@ export async function overViewTable( req, res ) {
       return res.sendError( 'No Data Found', 204 );
     }
     if ( inputData.isExport ) {
-      const resultChunk = await chunkArray( count, 10 );
-      const promises = resultChunk.map( async ( chunk ) => {
-        const list = [];
-        for ( let i = 0; i < chunk.length; i++ ) {
-          list.push( {
-            'Client Name': chunk[i]?.clientName,
-            'Store ID': chunk[i]?.storeId,
-            'Store Name': chunk[i]?.storeName,
-            'Status': chunk[i]?.status,
-          } );
-        }
-        return list;
+      const exportdata = [];
+      count.forEach( ( element ) => {
+        exportdata.push( {
+          'ClientName': element.clientName,
+          'Store ID': element.storeId,
+          'Store Name': element.storeName,
+          'Status': element.status,
+        } );
       } );
-      const temp = await Promise.all( promises );
-      const exportResult = temp.flat();
-      await download( exportResult, res );
+      await download( exportdata, res );
       return;
     }
     return res.sendSuccess( { result: result, count: count.length } );