tango-app-api-infra 3.0.97-dev → 3.0.99-dev

package/package.json

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

package/src/controllers/clientInfra.controller.js

@@ -10,7 +10,21 @@ 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 }, 'createdAt': { $lte: date.end }, 'edge.firstFile': true, 'status': 'active' } );
+    let storeCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId }, 'createdAt': { $lte: date.end }, 'status': 'active' } );
+    let yettoInstallCount = await aggregateTangoTicket( [
+      {
+        $match: {
+          $and: [
+            { issueType: 'installation' },
+            { 'status': { $ne: 'closed' } },
+            { 'ticketDetails.issueStatus': 'notidentified' },
+            { 'basicDetails.clientId': { $in: req.body.clientId } },
+            { createdAt: { $lte: date.end } },
+          ],
+        },
+      },
+    ] );
+    storeCount = storeCount-yettoInstallCount.length;
     let totalstores = await aggregateStore( [ {
       $match: {
         '$and': [

package/src/controllers/infra.controllers.js

@@ -3,7 +3,7 @@
 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, insertOpenSearchData, download, appConfig, getUTC } from 'tango-app-api-middleware';
+import { logger, fileUpload, signedUrl, chunkArray, sendEmailWithSES, getOpenSearchData, insertOpenSearchData, download, appConfig, getUTC } from 'tango-app-api-middleware';
 import { aggregateUser, updateOneUser } from '../services/user.service.js';
 import { findOneClient, updateoneClient } from '../services/client.service.js';
 import dayjs from 'dayjs';
@@ -1238,17 +1238,16 @@ export async function infraTable( req, res ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         exportdata.push( {
-          'ticketId': element.ticketId,
-          'issueDate': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ),
-          'storeId': element.storeId,
-          'storeName': element.storeName,
-          'clientId': element.clientId,
-          'clientName': element.clientName,
-          'userName': element.userName,
-          'userEmail': element.userEmail,
+          'Ticket ID': element.ticketId,
+          'Created Date': dayjs( element.issueDate ).format( 'DD MMM, YYYY' ),
+          'Brand Name': element.clientName,
+          'Brand ID': element.clientId,
+          'Store Name': element.storeName,
+          'Store ID': element.storeId,
+          'Resloved By': element.userName,
           'Status': element.status,
-          'StatusDetails': element.primaryIssue,
-          'SubIssue': element.secondaryIssue,
+          'Primary Issues': element.primaryIssue,
+          'Secondary Issues': element.secondaryIssue,
           'Comment': element.otherscomment ? element.otherscomment : ( element.commentText?element.commentText:'-' ),
         } );
       } );
@@ -1520,17 +1519,16 @@ export async function installationTable( req, res ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         exportdata.push( {
-          'ticketId': element.ticketId,
-          'issueDate': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ),
-          'storeId': element.storeId,
-          'storeName': element.storeName,
-          'clientId': element.clientId,
-          'clientName': element.clientName,
-          'userName': element.userName,
-          'userEmail': element.userEmail,
-          'Status': element.installationStatus,
-          'StatusDetails': element.primaryIssue,
-          'SubIssue': element.secondaryIssue,
+          'Ticket ID': element.ticketId,
+          'Created Date': dayjs( element.createdAt ).format( 'DD MMM, YYYY' ),
+          'Brand Name': element.clientName,
+          'Brand ID': element.clientId,
+          'Store Name': element.storeName,
+          'Store ID': element.storeId,
+          'Installed By': element.userName,
+          'Deployed Status': element.installationStatus,
+          'Primary Issues': element.primaryIssue=='-'?'Issue not identified':element.primaryIssue,
+          'Secondary Issues': element.secondaryIssue,
         } );
       } );
       await download( exportdata, res );
@@ -1684,14 +1682,13 @@ export async function matTable( req, res ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         exportdata.push( {
-          'ticketId': element.ticketId,
-          'Date': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ),
-          'storeId': element.storeId,
-          'storeName': element.storeName,
-          'clientId': element.clientId,
-          'clientName': element.clientName,
-          'userName': element.userName,
-          'userEmail': element.userEmail,
+          'Ticket ID': element.ticketId,
+          'Created Date': dayjs( element.createdAt ).format( 'DD MMM, YYYY' ),
+          'Brand Name': element.clientName,
+          'Brand ID': element.clientId,
+          'Store Name': element.storeName,
+          'Store ID': element.storeId,
+          'Resloved By': element.userName,
           'Status': element.status,
         } );
       } );
