tango-app-api-infra 3.0.64-dev → 3.0.66-dev

package/index.js

@@ -5,10 +5,7 @@ import { internalInfraRouter } from './src/routes/internalInfra.routes.js';
 import { userInfraRouter } from './src/routes/userInfra.routes.js';
 import { storeInfraRouter } from './src/routes/storeInfra.routes.js';
 import { clientInfraRouter } from './src/routes/clientInfra.routes.js';
-import { employeeTrainigRouter } from './src/routes/employeetrainig.routes.js';
-import { dataMismatchTicketRouter } from './src/routes/dataMismatch.routes.js';
 
-
-export { infraRouter, internalInfraRouter, userInfraRouter, storeInfraRouter, dataMismatchTicketRouter, clientInfraRouter, employeeTrainigRouter };
+export { infraRouter, internalInfraRouter, userInfraRouter, storeInfraRouter, clientInfraRouter };
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.64-dev",
+    "version": "3.0.66-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -22,10 +22,12 @@
         "express-fileupload": "^1.5.0",
         "handlebars": "^4.7.8",
         "html-pdf-node": "^1.0.8",
+        "joi-to-swagger": "^6.2.0",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.94",
-        "tango-app-api-middleware": "^1.0.63-dev",
+        "swagger-ui-express": "^5.0.0",
+        "tango-api-schema": "^2.0.93",
+        "tango-app-api-middleware": "^1.0.61-dev",
         "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 }, 'edge.firstFile': true, 'status': 'active' } );
+    let storeCount = await countDocumentsStore( { clientId: { $in: req.body.clientId }, status: 'active' } );
     let infraStoreCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -46,14 +46,13 @@ export async function infraCard( req, res ) {
         },
       },
     ] );
-
     let query = [ {
       $match: {
         $and: [
           { issueType: 'infra' },
-          { status: { $ne: 'closed' } },
           { 'ticketDetails.issueStatus': 'identified' },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
+          { 'ticketDetails.issueStatus': 'identified' },
           { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
@@ -149,15 +148,9 @@ export async function infraCard( req, res ) {
 }
 export async function installationCard( req, res ) {
   try {
-    let onboardedCount = await countDocumentsStore( {
-      '$and': [
-        { 'clientId': { $in: req.body.clientId } },
-      ],
-    } );
-    let installedCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId },
-      'edge.firstFile': true, 'status': 'active' } );
-    let deactiveCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId },
-      'status': 'deactive' } );
+    let onboardedCount = await countDocumentsStore( { clientId: { $in: req.body.clientId } } );
+    let installedCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId }, 'edge.deployed': true } );
+
     let yettoInstallCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -214,19 +207,9 @@ export async function installationCard( req, res ) {
         issueIdentifiedBy: 1,
         primaryIssue: '$primaryIssue.reasons.primaryIssue',
       },
-    }, {
-      $group: {
-        _id: '$ticketId',
-        ticketId: { $first: '$ticketId' },
-        issueStatus: { $last: '$issueStatus' },
-        ticketType: { $last: '$ticketType' },
-        issueIdentifiedBy: { $last: '$issueIdentifiedBy' },
-        primaryIssue: { $last: '$primaryIssue' },
-      },
     },
     ];
     let installFailedCount = await aggregateTangoTicket( query );
-
     let issueList = await findinfraReason( { parentId: { '$exists': false } } );
     const categoryCounts = {};
     let response;
@@ -251,14 +234,13 @@ export async function installationCard( req, res ) {
     }
     res.sendSuccess( {
       onboardedStoresCount: onboardedCount,
-      inactiveStoresCount: deactiveCount,
       installedStoresCount: installedCount,
       yettoInstallCount: yettoInstallCount.length,
       installFailedCount: installFailedCount.length,
       infraIssues: response,
     } );
   } catch ( error ) {
-    logger.error( { error: error, function: 'installationCard' } );
+    logger.error( { error: error, function: 'infraCard' } );
     return res.sendError( error, 500 );
   }
 }
@@ -269,7 +251,6 @@ export async function infraIssuesTable( req, res ) {
       $match: {
         $and: [
           { issueType: 'infra' },
-          { status: { $ne: 'closed' } },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
           { 'ticketDetails.issueStatus': 'identified' },
           { createdAt: { $gte: date.start } },
@@ -462,18 +443,6 @@ export async function InstallationIssuesTable( req, res ) {
           primaryIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '-' ] },
         },
       },
-      {
-        $group: {
-          _id: '$storeId',
-          createdAt: { $first: '$createdAt' },
-          clientName: { $first: '$clientName' },
-          storeId: { $first: '$storeId' },
-          clientId: { $first: '$clientId' },
-          storeName: { $first: '$storeName' },
-          status: { $last: '$status' },
-          primaryIssue: { $last: '$primaryIssue' },
-        },
-      },
     ];
     if ( req.body.searchValue && req.body.searchValue !== '' ) {
       query.push( {
@@ -690,7 +659,6 @@ export async function hourWiseDownstores( req, res ) {
     let query = [ {
       $match: {
         clientId: req.body.clientId,
-        status: 'active',
       },
     },
     {
@@ -793,7 +761,7 @@ function downStoresCheck( data, inputData ) {
           const average = sum / streamwiseDowntime.length;
           obj[obj.startTime + '-' + obj.endTime] = Math.round( average );
         } else {
-          obj[obj.startTime + '-' + obj.endTime] = '';
+          obj[obj.startTime + '-' + obj.endTime] = 0;
         }
 
         timewise.push( obj );