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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.17",
+    "version": "3.0.18-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -18,11 +18,12 @@
         "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.49",
-        "tango-app-api-middleware": "^1.0.29",
+        "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

@@ -422,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,

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, ticketDetails: 1, basicDetails: 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/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' ) ) },
         },
       } );
     }
@@ -155,6 +153,8 @@ export async function activeTicketList( req, res ) {
     }, {
       $project: {
         storeId: '$basicDetails.storeId',
+        ticketId: 1,
+        storeName: '$basicDetails.storeName',
         address: { $ifNull: [ '$basicDetails.address', '' ] },
         status: 1,
       },
@@ -268,9 +268,9 @@ export async function workHistory( req, res ) {
             storeName: '$basicDetails.storeName',
             clientId: '$basicDetails.clientId',
             clientName: '$basicDetails.clientName',
-            issueDate: { $dateToString: { format: '%d-%m-%Y', date: '$createdAt' } },
-            issueClosedDate: { $dateToString: { format: '%d-%m-%Y', date: '$issueClosedDate' } },
-            issueIdentifiedDate: { $dateToString: { format: '%d-%m-%Y', date: '$ticketDetails.issueIdentifiedDate' } },
+            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',
@@ -381,7 +381,6 @@ export async function storeInfraList( req, res ) {
         $match: {
           $and: [
             { clientId: { $in: req.body.clientId } },
-            { createdAt: { $lte: new Date( req.body.toDate ) } },
           ],
         },
       },
@@ -420,6 +419,27 @@ export async function storeInfraList( req, res ) {
         },
       } );
     }
+    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: {