tango-app-api-infra 3.1.6 → 3.1.8

package/index.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.6",
+    "version": "3.1.8",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "html-pdf-node": "^1.0.8",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.90",
+        "tango-api-schema": "^2.0.92",
         "tango-app-api-middleware": "^3.1.7",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/employeeTraning.controller.js

@@ -0,0 +1,54 @@
+
+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 ) {
+      return res.sendSuccess( 'MAT Ticket Already Exists for the store' );
+    }
+
+    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' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'createTicket mat' } );
+    return res.sendError( error, 500 );
+  }
+}
+
+export async function updatecomment( req, res ) {
+  console.log( req.body );
+  try {
+    if ( req.body.comment != '' ) {
+      req.body.ticketActivity.push( {
+        actionType: 'comment',
+        actionBy: 'Tango',
+        timeStamp: new Date(),
+        IdentifiedBy: req.user.userName,
+        comment: req.body.comment,
+      } );
+    }
+    let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, { ticketActivity: req.body.ticketActivity } );
+    if ( updateTicket ) {
+      res.sendSuccess( 'Ticket Updated  Successfully' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'updatecomment mat' } );
+    return res.sendError( error, 500 );
+  }
+}
+export async function activityLog( req, res ) {
+  console.log( req.body );
+  try {
+    res.sendSuccess( req.body );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'activityLog mat' } );
+    return res.sendError( error, 500 );
+  }
+}

package/src/controllers/infra.controllers.js

