tango-app-api-infra 3.1.7 → 3.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.7",
+    "version": "3.1.9",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "html-pdf-node": "^1.0.8",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.93",
+        "tango-api-schema": "^2.0.94",
         "tango-app-api-middleware": "^3.1.7",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/clientInfra.controller.js

@@ -10,7 +10,7 @@ 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 }, status: 'active' } );
+    let storeCount = await countDocumentsStore( { clientId: { $in: req.body.clientId }, 'edge.firstFile': true,status:"active" } );
     let infraStoreCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -148,8 +148,17 @@ export async function infraCard( req, res ) {
 }
 export async function installationCard( req, res ) {
   try {
-    let onboardedCount = await countDocumentsStore( { clientId: { $in: req.body.clientId } } );
-    let installedCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId }, 'edge.firstFile': true } );
+    let onboardedCount = await countDocumentsStore( {
+      '$and': [
+        { 'clientId': { $in: req.body.clientId } },
+        { $or: [
+          { 'edge.firstFile': true },
+          { 'edge.firstFile': false },
+        ] },
+      ],
+    } );
+    let installedCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId },
+     'edge.firstFile': true,status:"active" } );
 
     let yettoInstallCount = await aggregateTangoTicket( [
       {
@@ -250,7 +259,7 @@ export async function installationCard( req, res ) {
       infraIssues: response,
     } );
   } catch ( error ) {
-    logger.error( { error: error, function: 'infraCard' } );
+    logger.error( { error: error, function: 'installationCard' } );
     return res.sendError( error, 500 );
   }
 }
@@ -681,6 +690,7 @@ export async function hourWiseDownstores( req, res ) {
     let query = [ {
       $match: {
         clientId: req.body.clientId,
+        status: 'active',
       },
     },
     {
@@ -783,7 +793,7 @@ function downStoresCheck( data, inputData ) {
           const average = sum / streamwiseDowntime.length;
           obj[obj.startTime + '-' + obj.endTime] = Math.round( average );
         } else {
-          obj[obj.startTime + '-' + obj.endTime] = 0;
+          obj[obj.startTime + '-' + obj.endTime] = '';
         }
 
         timewise.push( obj );

package/src/controllers/internalInfra.controller.js

@@ -527,18 +527,17 @@ export async function infraReportSent( req, res ) {
       exportdata.push( {
         'Client ID': element.basicDetails.clientId,
         'Client Name': element.basicDetails.clientName,
-        'Created Date & Time': dayjs( element.createdAt ).format( 'YYYY-MM-DD HH:mm A' ),
-        'Store ID': element.basicDetails.clientName,
-        'Store Name': element.basicDetails.clientName,
+        'Ticket Created Date & Time': dayjs( element.createdAt ).format( 'YYYY-MM-DD HH:mm A' ),
+        'Store ID': element.basicDetails.storeId,
+        'Store Name': element.basicDetails.storeName,
         'Issue ': element.primaryIssue,
         'Secondary Issue': element.secondaryIssue,
-        'Issue Date & Time': dayjs( element.date ).format( 'YYYY-MM-DD' ),
         'Status ': element.status,
         'Responded By': clientuser && clientuser.userName ? clientuser.userName : '-',
         'Resolved By': tangouser && tangouser.userName ? tangouser.userName : '-',
-        'Closed Date & Time': element.issueClosedDate ? dayjs( element.issueClosedDate ).format( 'YYYY-MM-DD HH:mm A' ) : '-',
+        'Ticket Closed Date & Time': element.issueClosedDate ? dayjs( element.issueClosedDate ).format( 'YYYY-MM-DD HH:mm A' ) : '-',
         'Latest Comment': '',
-        'Activity Log': '',
+        'Activity Log': `${appConfig.url.domain+'/manage/stores/infra-ticket?storeId='+element.basicDetails.storeId}`,
       } );
     }
 
@@ -611,7 +610,6 @@ export async function infraReportSent( req, res ) {
       const result = await sendEmailWithSES( req.body.email, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
       res.sendSuccess( result );
     }
-    res.sendSuccess( result );
   } catch ( error ) {
     logger.error( { error: error, function: 'infraReportSent' } );
     res.sendError( error, 500 );