tango-app-api-infra 3.0.59-dev → 3.0.61-dev

package/index.js

@@ -6,7 +6,9 @@ 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 { dataMismatchRouter } from './src/routes/dataMismatch.routes.js';
 
-export { infraRouter, internalInfraRouter, userInfraRouter, storeInfraRouter, clientInfraRouter, employeeTrainigRouter };
+
+export { infraRouter, internalInfraRouter, userInfraRouter, storeInfraRouter, dataMismatchRouter, clientInfraRouter, employeeTrainigRouter };
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.59-dev",
+    "version": "3.0.61-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -24,8 +24,8 @@
         "html-pdf-node": "^1.0.8",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.93",
-        "tango-app-api-middleware": "^1.0.60-dev",
+        "tango-api-schema": "^2.0.94",
+        "tango-app-api-middleware": "^1.0.58-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 }, status: 'active' } );
+    let storeCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId }, 'edge.firstFile': true, 'status': 'active' } );
     let infraStoreCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -46,13 +46,14 @@ 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 } },
         ],
@@ -148,8 +149,13 @@ 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 } },
+      ],
+    } );
+    let installedCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId },
+      'edge.firstFile': true, 'status': 'active' } );
 
     let yettoInstallCount = await aggregateTangoTicket( [
       {
@@ -250,7 +256,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 );
   }
 }
