tango-app-api-infra 3.1.13 → 3.1.15

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.13",
+    "version": "3.1.15",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -26,8 +26,8 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.103",
-        "tango-app-api-middleware": "^3.1.10",
+        "tango-api-schema": "^2.0.104",
+        "tango-app-api-middleware": "^3.1.11",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/clientInfra.controller.js

@@ -1,16 +1,16 @@
 
-import { aggregateStore, countDocumentsStore } from '../services/store.service.js';
+import { countDocumentsStore } from '../services/store.service.js';
 import { logger, download, getUTC } from 'tango-app-api-middleware';
 import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findinfraReason } from '../services/infraReason.service.js';
-import { aggregateClient } from '../services/client.service.js';
+import { aggregateClient, findClient } from '../services/client.service.js';
 import dayjs from 'dayjs';
 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 }, 'createdAt': { $lte: date.end }, 'edge.firstFile': true, 'status': 'active' } );
     let infraStoreCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -18,7 +18,7 @@ export async function infraCard( req, res ) {
             { issueType: 'infra' },
             { status: { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: date.start } },
+            // { createdAt: { $gte: date.start } },
             { createdAt: { $lte: date.end } },
           ],
         },
@@ -54,7 +54,7 @@ export async function infraCard( req, res ) {
           { status: { $ne: 'closed' } },
           { 'ticketDetails.issueStatus': 'identified' },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
-          { createdAt: { $gte: date.start } },
+          // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
       },
@@ -134,6 +134,19 @@ export async function infraCard( req, res ) {
         count: 0,
       } ) );
     }
+
+    response.unshift( {
+      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,
+    } );
     res.sendSuccess( {
       total: storeCount,
       liveStoreCount: infraStoreCount.length > 0 ? storeCount - infraStoreCount[0].infraCount : 0,
@@ -149,15 +162,21 @@ export async function infraCard( req, res ) {
 }
 export async function installationCard( req, res ) {
   try {
+    let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
     let onboardedCount = await countDocumentsStore( {
       '$and': [
         { 'clientId': { $in: req.body.clientId } },
+        { 'createdAt': { $lte: date.end } },
       ],
     } );
-    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 installedCount = await countDocumentsStore( {
+      'clientId': { $in: req.body.clientId },
+      'edge.firstFile': true, 'status': 'active', 'createdAt': { $lte: date.end },
+    } );
+    let deactiveCount = await countDocumentsStore( {
+      'clientId': { $in: req.body.clientId },
+      'status': 'deactive',
+    } );
     let yettoInstallCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -166,7 +185,7 @@ export async function installationCard( req, res ) {
             { 'status': { $ne: 'closed' } },
             { 'ticketDetails.issueStatus': 'notidentified' },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: new Date( req.body.fromDate ) } },
+            { createdAt: { $lte: new Date( req.body.toDate ) } },
           ],
         },
       },
@@ -178,7 +197,7 @@ export async function installationCard( req, res ) {
           { 'status': { $ne: 'closed' } },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
           { 'ticketDetails.issueStatus': 'identified' },
-          { createdAt: { $gte: new Date( req.body.fromDate ) } },
+          { createdAt: { $lte: new Date( req.body.toDate ) } },
         ],
       },
     },
@@ -265,14 +284,21 @@ 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' ];
+    if ( req.body.filterIssue == 'Issues Not Identified' ) {
+      issueStatus = [ 'notidentified' ];
+    };
+    if ( req.body.filterIssue == 'All Issues' ) {
+      issueStatus = [ 'notidentified', 'identified' ];
+    };
     let query = [ {
       $match: {
         $and: [
           { issueType: 'infra' },
           { status: { $ne: 'closed' } },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
-          { 'ticketDetails.issueStatus': 'identified' },
-          { createdAt: { $gte: date.start } },
+          { 'ticketDetails.issueStatus': { $in: issueStatus } },
+          // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
       },
@@ -343,7 +369,7 @@ export async function infraIssuesTable( req, res ) {
       },
     },
     ];
-    if ( req.body.filterIssue && req.body.filterIssue != '' ) {
+    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,
@@ -375,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 },
@@ -389,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,
         } );
       } );
@@ -418,9 +445,10 @@ export async function InstallationIssuesTable( req, res ) {
         $match: {
           $and: [
             { issueType: 'installation' },
+            { 'status': { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: new Date( req.body.fromDate ) } },
-            // { createdAt: { $lte: new Date( req.body.toDate ) } },
+            // { createdAt: { $gte: new Date( req.body.fromDate ) } },
+            { createdAt: { $lte: new Date( req.body.toDate ) } },
           ],
         },
       },