@@ -1091,6 +1091,171 @@ export async function installationTable( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+export async function matTable( req, res ) {
+  try {
+    let query = [];
+    let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
+    if ( req.body.clientId && req.body.clientId.length > 0 ) {
+      query.push( {
+        $match: {
+          'basicDetails.clientId': { $in: req.body.clientId },
+        },
+      } );
+    }
+
+    query.push( {
+      $match: {
+        $and: [
+          { issueType: 'mat' },
+          { createdAt: { $gte: date.start } },
+          { createdAt: { $lte: date.end } },
+        ],
+      },
+    },
+    {
+      $project: {
+        storeId: '$basicDetails.storeId',
+        clientId: '$basicDetails.clientId',
+        ticketId: 1,
+        storeName: '$basicDetails.storeName',
+        clientName: '$basicDetails.clientName',
+        status: 1,
+        createdAt: 1,
+        addressingUser: '$ticketDetails.addressingUser',
+        issueDate: 1,
+      },
+    },
+
+    {
+      '$lookup': {
+        'from': 'users',
+        'let': { 'userId': '$addressingUser' },
+        'pipeline': [
+          {
+            '$match': {
+              '$expr': {
+                '$eq': [ '$_id', '$$userId' ],
+              },
+            },
+          },
+          {
+            '$project': {
+              'userName': 1,
+              'email': 1,
+              'role': 1,
+            },
+          },
+        ],
+        'as': 'user',
+      },
+    },
+
+    {
+      $unwind: {
+        path: '$user',
+        preserveNullAndEmptyArrays: true,
+      },
+    },
+    {
+      $group: {
+        _id: '$ticketId',
+        storeId: { $first: '$storeId' },
+        clientId: { $first: '$clientId' },
+        ticketId: { $first: '$ticketId' },
+        storeName: { $first: '$storeName' },
+        userName: { $first: { $ifNull: [ '$user.userName', '-' ] } },
+        userEmail: { $first: { $ifNull: [ '$user.email', '-' ] } },
+        clientName: { $first: '$clientName' },
+        createdAt: { $first: '$createdAt' },
+        issueDate: { $last: '$issueDate' },
+        status: { $last: '$status' },
+      },
+    },
+    );
+    if ( req.body.sortColumName && req.body.sortColumName !== '' && req.body.sortBy ) {
+      query.push( {
+        $sort: { [req.body.sortColumName]: req.body.sortBy },
+      } );
+    }
+    if ( req.body.storeIdFilter && req.body.storeIdFilter.length > 0 ) {
+      query.push( {
+        $match: {
+          storeId: { $in: req.body.storeIdFilter },
+        },
+      } );
+    }
+    if ( req.body.statusFilter && req.body.statusFilter.length > 0 ) {
+      query.push( {
+        $match: {
+          status: { $in: req.body.statusFilter },
+        },
+      } );
+    }
+    if ( req.body.userFilter && req.body.userFilter.length > 0 ) {
+      query.push( {
+        $match: {
+          userEmail: { $in: req.body.userFilter },
+        },
+      } );
+    }
+
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'total' ) {
+      query.push( {
+        $match: {
+          primaryIssue: req.body.filterIssue,
+        },
+      } );
+    }
+    if ( req.body.searchValue && req.body.searchValue != '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { storeId: { $regex: req.body.searchValue, $options: 'i' } },
+            { storeName: { $regex: req.body.searchValue, $options: 'i' } },
+          ],
+        },
+      } );
+    }
+    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 result = await aggregateTangoTicket( query );
+
+    if ( req.body.export && result.length > 0 ) {
+      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,
+        } );
+      } );
+      await download( exportdata, res );
+      return;
+    }
+    if ( result.length > 0 ) {
+      res.sendSuccess( {
+        count: count.length,
+        result: result,
+      } );
+    } else {
+      res.sendError( 'no data', 204 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'installationTable' } );
+    return res.sendError( error, 500 );
+  }
+}
 export async function assignTicket( req, res ) {
   try {
     let tickets = await updateManyTangoTicket( { ticketId: { $in: req.body.tickets } }, { 'ticketDetails.assigntoUser': true, 'ticketDetails.addressingUser': req.body.user } );

package/src/controllers/internalInfra.controller.js

@@ -123,7 +123,7 @@ export async function downStoresList( req, res ) {
 }
 export async function openTicketList( req, res ) {
   try {
-    let openTicketList = await findTangoTicket( { status: { $ne: 'closed' } }, { ticketId: 1, basicDetails: 1, createdAt: 1, updateAt: 1, ticketDetails: 1 } );
+    let openTicketList = await findTangoTicket( { 'issueType': 'infra', 'status': { $ne: 'closed' } }, { issueType: 1, ticketId: 1, basicDetails: 1, createdAt: 1, updateAt: 1, ticketDetails: 1 } );
     if ( openTicketList.length ) {
       res.sendSuccess( {
         count: openTicketList.length,

package/src/controllers/userInfra.controller.js

@@ -71,6 +71,15 @@ export async function userTakeTicket( req, res ) {
         }
         userTicket = await findOneTangoTicket( query );
       }
+    } else if ( req.body.issueType == 'mat' ) {
+      let query = {
+        'status': { $ne: 'closed' },
+        'issueType': 'mat',
+      };
+      if ( assignedClients.length > 0 ) {
+        query =( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
+      }
+      userTicket = await findOneTangoTicket( query );
     }
     if ( userTicket ) {
       let assignTicket = await updateOneTangoTicket( { ticketId: userTicket.ticketId }, { 'ticketDetails.addressingUser': req.body.userId } );
@@ -202,6 +211,7 @@ export async function userTicketList( req, res ) {
       } );
     }
     let ticketList = await aggregateTangoTicket( query );
+    console.log( ticketList );
     if ( req.body.export ) {
       const exportdata = [];
       ticketList.forEach( ( element ) => {
@@ -437,16 +447,16 @@ export async function workHistory( req, res ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         exportdata.push( {
-          'CREATED ON': element.createdAt,
+          'CREATED ON': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ),
           'TICKET ID': element.ticketId,
           'STORE ID': element.storeId,
           'STORE NAME': element.storeName,
           'CLIENT ID': element.clientId,
           'CLIENT NAME': element.clientName,
-          'CREATED STATUS': element.status,
           'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate,
           'CLOSED ON': element.issueClosedDate,
-          'STATUS': element.status,
+          'ISSUE': element.infraIssue?element.infraIssue:'-',
+
         } );
       } );
       await download( exportdata, res );
@@ -591,7 +601,7 @@ export async function storeInfraList( req, res ) {
       if ( installationcheck ) {
         store.ticketId = installationcheck.ticketId;
         store.status = installationcheck.ticketDetails.installationStatus;
-        if ( store.status === 'onboareded' ) {
+        if ( store.status === 'onboarded' ) {
           store.statusDetail = 'Ready to pair';
         }
         if ( store.status === 'paired' ) {

package/src/routes/employeetrainig.routes.js

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

package/src/routes/infra.routes.js

@@ -2,7 +2,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 { createTicket, bulkcreateTicket, updateStatus, createReason, PrimaryReasons,
+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';
 
@@ -63,6 +63,10 @@ infraRouter.post( '/installationTable', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), installationTable );
+infraRouter.post( '/matTable', isAllowedSessionHandler, authorize( {
+  userType: [ 'client', 'tango' ], access: [
+    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
+} ), matTable );
 infraRouter.post( '/assignTicket', isAllowedSessionHandler, authorize( {
   userType: [ 'client', 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isEdit', 'isView' ] } ],