@@ -261,6 +267,7 @@ 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 } },
@@ -681,6 +688,7 @@ export async function hourWiseDownstores( req, res ) {
     let query = [ {
       $match: {
         clientId: req.body.clientId,
+        status: 'active',
       },
     },
     {
@@ -783,7 +791,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/dataMismatch.controller.js

@@ -0,0 +1,23 @@
+
+import { findOneTangoTicket, createTangoTicket } from '../services/tangoTicket.service.js';
+import { logger } from 'tango-app-api-middleware';
+export async function createTicket( req, res ) {
+  try {
+    let ticketExist = await findOneTangoTicket( { 'issueType': req.body.issueType, 'issueDate': ( new Date( req.body.Date ) ), 'basicDetails.storeId': req.body.storeId } );
+
+    if ( ticketExist ) {
+      return res.sendSuccess( 'MAT Ticket Already Exists for the store' );
+    }
+    req.body.ticketDetails = {};
+    req.body.ticketDetails.dataMismatch = req.body.dataMismatch;
+    req.body.issueDate = new Date( req.body.Date );
+    req.body.ticketId = 'TE_DM_' + new Date().valueOf();
+    let create = await createTangoTicket( req.body );
+    if ( create ) {
+      res.sendSuccess( 'Ticket Created Successfully' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'createTicket Data Mismatch' } );
+    return res.sendError( error, 500 );
+  }
+}

package/src/controllers/employeeTraning.controller.js

@@ -2,7 +2,6 @@
 import { createTangoTicket, findOneTangoTicket, updateOneTangoTicket } from '../services/tangoTicket.service.js';
 import { logger } from 'tango-app-api-middleware';
 export async function createTicket( req, res ) {
-  console.log( req.body );
   try {
     let ticketExist = await findOneTangoTicket( { 'issueType': req.body.issueType, 'basicDetails.storeId': req.body.storeId } );
     if ( ticketExist ) {
@@ -12,7 +11,6 @@ export async function createTicket( req, res ) {
     req.body.issueDate = new Date( req.body.Date );
     req.body.ticketId = 'TE_MAT_' + new Date().valueOf();
     let create = await createTangoTicket( req.body );
-    console.log( create );
     if ( create ) {
       res.sendSuccess( 'Ticket Created Successfully' );
     }
@@ -23,7 +21,6 @@ export async function createTicket( req, res ) {
 }
 
 export async function updatecomment( req, res ) {
-  console.log( req.body );
   try {
     if ( req.body.comment != '' ) {
       req.body.ticketActivity.push( {
@@ -44,7 +41,6 @@ export async function updatecomment( req, res ) {
   }
 }
 export async function activityLog( req, res ) {
-  console.log( req.body );
   try {
     res.sendSuccess( req.body );
   } catch ( error ) {

package/src/controllers/infra.controllers.js

@@ -642,7 +642,8 @@ export async function infraTable( req, res ) {
           { createdAt: { $lte: date.end } },
         ],
       },
-    }, {
+    },
+    {
       $project: {
         storeId: '$basicDetails.storeId',
         clientId: '$basicDetails.clientId',
@@ -739,6 +740,11 @@ export async function infraTable( req, res ) {
         secondaryIssue: { $last: '$secondaryIssue' },
       },
     },
+    {
+      $sort: {
+        ticketId: -1,
+      },
+    },
     );
     if ( req.body.sortColumName && req.body.sortColumName !== '' && req.body.sortBy ) {
       query.push( {
@@ -841,15 +847,11 @@ export async function infraTable( req, res ) {
       await download( exportdata, res );
       return;
     }
-    if ( result.length > 0 ) {
-      res.sendSuccess( {
-        response: response,
-        count: count.length,
-        result: result,
-      } );
-    } else {
-      res.sendError( 'no data', 204 );
-    }
+    res.sendSuccess( {
+      response: response,
+      count: count.length,
+      result: result,
+    } );
   } catch ( error ) {
     logger.error( { error: error, function: 'infraTable' } );
     return res.sendError( error, 500 );
@@ -976,6 +978,11 @@ export async function installationTable( req, res ) {
         secondaryIssue: { $last: '$secondaryIssue' },
       },
     },
+    {
+      $sort: {
+        ticketId: -1,
+      },
+    },
     );
     if ( req.body.sortColumName && req.body.sortColumName !== '' && req.body.sortBy ) {
       query.push( {
@@ -1077,15 +1084,11 @@ export async function installationTable( req, res ) {
       await download( exportdata, res );
       return;
     }
-    if ( result.length > 0 ) {
-      res.sendSuccess( {
-        response: response,
-        count: count.length,
-        result: result,
-      } );
-    } else {
-      res.sendError( 'no data', 204 );
-    }
+    res.sendSuccess( {
+      response: response,
+      count: count.length,
+      result: result,
+    } );
   } catch ( error ) {
     logger.error( { error: error, function: 'installationTable' } );
     return res.sendError( error, 500 );

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 );

package/src/controllers/userInfra.controller.js

@@ -75,6 +75,17 @@ export async function userTakeTicket( req, res ) {
       let query = {
         'status': { $ne: 'closed' },
         'issueType': 'mat',
+        'ticketDetails.addressingUser': { $exists: false },
+      };
+      if ( assignedClients.length > 0 ) {
+        query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+      }
+      userTicket = await findOneTangoTicket( query );
+    } else if ( req.body.issueType == 'dataMismatch' ) {
+      let query = {
+        'status': { $ne: 'closed' },
+        'issueType': { $in: [ 'highcount', 'lowcount' ] },
+        'ticketDetails.addressingUser': { $exists: false },
       };
       if ( assignedClients.length > 0 ) {
         query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
@@ -97,15 +108,26 @@ export async function userTakeTicket( req, res ) {
 export async function userTicketList( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let query = [ {
-      $match: {
-        $and: [
-
-          { issueType: req.body.issueType },
-          { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
-        ],
-      },
-    } ];
+    let query = [];
+    if ( req.body.issueType!='dataMismatch' ) {
+      query.push( {
+        $match: {
+          $and: [
+            { issueType: req.body.issueType },
+            { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+          ],
+        },
+      } );
+    } else {
+      query.push( {
+        $match: {
+          $and: [
+            { issueType: { $in: [ 'highcount', 'lowcount' ] } },
+            { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+          ],
+        },
+      } );
+    }
     if ( req.body.status != 'closed' || req.body.export ) {
       query.push( {
         $match: {
@@ -132,6 +154,7 @@ export async function userTicketList( req, res ) {
     query.push( {
       $project: {
         storeId: '$basicDetails.storeId',
+        storeName: '$basicDetails.storeName',
         Date: { $dateToString: { format: '%d-%m-%Y', date: '$issueDate' } },
         updatedAt: 1,
         ticketId: 1,
@@ -162,6 +185,7 @@ export async function userTicketList( req, res ) {
     {
       $project: {
         storeId: 1,
+        storeName: 1,
         updatedAt: 1,
         Date: 1,
         ticketId: 1,
@@ -177,6 +201,7 @@ export async function userTicketList( req, res ) {
       $group: {
         _id: '$ticketId',
         storeId: { $first: '$storeId' },
+        storeName: { $first: '$storeName' },
         updatedAt: { $first: '$updatedAt' },
         Date: { $first: '$Date' },
         ticketId: { $first: '$ticketId' },
@@ -196,6 +221,7 @@ export async function userTicketList( req, res ) {
           $or: [
             { storeId: { $regex: req.body.searchValue, $options: 'i' } },
             { infraIssue: { $regex: req.body.searchValue, $options: 'i' } },
+            { storeName: { $regex: req.body.searchValue, $options: 'i' } },
           ],
         },
       } );
@@ -211,7 +237,6 @@ export async function userTicketList( req, res ) {
       } );
     }
     let ticketList = await aggregateTangoTicket( query );
-    console.log( ticketList );
     if ( req.body.export ) {
       const exportdata = [];
       ticketList.forEach( ( element ) => {
@@ -304,16 +329,28 @@ export async function basicDetails( req, res ) {
 export async function workHistory( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let query = [ {
-      $match: {
-        $and: [
-          { 'status': 'closed' },
-          { issueType: req.body.issueType },
-          { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
-        ],
-      },
-    } ];
-
+    let query = [ ];
+    if ( req.body.issueType!='dataMismatch' ) {
+      query.push( {
+        $match: {
+          $and: [
+            { 'status': 'closed' },
+            { issueType: req.body.issueType },
+            { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+          ],
+        },
+      } );
+    } else {
+      query.push( {
+        $match: {
+          $and: [
+            { 'status': 'closed' },
+            { issueType: { $in: [ 'highcount', 'lowcount' ] } },
+            { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+          ],
+        },
+      } );
+    }
     if ( req.body.dateFilter && req.body.dateFilter != '' ) {
       if ( req.body.dateFilter === 'issueIdentifiedDate' ) {
         query.push(
@@ -374,6 +411,7 @@ export async function workHistory( req, res ) {
             issueClosedDate: { $dateToString: { format: '%Y-%m-%d', date: '$issueClosedDate' } },
             issueIdentifiedDate: { $dateToString: { format: '%Y-%m-%d', date: '$ticketDetails.issueIdentifiedDate' } },
             ticketId: 1,
+            status: 1,
             issueStatus: '$ticketDetails.issueStatus',
             ticketType: '$ticketDetails.ticketType',
             primaryIssue: {
@@ -456,7 +494,7 @@ export async function workHistory( req, res ) {
           'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate,
           'CLOSED ON': element.issueClosedDate,
           'ISSUE': element.infraIssue?element.infraIssue:'-',
-
+          'STATUS': element.status,
         } );
       } );
       await download( exportdata, res );

package/src/routes/dataMismatch.routes.js

@@ -0,0 +1,10 @@
+import express from 'express';
+import { isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
+import { createTicket } from '../controllers/dataMismatch.controller.js';
+import { validateDetails } from '../validations/infra.validation.js';
+export const dataMismatchRouter = express.Router();
+
+dataMismatchRouter.post( '/createTicket', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView', 'isEdit' ] } ],
+} ), validateDetails, createTicket );

package/src/routes/infra.routes.js

@@ -1,7 +1,7 @@
 
 import express from 'express';
 import { isAllowedSessionHandler, authorize } from 'tango-app-api-middleware';
-import { validateDetails, bulkvalidateDetails, validateTicket, bulkvalidateTicket, ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert } from '../validations/infra.validation.js';
+import { validateDetails, bulkvalidateDetails, validateTicket, bulkvalidateTicket, validateTicketstatus, ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert } from '../validations/infra.validation.js';
 import { createTicket, bulkcreateTicket, updateStatus, createReason, PrimaryReasons, matTable,
   secondaryReason, updateTicketIssue, viewTicket, AlertTicketReply, uploadAttachments,
   updateInstallationTicket, emailUserList, saveInfraEmailConfig, invoice, infraTable, storeFilter, assignTicket, installationTable } from '../controllers/infra.controllers.js';
@@ -29,7 +29,7 @@ infraRouter.post( '/secondaryReason', isAllowedSessionHandler, authorize( {
 infraRouter.post( '/updateTicketIssue', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit' ] } ],
-} ), ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert, updateTicketIssue );
+} ), ticketExists, validateTicketstatus, infraReasonExists, InfrastepstoResolve, InfraAlert, updateTicketIssue );
 infraRouter.post( '/viewTicket', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],

package/src/validations/infra.validation.js

@@ -184,12 +184,47 @@ export async function ticketExists( req, res, next ) {
     req.body.basicDetails = Ticket.basicDetails;
     req.body.ticketDetails = Ticket.ticketDetails;
     req.body.ticketActivity = Ticket.ticketActivity;
+    req.body.status = Ticket.status;
+    req.body.issueDate = Ticket.issueDate;
+
+
     next();
   } catch ( error ) {
     logger.error( { error: error, function: 'ticketExists' } );
     return res.sendError( error, 500 );
   }
 };
+
+export async function validateTicketstatus( req, res, next ) {
+  try {
+    if ( req.body.issueType == 'infra' ) {
+      if ( req.body.secondary.length>0 ) {
+        if ( req.body.status == 'closed' ) {
+          return res.sendSuccess( 'Ticket already closed' );
+        }
+        console.log( req.body.ticketDetails );
+
+        if ( req.body.ticketDetails.ticketType==='firsttimeticket'&&req.body.ticketDetails.issueStatus==='identified' ) {
+          return res.sendSuccess( 'Ticket already Addressed' );
+        }
+      } else {
+        if ( req.body.primary == 'Application Issues' ) {
+          if ( req.body.status == 'closed' ) {
+            return res.sendSuccess( 'Ticket already closed' );
+          }
+          if ( req.body.ticketDetails.ticketType==='firsttimeticket'&&req.body.ticketDetails.issueStatus==='identified' ) {
+            return res.sendSuccess( 'Ticket already Addressed' );
+          }
+        }
+      }
+    }
+    next();
+  } catch ( error ) {
+    logger.error( { error: error, function: 'validateTicket' } );
+    return res.sendError( error, 500 );
+  }
+}
+
 export async function infraReasonExists( req, res, next ) {
   try {
     if ( req.body.primary && req.body.secondary && req.body.secondary.length ) {