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

package/package.json

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

package/src/controllers/employeeTraning.controller.js

@@ -48,3 +48,16 @@ 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,
-          'issueDate': dayjs( element.issueDate ).format( 'DD-MM-YYYY' ),
+          'Date': 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,
+          'Status': element.status,
         } );
       } );
       await download( exportdata, res );

package/src/controllers/userInfra.controller.js

@@ -165,6 +165,7 @@ export async function userTicketList( req, res ) {
         issueStatus: '$ticketDetails.issueStatus',
         ticketType: '$ticketDetails.ticketType',
         installationStatus: '$ticketDetails.installationStatus',
+        matStatus: '$ticketDetails.matStatus',
         primaryIssue: {
           $filter: {
             input: '$ticketActivity',
@@ -196,6 +197,7 @@ export async function userTicketList( req, res ) {
         status: 1,
         issueType: 1,
         installationStatus: 1,
+        matStatus: 1,
         infraIssue: '$primaryIssue.reasons.primaryIssue',
       },
     },
@@ -210,6 +212,7 @@ 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' },
@@ -234,6 +237,7 @@ export async function userTicketList( req, res ) {
           $or: [
             { issueStatus: req.body.filter },
             { infraIssue: req.body.filter },
+            { issueType: req.body.filter },
           ],
         },
       } );
@@ -242,13 +246,23 @@ export async function userTicketList( req, res ) {
     if ( req.body.export ) {
       const exportdata = [];
       ticketList.forEach( ( element ) => {
-        exportdata.push( {
+        let data = {
           'DATE': element.Date,
           'TICKET ID': element.ticketId,
           'STORE ID': element.storeId,
-          'ISSUE': element.issueStatus,
+          'STORE NAME': element.storeName,
           '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;
@@ -377,6 +391,18 @@ 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 } },
+                ],
+
               },
             },
         );
@@ -411,6 +437,7 @@ 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' } },
@@ -440,6 +467,7 @@ export async function workHistory( req, res ) {
           $project: {
             storeId: 1,
             storeName: 1,
+            issueType: 1,
             clientId: 1,
             clientName: 1,
             issueDate: 1,
@@ -452,13 +480,20 @@ export async function workHistory( req, res ) {
             infraIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '' ] },
           },
         } );
-    if ( req.body.issueFilter && req.body.issueFilter.length>0 ) {
+    if ( req.body.issueFilter && req.body.issueFilter.length>0&&req.body.issueType!='dataMismatch' ) {
       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: {
@@ -489,19 +524,24 @@ export async function workHistory( req, res ) {
     if ( req.body.export ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        exportdata.push( {
+        let data ={
           '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 } from '../controllers/employeeTraning.controller.js';
+import { createTicket, updatecomment, activityLog, updateMatStatus } 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,3 +15,7 @@ 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 ) {