tango-app-api-infra 3.0.79-dev → 3.0.80-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.79-dev",
+    "version": "3.0.80-dev",
     "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": "^1.0.70-test",
+        "tango-api-schema": "^2.0.101",
+        "tango-app-api-middleware": "^1.0.68-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/employeeTraning.controller.js

@@ -48,16 +48,3 @@ export async function activityLog( req, res ) {
     return res.sendError( error, 500 );
   }
 }
-
-
-export async function updateMatStatus( req, res ) {
-  try {
-    let update = await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketDetails.matStatus': req.body.matStatus } );
-    if ( update ) {
-      res.sendSuccess( 'Updated Successfully' );
-    }
-  } catch ( error ) {
-    logger.error( { error: error, function: 'updateMatStatus' } );
-    return res.sendError( error, 500 );
-  }
-}

package/src/controllers/infra.controllers.js

@@ -1444,14 +1444,14 @@ export async function matTable( req, res ) {
       result.forEach( ( element ) => {
         exportdata.push( {
           'ticketId': element.ticketId,
-          'Date': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ),
+          '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.status,
+          'Status': element.installationStatus,
         } );
       } );
       await download( exportdata, res );

package/src/controllers/userInfra.controller.js

@@ -165,7 +165,6 @@ export async function userTicketList( req, res ) {
         issueStatus: '$ticketDetails.issueStatus',
         ticketType: '$ticketDetails.ticketType',
         installationStatus: '$ticketDetails.installationStatus',
-        matStatus: '$ticketDetails.matStatus',
         primaryIssue: {
           $filter: {
             input: '$ticketActivity',
@@ -197,7 +196,6 @@ export async function userTicketList( req, res ) {
         status: 1,
         issueType: 1,
         installationStatus: 1,
-        matStatus: 1,
         infraIssue: '$primaryIssue.reasons.primaryIssue',
       },
     },
@@ -212,7 +210,6 @@ export async function userTicketList( req, res ) {
         issueType: { $first: '$issueType' },
         status: { $first: '$status' },
         installationStatus: { $first: '$installationStatus' },
-        matStatus: { $first: '$matStatus' },
         issueStatus: { $first: '$issueStatus' },
         ticketType: { $first: '$ticketType' },
         infraIssue: { $last: '$infraIssue' },
@@ -237,7 +234,6 @@ export async function userTicketList( req, res ) {
           $or: [
             { issueStatus: req.body.filter },
             { infraIssue: req.body.filter },
-            { issueType: req.body.filter },
           ],
         },
       } );
@@ -246,23 +242,13 @@ export async function userTicketList( req, res ) {
     if ( req.body.export ) {
       const exportdata = [];
       ticketList.forEach( ( element ) => {
-        let data = {
+        exportdata.push( {
           'DATE': element.Date,
           'TICKET ID': element.ticketId,
           'STORE ID': element.storeId,
-          'STORE NAME': element.storeName,
+          'ISSUE': element.issueStatus,
           'STATUS': element.status,
-        };
-        if ( req.body.issueType ==='infra' ) {
-          data = { ...data, ...{ 'ISSUE': element.issueStatus } };
-        }
-        if ( req.body.issueType ==='installation' ) {
-          data = { ...data, ...{ 'ISSUE': element.issueStatus } };
-        }
-        if ( req.body.issueType ==='dataMismatch' ) {
-          data = { ...data, ...{ 'ISSUE TYPE': element.issueType } };
-        }
-        exportdata.push( data );
+        } );
       } );
       await download( exportdata, res );
       return;
@@ -391,18 +377,6 @@ export async function workHistory( req, res ) {
                   { 'issueClosedDate': { $lte: date.end } },
                 ],
 
-              },
-            },
-        );
-      } else if ( req.body.dateFilter === 'issueDate' ) {
-        query.push(
-            {
-              $match: {
-                $and: [
-                  { 'issueDate': { $gte: date.start } },
-                  { 'issueDate': { $lte: date.end } },
-                ],
-
               },
             },
         );
@@ -437,7 +411,6 @@ export async function workHistory( req, res ) {
             storeName: '$basicDetails.storeName',
             clientId: '$basicDetails.clientId',
             clientName: '$basicDetails.clientName',
-            issueType: 1,
             issueDate: { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
             issueClosedDate: { $dateToString: { format: '%Y-%m-%d', date: '$issueClosedDate' } },
             issueIdentifiedDate: { $dateToString: { format: '%Y-%m-%d', date: '$ticketDetails.issueIdentifiedDate' } },
@@ -467,7 +440,6 @@ export async function workHistory( req, res ) {
           $project: {
             storeId: 1,
             storeName: 1,
-            issueType: 1,
             clientId: 1,
             clientName: 1,
             issueDate: 1,
@@ -480,20 +452,13 @@ export async function workHistory( req, res ) {
             infraIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '' ] },
           },
         } );
-    if ( req.body.issueFilter && req.body.issueFilter.length>0&&req.body.issueType!='dataMismatch' ) {
+    if ( req.body.issueFilter && req.body.issueFilter.length>0 ) {
       query.push( {
         $match: {
           infraIssue: { $in: req.body.issueFilter },
         },
       } );
     }
-    if ( req.body.issueFilter && req.body.issueFilter.length>0&&req.body.issueType==='dataMismatch' ) {
-      query.push( {
-        $match: {
-          issueType: { $in: req.body.issueFilter },
-        },
-      } );
-    }
     if ( req.body.searchValue && req.body.searchValue !== '' ) {
       query.push( {
         $match: {
@@ -524,24 +489,19 @@ export async function workHistory( req, res ) {
     if ( req.body.export ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        let data ={
+        exportdata.push( {
           '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,
+          'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate,
           'CLOSED ON': element.issueClosedDate,
+          'ISSUE': element.infraIssue?element.infraIssue:'-',
           'STATUS': element.status,
-        };
-        exportdata.push( data );
+        } );
       } );
-      if ( req.body.issueType==='infra'||req.body.issueType==='installation' ) {
-        data = { ...data, ...{ 'ISSUE': element.infraIssue?element.infraIssue:'-', 'ISSUE IDENTIFIED DATE': element.issueIdentifiedDate } };
-      }
-      if ( req.body.issueType==='dataMismatch' ) {
-        data = { ...data, ...{ 'issueType': element.issueType?element.issueType:'-' } };
-      }
       await download( exportdata, res );
       return;
     }

package/src/routes/employeetrainig.routes.js

@@ -1,4 +1,4 @@
-import { createTicket, updatecomment, activityLog, updateMatStatus } from '../controllers/employeeTraning.controller.js';
+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';
@@ -15,7 +15,3 @@ employeeTrainigRouter.post( '/activityLog', isAllowedSessionHandler, authorize(
   userType: [ 'tango' ], access: [
     { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
 } ), ticketExists, activityLog );
-employeeTrainigRouter.post( '/updateMatStatus', isAllowedSessionHandler, authorize( {
-  userType: [ 'tango' ], access: [
-    { featureName: 'manage', name: 'tickets', permissions: [ 'isView' ] } ],
-} ), ticketExists, updateMatStatus );

package/src/validations/infra.validation.js

@@ -186,7 +186,7 @@ export async function ticketExists( req, res, next ) {
     req.body.ticketActivity = Ticket.ticketActivity;
     req.body.status = Ticket.status;
     req.body.issueDate = Ticket.issueDate;
-    req.body.dataMismatch = Ticket.dataMismatch;
+
 
     next();
   } catch ( error ) {