@@ -1749,6 +1746,7 @@ export async function storeFilter( req, res ) {
 export async function dataMismatchTable( req, res ) {
   try {
     const inputData = req.body;
+    let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
     const defaultValue = [
       { name: 'Low Count', count: 0 },
       { name: 'High Count', count: 0 },
@@ -1757,8 +1755,8 @@ export async function dataMismatchTable( req, res ) {
     ];
 
     let countFilter = [
-      { issueDate: { $gte: new Date( inputData.fromDate ) } },
-      { issueDate: { $lte: new Date( inputData.toDate ) } },
+      { createdAt: { $gte: date.start } },
+      { createdAt: { $lte: date.end } },
       {
         issueType: { $in: [ 'highcount', 'lowcount' ] },
       },
@@ -1820,8 +1818,8 @@ export async function dataMismatchTable( req, res ) {
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
     let filter = [
-      { issueDate: { $gte: new Date( inputData.fromDate ) } },
-      { issueDate: { $lte: new Date( inputData.toDate ) } },
+      { createdAt: { $gte: date.start } },
+      { createdAt: { $lte: date.end } },
       { 'basicDetails.clientId': { $in: inputData.clientId } },
       { issueType: { $in: [ 'highcount', 'lowcount' ] } },
     ];
@@ -1833,8 +1831,8 @@ export async function dataMismatchTable( req, res ) {
       },
       {
         $project: {
-          createdAt: { $dateToString: { format: '%d-%m-%Y', date: '$createdAt' } },
-          issueDate: { $dateToString: { format: '%d-%m-%Y', date: '$issueDate' } },
+          createdAt: 1,
+          issueDate: 1,
           ticketId: 1,
           clientName: '$basicDetails.clientName',
           clientId: '$basicDetails.clientId',
@@ -1843,9 +1841,16 @@ export async function dataMismatchTable( req, res ) {
           userId: { $ifNull: [ '$ticketDetails.addressingUser', '$$REMOVE' ] },
           issueType: 1,
           status: 1,
-
+          otherscomment: {
+            $filter: {
+              input: '$ticketActivity',
+              as: 'item',
+              cond: { $eq: [ '$$item.actionType', 'comment' ] },
+            },
+          },
         },
       },
+
       {
         $lookup: {
           from: 'users',
@@ -1875,6 +1880,27 @@ export async function dataMismatchTable( req, res ) {
           preserveNullAndEmptyArrays: true,
         },
       },
+      {
+        $unwind: {
+          path: '$otherscomment', preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $group: {
+          _id: '$ticketId',
+          createdAt: { $first: '$createdAt' },
+          issueDate: { $first: '$issueDate' },
+          ticketId: { $first: '$ticketId' },
+          clientName: { $first: '$clientName' },
+          clientId: { $first: '$clientId' },
+          storeName: { $first: '$storeName' },
+          storeId: { $first: '$storeId' },
+          userInfo: { $first: '$userInfo' },
+          issueType: { $first: '$issueType' },
+          status: { $first: '$status' },
+          otherscomment: { $last: '$otherscomment.comment' },
+        },
+      },
       {
         $project: {
           createdAt: 1,
@@ -1889,6 +1915,7 @@ export async function dataMismatchTable( req, res ) {
           type: { $ifNull: [ { $cond: [ { $eq: [ '$userInfo.userType', 'client' ] }, 'external', { $cond: [ { $eq: [ '$userInfo.userType', 'tango' ] }, 'internal', '' ] } ] }, '' ] },
           issueType: 1,
           status: 1,
+          otherscomment: 1,
         },
       },
 
@@ -1903,7 +1930,7 @@ export async function dataMismatchTable( req, res ) {
 
     if ( inputData?.filterByStores && inputData?.filterByStores?.length > 0 ) {
       filter.push( {
-        'basicDetails.storeId': { $in: inputData.filterByStores },
+        'storeId': { $in: inputData.filterByStores },
       } );
     }
 
@@ -1923,33 +1950,27 @@ export async function dataMismatchTable( req, res ) {
 
     if ( inputData.searchValue && 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' } },
           { 'ticketId': { $regex: req.body.searchValue, $options: 'i' } },
           { 'issueType': { $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,
+          [inputData.sortColumnName]: sortBy,
         },
       } );
     }
 
     const count = await aggregateTangoTicket( query );
-
-
     query.push(
         { $skip: offset },
         { $limit: limit },
@@ -1963,31 +1984,29 @@ export async function dataMismatchTable( req, res ) {
         const list = [];
         for ( let i = 0; i < chunk.length; i++ ) {
           req.user.userType == 'tango' ?
-
             list.push( {
-              'Created Date': chunk[i]?.createdAt,
-              'Issue Date': chunk[i]?.issueDate,
               'Ticket ID': chunk[i]?.ticketId,
-              'Brand ID': chunk[i]?.clientId,
+              'Created Date': dayjs( chunk[i]?.createdAt ).format( 'DD MMM, YYYY' ),
+              'Issue Date': dayjs( chunk[i]?.issueDate ).format( 'DD MMM, YYYY' ),
               'Brand Name': chunk[i]?.clientName,
-              'Store ID': chunk[i]?.storeId,
+              'Brand ID': chunk[i]?.clientId,
               'Store Name': chunk[i]?.storeName,
-              'User Name': chunk[i]?.userName,
-              'User Email': chunk[i]?.email,
+              'Store ID': chunk[i]?.storeId,
+              'Resloved By': chunk[i]?.userName,
               'Issue Type': chunk[i]?.issueType,
-              'Type': chunk[i]?.type,
+              'Query Type ': chunk[i]?.type,
               'Status': chunk[i]?.status,
-
+              'Comment': chunk[i]?.otherscomment,
             } ) :
             list.push( {
+              'Ticket ID': chunk[i]?.ticketId,
               'Created Date': chunk[i]?.createdAt,
               'Issue Date': chunk[i]?.issueDate,
-              'Ticket ID': chunk[i]?.clientName,
-              'Store ID': chunk[i]?.storeId,
               'Store Name': chunk[i]?.storeName,
+              'Store ID': chunk[i]?.storeId,
               'Issue Type': chunk[i]?.issueType,
-              'Type': chunk[i]?.type,
               'Status': chunk[i]?.status,
+              'Comment': chunk[i]?.otherscomment,
             } );
         }
         return list;

package/src/controllers/storeInfra.controlller.js

@@ -1001,6 +1001,8 @@ export async function streamwiseDowntime( req, res ) {
         for ( let stream of streamwiseDowntime ) {
           if ( stream.stream === req.body.stream ) {
             obj.downTime= stream.down_time;
+          } else {
+            obj.downTime= '';
           }
         }
       } else {