tango-app-api-infra 3.0.52-dev → 3.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.52-dev",
+    "version": "3.1.0",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "tango-api-schema": "^2.0.77",
-        "tango-app-api-middleware": "^1.0.54-dev",
+        "tango-app-api-middleware": "^3.1.1",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/infra.controllers.js

@@ -75,7 +75,7 @@ export async function createTicket( req, res ) {
     let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${req.body.basicDetails.storeId}`;
 
     const html = htmlContent( { ...req.body, Uidomain: Uidomain, domain: appConfig.url.apiDomain, date: dayjs( req.body.issueDate ).format( 'YYYY-MM-DD' ), downtimetotal: downtimetotal, Timestamp: Timestamp } );
-    if ( req.body.spocEmail&&req.body.issueType == 'infra' ) {
+    if ( req.body.spocEmail&&req.body.issueType == 'infra'&&isValidEmail( req.body.spocEmail ) ) {
       await sendEmailWithSES( req.body.spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
     }
     if ( create ) {
@@ -86,6 +86,10 @@ export async function createTicket( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+function isValidEmail( email ) {
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return emailRegex.test( email );
+}
 export async function bulkcreateTicket( req, res ) {
   try {
     let response = {};
@@ -284,7 +288,7 @@ export async function viewTicket( req, res ) {
         if ( ticket.attachments.hasOwnProperty( index ) ) {
           let file = ticket.attachments[index];
           let params = {
-            Bucket: 'tango-client-sandbox',
+            Bucket: appConfig.cloud.aws.bucket.ticket,
             file_path: file.filePath,
           };
           let attachments = await signedUrl( params );
@@ -336,7 +340,7 @@ export async function uploadAttachments( req, res ) {
       for ( let singleImg in req.files.img ) {
         if ( req.files.img.hasOwnProperty( singleImg ) ) {
           let params = {
-            Bucket: 'tango-client-sandbox',
+            Bucket: appConfig.cloud.aws.bucket.ticket,
             Key: req.params.ticketId + '/',
             ContentType: 'multipart/form-data',
             body: req.files.img[singleImg].data,
@@ -360,7 +364,7 @@ export async function uploadAttachments( req, res ) {
       let oldticket = await findOneTangoTicket( { ticketId: req.params.ticketId } );
       let attachments = oldticket.attachments;
       let params = {
-        Bucket: 'tango-client-sandbox',
+        Bucket: appConfig.cloud.aws.bucket.ticket,
         Key: req.params.ticketId + '/',
         ContentType: 'multipart/form-data',
         body: req.files.img.data,

package/src/controllers/internalInfra.controller.js

@@ -201,7 +201,7 @@ export async function updateRefreshTicket( req, res ) {
         }
         let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
         const html = htmlContent( { ...getTicket, Uidomain: Uidomain, primary: primaryIssue, storeName: getTicket.basicDetails.storeName, hibernation: '', spocName: spocName, date: dayjs( getTicket.issueDate ).format( 'YYYY-MM-DD' ), downtimetotal: downtimetotal, Timestamp: Timestamp, domain: appConfig.url.apiDomain } );
-        if ( spocEmail ) {
+        if ( spocEmail && isValidEmail( spocEmail ) ) {
           await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
         }
       }
@@ -221,6 +221,7 @@ export async function closeTicket( req, res ) {
         if ( ticket.status == 'closed' ) {
           getTicket.ticketActivity.push( {
             actionType: 'dataRecived',
+            timeStamp: new Date(),
             actionBy: 'Tango',
           } );
         }
@@ -282,7 +283,7 @@ export async function closeTicket( req, res ) {
           let spocName = store.spocDetails[0].name;
           let Uidomain = `${appConfig.url.domain}/manage/stores/infra-ticket?storeId=${getTicket.basicDetails.storeId}`;
           const html = htmlContent( { ...getTicket, Uidomain: Uidomain, primaryIssue: primaryIssue, storeName: getTicket.basicDetails.storeName, spocName: spocName, date: dayjs( getTicket.issueDate ).format( 'YYYY-MM-DD HH:mm' ), downtimetotal: downtimetotal, Timestamp: Timestamp, domain: appConfig.url.apiDomain } );
-          if ( spocEmail && spocEmail != '' &&spocEmail!='none'&& spocEmail != undefined ) {
+          if ( spocEmail && isValidEmail( spocEmail ) ) {
             await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
           }
         }
@@ -295,6 +296,10 @@ export async function closeTicket( req, res ) {
     res.sendError( error, 500 );
   }
 }
+function isValidEmail( email ) {
+  const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+  return emailRegex.test( email );
+}
 export async function emailUserList( req, res ) {
   try {
     let clientList = await aggregateClient( [
@@ -600,7 +605,10 @@ export async function infraReportSent( req, res ) {
 
 
     const html = htmlContent( { ...req.body, Uidomain: Uidomain, issueCount: issueCount, avgDownTime: avgDownTime, reportdate: reportdate, content: response, date: date, domain: appConfig.url.apiDomain } );
-    const result = await sendEmailWithSES( req.body.email, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+    if ( isValidEmail( req.body.email ) ) {
+      const result = await sendEmailWithSES( req.body.email, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+      res.sendSuccess( result );
+    }
     res.sendSuccess( result );
   } catch ( error ) {
     logger.error( { error: error, function: 'infraReportSent' } );

package/src/controllers/storeInfra.controlller.js

@@ -4,7 +4,7 @@ import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findOneStore } from '../services/store.service.js';
 import dayjs from 'dayjs';
 import { findinfraReason } from '../services/infraReason.service.js';
-import { signedUrl } from 'tango-app-api-middleware';
+import { signedUrl, appConfig } from 'tango-app-api-middleware';
 export async function storeTicketList( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
@@ -803,7 +803,7 @@ export async function cameraAngleChange( req, res ) {
       let changeDetected = result.camera_info.filter( ( cam ) => cam.stream == req.body.StreamName );
       if ( changeDetected.length == 1 ) {
         let params = {
-          Bucket: 'tango-client-sandbox',
+          Bucket: appConfig.cloud.aws.bucket.ticket,
           file_path: changeDetected[0].path,
         };
         let Image = await signedUrl( params );