@@ -537,11 +565,15 @@ export async function InstallationIssuesTable( req, res ) {
 export async function hourWiseDownClients( req, res ) {
   try {
     let inputData = req.body;
-
+    let clientList = await findClient( { clientId: { $in: req.body.clientId }, status: 'active' } );
+    let activeClient = [];
+    for ( let client of clientList ) {
+      activeClient.push( client.clientId );
+    }
     let query = [
       {
         $match: {
-          clientId: { $in: req.body.clientId },
+          clientId: { $in: activeClient },
         },
       },
       {
@@ -685,22 +717,63 @@ function generateTimeSlots( startHour, endHour, interval, time ) {
 export async function hourWiseDownstores( req, res ) {
   try {
     let inputData = req.body;
-    inputData.Date = dayjs().format( 'YYYY-MM-DD' );
-
+    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: {
-        clientId: req.body.clientId,
-        status: 'active',
+        $and: [
+          { 'basicDetails.clientId': req.body.clientId },
+          { 'status': { $ne: 'closed' } },
+          { issueType: 'infra' },
+          { 'ticketDetails.issueStatus': { $in: issueStatus } },
+          { 'issueDate': { $lte: new Date( req.body.toDate ) } },
+        ],
+      },
+    },
+    {
+      $project: {
+        storeId: '$basicDetails.storeId',
+        storeName: '$basicDetails.storeName',
+        primaryIssue: {
+          $filter: {
+            input: '$ticketActivity',
+            as: 'item',
+            cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
+          },
+        },
+      },
+    },
+    {
+      $unwind: {
+        path: '$primaryIssue', preserveNullAndEmptyArrays: true,
+      },
+    },
+    {
+      $unwind: {
+        path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
       },
     },
     {
       $project: {
         storeId: 1,
         storeName: 1,
-        storeProfile: 1,
+        primaryIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', 'NotIdentified' ] },
+      },
+    },
+    {
+      $group: {
+        _id: '$storeId',
+        storeId: { $first: '$storeId' },
+        storeName: { $first: '$storeName' },
+        primaryIssue: { $last: '$primaryIssue' },
       },
     },
-
     ];
     if ( req.body.searchValue && req.body.searchValue !== '' ) {
       query.push( {
@@ -717,14 +790,21 @@ export async function hourWiseDownstores( req, res ) {
         $sort: { [req.body.sortColumName]: req.body.sortBy },
       } );
     }
-    let count = await aggregateStore( query );
+    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,
+        },
+      } );
+    }
+    let count = await aggregateTangoTicket( query );
     if ( req.body.limit && req.body.offset && !req.body.export ) {
       query.push(
           { $skip: ( req.body.offset - 1 ) * req.body.limit },
           { $limit: Number( req.body.limit ) },
       );
     }
-    let storeslist = await aggregateStore( query );
+    let storeslist = await aggregateTangoTicket( query );
     if ( storeslist.length == 0 ) {
       return res.sendError( 'no data', 204 );
     }
@@ -733,6 +813,7 @@ export async function hourWiseDownstores( req, res ) {
     for ( const store of storeslist ) {
       data.storeId = store.storeId;
       data.storeName = store.storeName;
+      data.primaryIssue = store.primaryIssue;
       let storedata = await downStoresCheck( data, inputData );
       result.push( storedata[0] );
     }
@@ -801,7 +882,7 @@ function downStoresCheck( data, inputData ) {
       const mergedData = {
         storeName: data.storeName,
         storeId: data.storeId,
-
+        PrimaryIssue: data.primaryIssue,
       };
       timewise.forEach( ( obj ) => {
         for ( const key in obj ) {

package/src/controllers/employeeTraning.controller.js

@@ -5,7 +5,7 @@ export async function createTicket( req, res ) {
   try {
     let ticketExist = await findOneTangoTicket( { 'issueType': req.body.issueType, 'basicDetails.storeId': req.body.storeId } );
     if ( ticketExist ) {
-      return res.sendSuccess( 'MAT Ticket Already Exists for the store' );
+      return res.status( 409 ).send( 'DataMismatch Ticket Already Exists for the store' );
     }
 
     req.body.issueDate = new Date( req.body.Date );