tango-app-api-infra 3.0.16 → 3.0.18-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.16",
+    "version": "3.0.18-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -14,14 +14,16 @@
     "license": "ISC",
     "dependencies": {
         "aws-sdk": "^2.1571.0",
+        "cors": "^2.8.5",
         "dayjs": "^1.11.10",
         "dotenv": "^16.4.5",
         "express": "^4.18.3",
+        "express-fileupload": "^1.5.0",
         "handlebars": "^4.7.8",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.44",
-        "tango-app-api-middleware": "^1.0.21",
+        "tango-api-schema": "^2.0.56",
+        "tango-app-api-middleware": "^1.0.41-dev",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/clientInfra.controller.js

@@ -101,6 +101,7 @@ export async function infraCard( req, res ) {
       );
     }
     let ticketList = await aggregateTangoTicket( query );
+
     let issueList = await findinfraReason( { parentId: { '$exists': false } } );
     const categoryCounts = {};
     let response;
@@ -421,7 +422,7 @@ export async function InstallationIssuesTable( req, res ) {
     }
     if ( req.body.export ) {
       const exportdata = [];
-      infrastoreList.forEach( ( element ) => {
+      storesList.forEach( ( element ) => {
         exportdata.push( {
           'CLIENT NAME': element.clientName,
           'STORE ID': element.storeId,
@@ -494,6 +495,10 @@ export async function hourWiseDownClients( req, res ) {
       let clientdata = await livecountCheck( data, inputData );
       result.push( clientdata[0] );
     }
+    if ( req.body.export && result.length > 0 ) {
+      await download( result, res );
+      return;
+    }
     res.sendSuccess( { count: count.length, result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'hourWiseDownClients' } );
@@ -639,6 +644,10 @@ export async function hourWiseDownstores( req, res ) {
       let storedata = await downStoresCheck( data, inputData );
       result.push( storedata[0] );
     }
+    if ( req.body.export && result.length > 0 ) {
+      await download( result, res );
+      return;
+    }
     res.sendSuccess( { count: count.length, result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'hourWiseDownstores' } );

package/src/controllers/infra.controllers.js

@@ -3,7 +3,7 @@
 import { createTangoTicket, findOneTangoTicket, updateOneTangoTicket } from '../services/tangoTicket.service.js';
 import { createinfraReason, findinfraReason } from '../services/infraReason.service.js';
 import { updateOneStore } from '../services/store.service.js';
-import { logger, fileUpload } from 'tango-app-api-middleware';
+import { logger, fileUpload, signedUrl } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
 export async function createTicket( req, res ) {
   try {
@@ -96,7 +96,7 @@ export async function secondaryReason( req, res ) {
 
 export async function updateTicketIssue( req, res ) {
   try {
-    let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketActivity': req.body.ticketActivity, 'ticketDetails.issueIdentifiedDate': new Date(), 'ticketDetails.issueIdentifiedBy': req.body.issueIdentifiedBy, 'ticketDetails.issueStatus': 'identified' } );
+    let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketActivity': req.body.ticketActivity, 'ticketDetails.issueIdentifiedDate': new Date(), 'ticketDetails.issueIdentifiedBy': req.body.issueIdentifiedBy, 'ticketDetails.issueStatus': 'identified', 'status': 'inprogress' } );
     if ( updateTicket ) {
       res.sendSuccess( 'Ticket Updated  Successfully' );
     }
@@ -108,8 +108,21 @@ export async function updateTicketIssue( req, res ) {
 
 export async function viewTicket( req, res ) {
   try {
-    let ticket = await findOneTangoTicket( { ticketId: req.body.ticketId }, { ticketId: 1, status: 1, ticketActivity: 1 } );
-    if ( ticket ) {
+    let ticket = await findOneTangoTicket( { ticketId: req.body.ticketId }, { ticketId: 1, status: 1, ticketDetails: 1, basicDetails: 1, ticketActivity: 1, createdAt: 1, attachments: 1 } );
+    if ( ticket.attachments && ticket.attachments.length > 0 ) {
+      for ( let index in ticket.attachments ) {
+        if ( ticket.attachments.hasOwnProperty( index ) ) {
+          let file = ticket.attachments[index];
+          let params = {
+            Bucket: 'tango-client-sandbox',
+            file_path: file.filePath,
+          };
+          let attachments = await signedUrl( params );
+          ticket.attachments[index].signedUrl = attachments;
+        }
+      }
+      res.sendSuccess( ticket );
+    } else {
       res.sendSuccess( ticket );
     }
   } catch ( error ) {
@@ -119,7 +132,7 @@ export async function viewTicket( req, res ) {
 }
 export async function AlertTicketReply( req, res ) {
   try {
-    req.body.ticketActivity = req.body.ticketActivity.filter( ( data ) => data.action !='statusCheck' );
+    req.body.ticketActivity = req.body.ticketActivity.filter( ( data ) => data.action != 'statusCheck' );
     req.body.ticketActivity.push( {
       actionType: 'statusCheckReply',
       actionBy: 'Tango',
@@ -139,15 +152,32 @@ export async function AlertTicketReply( req, res ) {
 }
 export async function uploadAttachments( req, res ) {
   try {
-    let params ={
-      Bucket: 'tango-brand-info-uat',
-      key: req.params.ticketId,
-      fileName: req.files[0].name,
-
-
-    };
-    let response =await fileUpload( params );
-    res.sendSuccess( response );
+    if ( req.files.img && req.files.img.length > 0 ) {
+      let attachments = [];
+      for ( let singleImg in req.files.img ) {
+        if ( req.files.img.hasOwnProperty( singleImg ) ) {
+          let params = {
+            Bucket: 'tango-client-sandbox',
+            Key: req.params.ticketId + '/',
+            ContentType: 'multipart/form-data',
+            body: req.files.img[singleImg].data,
+            fileName: req.files.img[singleImg].name,
+          };
+          let upload = await fileUpload( params );
+          if ( upload ) {
+            let getObject = {
+              fileName: req.files.img[singleImg].name,
+              filePath: req.params.ticketId + '/' + req.files.img[singleImg].name,
+            };
+            attachments.push( getObject );
+          }
+        }
+      }
+      let updateTicket = await updateOneTangoTicket( { ticketId: req.params.ticketId }, { attachments: attachments } );
+      if ( updateTicket ) {
+        res.sendSuccess( 'Uploaded successfully' );
+      }
+    }
   } catch ( error ) {
     logger.error( { error: error, function: 'uploadAttachments' } );
     return res.sendError( error, 500 );

package/src/controllers/storeInfra.controlller.js

@@ -1,5 +1,5 @@
 
-import { logger, getOpenSearchData } from 'tango-app-api-middleware';
+import { logger, getOpenSearchData, download } from 'tango-app-api-middleware';
 import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findOneStore } from '../services/store.service.js';
 import dayjs from 'dayjs';
@@ -8,14 +8,18 @@ export async function storeTicketList( req, res ) {
   try {
     let query = [ {
       $match: {
-        'basicDetails.storeId': req.body.storeId,
+        $and: [
+          { 'basicDetails.storeId': req.body.storeId },
+          { createdAt: { $gte: new Date( req.body.fromDate ) } },
+          { createdAt: { $lte: new Date( req.body.toDate ) } },
+        ],
       },
     },
     {
       $project: {
         storeId: '$basicDetails.storeId',
         status: 1,
-        Date: { $dateToString: { format: '%d-%m-%Y', date: '$issueDate' } },
+        Date: { $dateToString: { format: '%d-%m-%Y', date: '$createdAt' } },
         issueClosedDate: 1,
         ticketId: 1,
         issueStatus: '$ticketDetails.issueStatus',
@@ -53,7 +57,30 @@ export async function storeTicketList( req, res ) {
       },
     },
     ];
+
+    if ( req.body.filter && req.body.filter !== '' ) {
+      query.push( {
+        $match: {
+          primaryIssue: req.body.filter,
+        },
+      } );
+    }
     let ticketList = await aggregateTangoTicket( query );
+    if ( req.body.export && ticketList.length > 0 ) {
+      const exportdata = [];
+      ticketList.forEach( ( element ) => {
+        exportdata.push( {
+          'STORE ID': element.storeId,
+          'TICKET ID': element.ticketId,
+          'DATE': element.Date,
+          'ISSUE CLOSED DATE': element.issueClosedDate,
+          'ISSUE': element.primaryIssue,
+          'STATUS': element.status,
+        } );
+      } );
+      await download( exportdata, res );
+      return;
+    }
     if ( ticketList.length ) {
       res.sendSuccess( {
         count: ticketList.length,
@@ -72,8 +99,13 @@ export async function storeTicketcard( req, res ) {
   try {
     let query = [ {
       $match: {
-        'basicDetails.storeId': req.body.storeId,
-        'ticketDetails.issueStatus': 'identified',
+        $and: [
+          { 'basicDetails.storeId': req.body.storeId },
+          { 'ticketDetails.issueStatus': 'identified' },
+          { createdAt: { $gte: new Date( req.body.fromDate ) } },
+          { createdAt: { $lte: new Date( req.body.toDate ) } },
+        ],
+
       },
     },
     {
@@ -309,6 +341,10 @@ export async function edgeAppLogTable( req, res ) {
       const appStatus = await getOpenSearchData( 'edgeapp_systemlogs', appStatusQuery );
       obj.appStatus = appStatus.body.hits.hits.length > 0 ? appStatus.body.hits.hits[0]._source.data.message : '';
     }
+    if ( req.body.export ) {
+      await download( timeSlots, res );
+      return;
+    }
     res.sendSuccess( timeSlots );
   } catch ( error ) {
     logger.error( { error: error, function: 'edgeAppLog' } );

package/src/controllers/userInfra.controller.js

@@ -5,6 +5,7 @@ import { findOneUser } from '../services/user.service.js';
 import { aggregateStore } from '../services/store.service.js';
 
 import mongoose from 'mongoose';
+import dayjs from 'dayjs';
 
 export async function userTakeTicket( req, res ) {
   try {
@@ -38,7 +39,6 @@ export async function userTicketList( req, res ) {
         ],
       },
     } ];
-
     if ( req.body.status != 'closed' ) {
       query.push( {
         $match: {
@@ -51,9 +51,7 @@ export async function userTicketList( req, res ) {
     } else {
       query.push( {
         $match: {
-          $and: [
-            { createdAt: { $gte: new Date() } },
-          ],
+          issueClosedDate: { $gte: new Date( dayjs().format( 'YYYY-MM-DD' ) ) },
         },
       } );
     }
@@ -94,7 +92,41 @@ export async function userTicketList( req, res ) {
         infraIssue: '$primaryIssue.reasons.primaryIssue',
       },
     } );
+
+    if ( req.body.searchValue && req.body.searchValue !== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { storeId: { $regex: req.body.searchValue, $options: 'i' } },
+            { infraIssue: { $regex: req.body.searchValue, $options: 'i' } },
+          ],
+        },
+      } );
+    }
+    if ( req.body.filter && req.body.filter !== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { issueStatus: req.body.filter },
+            { infraIssue: req.body.filter },
+          ],
+        },
+      } );
+    }
     let ticketList = await aggregateTangoTicket( query );
+    if ( req.body.export ) {
+      const exportdata = [];
+      ticketList.forEach( ( element ) => {
+        exportdata.push( {
+          'DATE': element.Date,
+          'TICKET ID': element.ticketId,
+          'STORE ID': element.storeId,
+          'ISSUE': element.issueStatus,
+        } );
+      } );
+      await download( exportdata, res );
+      return;
+    }
     if ( ticketList.length ) {
       res.sendSuccess( {
         count: ticketList.length,
@@ -108,6 +140,42 @@ export async function userTicketList( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+export async function activeTicketList( req, res ) {
+  try {
+    let query = [ {
+      $match: {
+        $and: [
+          { 'status': { $in: [ 'open', 'inprogress' ] } },
+          { issueType: req.body.issueType },
+          { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
+        ],
+      },
+    }, {
+      $project: {
+        storeId: '$basicDetails.storeId',
+        ticketId: 1,
+        storeName: '$basicDetails.storeName',
+        address: { $ifNull: [ '$basicDetails.address', '' ] },
+        status: 1,
+      },
+    } ];
+
+
+    let ticketList = await aggregateTangoTicket( query );
+
+    if ( ticketList.length ) {
+      res.sendSuccess( {
+        count: ticketList.length,
+        data: ticketList,
+      } );
+    } else {
+      return res.sendError( 'NO data', 204 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'activeTicketList' } );
+    return res.sendError( error, 500 );
+  }
+}
 export async function basicDetails( req, res ) {
   try {
     let user = await findOneUser( { _id: new mongoose.Types.ObjectId( req.body.userId ) }, { userName: 1, userType: 1 } );
@@ -141,56 +209,111 @@ export async function workHistory( req, res ) {
           { 'status': 'closed' },
           { issueType: req.body.issueType },
           { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
-          { createdAt: { $gte: new Date( req.body.fromDate ) } },
-          { createdAt: { $lte: new Date( req.body.toDate ) } },
         ],
       },
-    },
-    {
-      $project: {
-        storeId: '$basicDetails.storeId',
-        storeName: '$basicDetails.storeName',
-        clientId: '$basicDetails.clientId',
-        clientName: '$basicDetails.clientName',
-        issueDate: { $dateToString: { format: '%d-%m-%Y', date: '$issueDate' } },
-        issueClosedDate: { $dateToString: { format: '%d-%m-%Y', date: '$issueClosedDate' } },
-        issueIdentifiedDate: { $dateToString: { format: '%d-%m-%Y', date: '$ticketDetails.issueIdentifiedDate' } },
-        ticketId: 1,
-        issueStatus: '$ticketDetails.issueStatus',
-        ticketType: '$ticketDetails.ticketType',
-        primaryIssue: {
-          $filter: {
-            input: '$ticketActivity',
-            as: 'item',
-            cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
+    } ];
+
+    if ( req.body.dateFilter&&req.body.dateFilter !='' ) {
+      if ( req.body.dateFilter === 'issueIdentifiedDate' ) {
+        query.push(
+            {
+              $match: {
+                $and: [
+                  { 'ticketDetails.issueIdentifiedDate': { $gte: new Date( req.body.fromDate ) } },
+                  { 'ticketDetails.issueIdentifiedDate': { $lte: new Date( req.body.toDate ) } },
+                ],
+
+              },
+            },
+        );
+      } else if ( req.body.dateFilter === 'closedDate' ) {
+        query.push(
+            {
+              $match: {
+                $and: [
+                  { 'issueClosedDate': { $gte: new Date( req.body.fromDate ) } },
+                  { 'issueClosedDate': { $lte: new Date( req.body.toDate ) } },
+                ],
+
+              },
+            },
+        );
+      } else {
+        query.push(
+            {
+              $match: {
+                $and: [
+                  { createdAt: { $gte: new Date( req.body.fromDate ) } },
+                  { createdAt: { $lte: new Date( req.body.toDate ) } },
+                ],
+
+              },
+            },
+        );
+      }
+    }
+
+    if ( req.body.storeFilter&&req.body.storeFilter.length>0 ) {
+      query.push(
+          {
+            $match: {
+              'basicDetails.storeId': { $in: req.body.storeFilter } },
+          },
+      );
+    }
+    query.push(
+        {
+          $project: {
+            storeId: '$basicDetails.storeId',
+            storeName: '$basicDetails.storeName',
+            clientId: '$basicDetails.clientId',
+            clientName: '$basicDetails.clientName',
+            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' } },
+            ticketId: 1,
+            issueStatus: '$ticketDetails.issueStatus',
+            ticketType: '$ticketDetails.ticketType',
+            primaryIssue: {
+              $filter: {
+                input: '$ticketActivity',
+                as: 'item',
+                cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
+              },
+            },
           },
         },
-      },
-    },
-    {
-      $unwind: {
-        path: '$primaryIssue', preserveNullAndEmptyArrays: true,
-      },
-    },
-    {
-      $unwind: {
-        path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
-      },
-    }, {
-      $project: {
-        storeId: 1,
-        storeName: 1,
-        clientId: 1,
-        clientName: 1,
-        issueDate: 1,
-        issueIdentifiedDate: 1,
-        issueClosedDate: 1,
-        ticketId: 1,
-        issueStatus: 1,
-        ticketType: 1,
-        infraIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '' ] },
-      },
-    } ];
+        {
+          $unwind: {
+            path: '$primaryIssue', preserveNullAndEmptyArrays: true,
+          },
+        },
+        {
+          $unwind: {
+            path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
+          },
+        }, {
+          $project: {
+            storeId: 1,
+            storeName: 1,
+            clientId: 1,
+            clientName: 1,
+            issueDate: 1,
+            issueIdentifiedDate: 1,
+            issueClosedDate: 1,
+            ticketId: 1,
+            issueStatus: 1,
+            ticketType: 1,
+            infraIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', '' ] },
+          },
+        } );
+    if ( req.body.issueFilter && req.body.issueFilter !== '' ) {
+      query.push( {
+        $match: {
+          infraIssue: req.body.issueFilter,
+        },
+      } );
+    }
     if ( req.body.searchValue && req.body.searchValue !== '' ) {
       query.push( {
         $match: {
@@ -258,7 +381,6 @@ export async function storeInfraList( req, res ) {
         $match: {
           $and: [
             { clientId: { $in: req.body.clientId } },
-            { createdAt: { $lte: new Date( req.body.toDate ) } },
           ],
         },
       },
@@ -290,13 +412,34 @@ export async function storeInfraList( req, res ) {
         },
       },
     ];
-    if ( req.body.storeId && req.body.storeId.length>0 ) {
+    if ( req.body.storeId && req.body.storeId.length > 0 ) {
       query.push( {
         $match: {
           storeId: { $in: req.body.storeId },
         },
       } );
     }
+    if ( req.body.country && req.body.country.length > 0 ) {
+      query.push( {
+        $match: {
+          country: { $in: req.body.country },
+        },
+      } );
+    }
+    if ( req.body.state && req.body.state.length > 0 ) {
+      query.push( {
+        $match: {
+          state: { $in: req.body.state },
+        },
+      } );
+    }
+    if ( req.body.city && req.body.city.length > 0 ) {
+      query.push( {
+        $match: {
+          city: { $in: req.body.city },
+        },
+      } );
+    }
     if ( req.body.searchValue && req.body.searchValue !== '' ) {
       query.push( {
         $match: {

package/src/routes/userInfra.routes.js

@@ -1,12 +1,13 @@
 import express from 'express';
 import { isAllowedSessionHandler } from 'tango-app-api-middleware';
-import { userTakeTicket, userTicketList, basicDetails, workHistory, storeInfraList } from '../controllers/userInfra.controller.js';
+import { userTakeTicket, userTicketList, activeTicketList, basicDetails, workHistory, storeInfraList } from '../controllers/userInfra.controller.js';
 
 export const userInfraRouter = express.Router();
 
 
 userInfraRouter.post( '/userTakeTicket', isAllowedSessionHandler, userTakeTicket );
 userInfraRouter.post( '/userTicketList', isAllowedSessionHandler, userTicketList );
+userInfraRouter.post( '/activeTicketList', isAllowedSessionHandler, activeTicketList );
 userInfraRouter.post( '/basicDetails', isAllowedSessionHandler, basicDetails );
 userInfraRouter.post( '/workHistory', isAllowedSessionHandler, workHistory );
 userInfraRouter.post( '/storeInfraList', isAllowedSessionHandler, storeInfraList );

package/src/validations/infra.validation.js

@@ -18,6 +18,7 @@ export async function validateDetails( req, res, next ) {
     req.body.basicDetails = {
       storeId: req.body.storeId,
       storeName: store.storeName,
+      address: store.storeProfile&&store.storeProfile.address?store.storeProfile.address:'',
       clientId: store.clientId,
       clientName: client.clientName,
     };