tango-app-api-infra 3.1.10 → 3.1.12

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.1.10",
+    "version": "3.1.12",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/clientInfra.controller.js

@@ -16,6 +16,7 @@ export async function infraCard( req, res ) {
         $match: {
           $and: [
             { issueType: 'infra' },
+            { status: { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
             { createdAt: { $gte: date.start } },
             { createdAt: { $lte: date.end } },
@@ -50,6 +51,7 @@ export async function infraCard( req, res ) {
       $match: {
         $and: [
           { issueType: 'infra' },
+          { status: { $ne: 'closed' } },
           { 'ticketDetails.issueStatus': 'identified' },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
           { createdAt: { $gte: date.start } },
@@ -154,7 +156,8 @@ export async function installationCard( req, res ) {
     } );
     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 yettoInstallCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -248,6 +251,7 @@ export async function installationCard( req, res ) {
     }
     res.sendSuccess( {
       onboardedStoresCount: onboardedCount,
+      inactiveStoresCount: deactiveCount,
       installedStoresCount: installedCount,
       yettoInstallCount: yettoInstallCount.length,
       installFailedCount: installFailedCount.length,
@@ -265,6 +269,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 } },

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/infra.controllers.js

@@ -125,6 +125,7 @@ export async function bulkcreateTicket( req, res ) {
 
 export async function updateStatus( req, res ) {
   try {
+    console.log( req.user.userType );
     if ( req.user.userType == 'tango' ) {
       if ( req.body.status == 'inprogress' ) {
         req.body.ticketActivity.push( {
@@ -133,8 +134,10 @@ export async function updateStatus( req, res ) {
           actionBy: 'Tango',
           IdentifiedBy: req.user.userName,
         } );
+        req.body.status ='inprogress';
       }
       req.body.ticketDetails.addressingUser = req.user._id;
+      console.log( req.body );
       let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, req.body );
       if ( updateTicket ) {
         res.sendSuccess( 'Ticket Updated Successfully' );
@@ -147,6 +150,7 @@ export async function updateStatus( req, res ) {
           actionBy: 'User',
           IdentifiedBy: req.user.userName,
         } );
+        req.body.status ='inprogress';
       }
       req.body.ticketDetails.addressingClient = req.user._id;
       let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, req.body );
@@ -725,7 +729,7 @@ export async function infraTable( req, res ) {
     },
     {
       $group: {
-        _id: '$storeId',
+        _id: '$ticketId',
         storeId: { $first: '$storeId' },
         clientId: { $first: '$clientId' },
         ticketId: { $first: '$ticketId' },
@@ -847,15 +851,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 );
@@ -1088,15 +1088,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/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' } },
           ],
         },
       } );
@@ -303,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(
@@ -373,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: {
@@ -455,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/validations/infra.validation.js

@@ -185,6 +185,8 @@ export async function ticketExists( req, res, next ) {
     req.body.ticketDetails = Ticket.ticketDetails;
     req.body.ticketActivity = Ticket.ticketActivity;
     req.body.status = Ticket.status;
+    req.body.issueDate = Ticket.issueDate;
+
 
     next();
   } catch ( error ) {