tango-app-api-infra 3.0.89-dev → 3.0.90-dev

package/package.json

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

package/src/controllers/clientInfra.controller.js

@@ -134,10 +134,15 @@ export async function infraCard( req, res ) {
         count: 0,
       } ) );
     }
+
     response.unshift( {
-      name: 'All Issues',
+      name: 'Identified Issues',
       count: infraStoreCount.length > 0 ? infraStoreCount[0].identifiedcount : 0,
     } );
+    response.unshift( {
+      name: 'All Issues',
+      count: infraStoreCount.length > 0 ? infraStoreCount[0].infraCount : 0,
+    } );
     response.push( {
       name: 'Issues Not Identified',
       count: infraStoreCount.length > 0 ? infraStoreCount[0].infraCount - infraStoreCount[0].identifiedcount : 0,
@@ -279,9 +284,12 @@ 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 = [ 'identified' ];
     if ( req.body.filterIssue == 'Issues Not Identified' ) {
-      issueStatus = 'notidentified';
+      issueStatus = [ 'notidentified' ];
+    };
+    if ( req.body.filterIssue == 'All Issues' ) {
+      issueStatus = [ 'notidentified', 'identified' ];
     };
     let query = [ {
       $match: {
@@ -289,7 +297,7 @@ export async function infraIssuesTable( req, res ) {
           { issueType: 'infra' },
           { status: { $ne: 'closed' } },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
-          { 'ticketDetails.issueStatus': issueStatus },
+          { 'ticketDetails.issueStatus': { $in: issueStatus } },
           // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
@@ -361,7 +369,7 @@ export async function infraIssuesTable( req, res ) {
       },
     },
     ];
-    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'All Issues' && req.body.filterIssue != 'Issues Not Identified' ) {
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'Identified Issues' && req.body.filterIssue != 'Issues Not Identified'&&req.body.filterIssue != 'All Issues' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.filterIssue,
@@ -393,6 +401,7 @@ export async function infraIssuesTable( req, res ) {
       } );
     }
     let count = await aggregateTangoTicket( query );
+    console.log( count.length );
     if ( req.body.limit && req.body.offset && !req.body.export ) {
       query.push(
           { $skip: ( req.body.offset - 1 ) * req.body.limit },
@@ -407,9 +416,9 @@ export async function infraIssuesTable( req, res ) {
           'CREATED AT': element.createdAt,
           'STORE ID': element.storeId,
           'STORE NAME': element.storeName,
+          'PRIMARY ISSUE': element.primaryIssue,
           'SUB ISSUE': element.secondaryIssue,
-          'ISSUE IDENTIFIED ON': element.issueIdentifiedDate,
-          'ISSUE CLOSED ON': element.issueClosedDate,
+          'ISSUE IDENTIFIED ON': dayjs( element.issueIdentifiedDate ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm A' ),
           'STATUS': element.status,
         } );
       } );
@@ -709,12 +718,20 @@ export async function hourWiseDownstores( req, res ) {
   try {
     let inputData = req.body;
     inputData.Date = dayjs( req.body.toDate ).format( 'YYYY-MM-DD' );
-
+    let issueStatus = [ 'identified' ];
+    if ( req.body.filterIssue == 'Issues Not Identified' ) {
+      issueStatus = [ 'notidentified' ];
+    };
+    if ( req.body.filterIssue == 'All Issues' ) {
+      issueStatus = [ 'notidentified', 'identified' ];
+    };
     let query = [ {
       $match: {
         $and: [
           { 'basicDetails.clientId': req.body.clientId },
           { 'status': { $ne: 'closed' } },
+          { issueType: 'infra' },
+          { 'ticketDetails.issueStatus': { $in: issueStatus } },
           { 'issueDate': { $lte: new Date( req.body.toDate ) } },
         ],
       },
@@ -773,7 +790,7 @@ export async function hourWiseDownstores( req, res ) {
         $sort: { [req.body.sortColumName]: req.body.sortBy },
       } );
     }
-    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'All Issues' && req.body.filterIssue != 'Issues Not Identified' ) {
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'Identified Issues' && req.body.filterIssue != 'Issues Not Identified'&&req.body.filterIssue != 'All Issues' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.filterIssue,

package/src/controllers/infra.controllers.js

@@ -3,9 +3,9 @@
 import { aggregateTangoTicket, createTangoTicket, findOneTangoTicket, updateOneTangoTicket, updateManyTangoTicket, findTangoTicket } from '../services/tangoTicket.service.js';
 import { createinfraReason, findinfraReason } from '../services/infraReason.service.js';
 import { updateOneStore, findStore } from '../services/store.service.js';
-import { logger, fileUpload, signedUrl, sendEmailWithSES, getOpenSearchData, download, appConfig, getUTC } from 'tango-app-api-middleware';
+import { logger, fileUpload, signedUrl, sendEmailWithSES, getOpenSearchData, insertOpenSearchData, download, appConfig, getUTC } from 'tango-app-api-middleware';
 import { aggregateUser, updateOneUser } from '../services/user.service.js';
-import { updateoneClient } from '../services/client.service.js';
+import { findOneClient, updateoneClient } from '../services/client.service.js';
 import dayjs from 'dayjs';
 import { readFileSync } from 'fs';
 import { join } from 'path';
@@ -518,7 +518,7 @@ export async function emailUserList( req, res ) {
 export async function saveInfraEmailConfig( req, res ) {
   try {
     let inputData = req.body;
-
+    let client = await findOneClient( { clientId: inputData.clientId } );
     await updateoneClient( { clientId: inputData.clientId }, {
       'ticketConfigs.infraReport': {
         start: inputData.start,
@@ -535,6 +535,29 @@ export async function saveInfraEmailConfig( req, res ) {
         } );
       }
     }
+
+    const logObj = {
+      clientId: inputData.clientId,
+      userName: req.user?.userName,
+      email: req.user?.email,
+      date: new Date(),
+      logType: 'configuration',
+      logSubType: 'emailConfig',
+      eventType: 'update',
+      showTo: [ 'tango' ],
+      changes: [ `Email Config` ],
+      previous: client.ticketConfigs.infraReport,
+      current: {
+        infraReport: {
+          start: inputData.start,
+          end: inputData.end,
+        },
+      },
+    };
+
+    await insertOpenSearchData( appConfig.opensearch.activityLog, logObj );
+
+
     res.sendSuccess( 'Updated Successfully' );
   } catch ( error ) {
     logger.error( { error: error, function: 'emailUserList' } );