tango-app-api-infra 3.0.50-dev → 3.0.51-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.50-dev",
+    "version": "3.0.51-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/infra.controllers.js

@@ -75,9 +75,9 @@ 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 } );
-    await sendEmailWithSES( req.body.spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
-
-
+    if ( req.body.spocEmail&&req.body.issueType == 'infra' ) {
+      await sendEmailWithSES( req.body.spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+    }
     if ( create ) {
       res.sendSuccess( 'Ticket Created Successfully' );
     }

package/src/controllers/internalInfra.controller.js

@@ -86,7 +86,7 @@ export async function clientList( req, res ) {
 export async function basicList( req, res ) {
   try {
     let storeList = await findStore( { status: 'active' },
-        { 'storeName': 1, 'storeId': 1, 'clientId': 1, 'storeProfile.open': 1, 'storeProfile.close': 1, 'storeProfile.timeZone': 1 } );
+        { 'storeName': 1, 'storeId': 1, 'ticketConfigs': 1, 'clientId': 1, 'storeProfile.open': 1, 'storeProfile.close': 1, 'storeProfile.timeZone': 1 } );
     res.sendSuccess( storeList );
   } catch ( error ) {
     logger.error( { error: error, function: 'basicList' } );
@@ -201,7 +201,9 @@ 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 } );
-        await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+        if ( spocEmail ) {
+          await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
+        }
       }
     }
 
@@ -280,7 +282,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 ) {
+          if ( spocEmail && spocEmail != '' &&spocEmail!='none'&& spocEmail != undefined ) {
             await sendEmailWithSES( spocEmail, subject, html, attachments, appConfig.cloud.aws.ses.adminEmail );
           }
         }
@@ -527,7 +529,7 @@ export async function infraReportSent( req, res ) {
         'Status ': element.status,
         'Responded By': clientuser && clientuser.userName ? clientuser.userName : '-',
         'Resolved By': tangouser && tangouser.userName ? tangouser.userName : '-',
-        'Closed Date & Time': element.issueClosedDate?dayjs( element.issueClosedDate ).format( 'YYYY-MM-DD HH:mm A' ):'-',
+        'Closed Date & Time': element.issueClosedDate ? dayjs( element.issueClosedDate ).format( 'YYYY-MM-DD HH:mm A' ) : '-',
         'Latest Comment': '',
         'Activity Log': '',
       } );
@@ -541,7 +543,7 @@ export async function infraReportSent( req, res ) {
       ],
     } );
     let client = await findOneClient( { clientId: req.body.clientId } );
-    let avgDownTime = client.ticketConfigs.infraDownTime*60;
+    let avgDownTime = client.ticketConfigs.infraDownTime * 60;
     let issueList = await findinfraReason( { parentId: { '$exists': false } } );
     const categoryCounts = {};
     let response;
@@ -565,8 +567,8 @@ export async function infraReportSent( req, res ) {
       } ) );
     }
     let reportdate = dayjs().format( 'YYYY-MM-DD' );
-    let attachments= null;
-    if ( exportdata.length>0 ) {
+    let attachments = null;
+    if ( exportdata.length > 0 ) {
       const wb = new xl.Workbook();
       const ws = wb.addWorksheet( 'Daily report' );
       const headers = Object.keys( exportdata[0] );
@@ -605,3 +607,16 @@ export async function infraReportSent( req, res ) {
     res.sendError( error, 500 );
   }
 }
+export async function spocmailchange() {
+  let storelist = await findStore( {} );
+  for ( let store of storelist ) {
+    if ( store && store.spocDetails ) {
+      let spoclist = [];
+      for ( let spoc of store.spocDetails ) {
+        spoc.email = spoc.email.replace( '@', '1@' ),
+        spoclist.push( spoc );
+      }
+      await updateOneStore( { storeId: store.storeId }, { spocDetails: spoclist } );
+    }
+  }
+}

package/src/routes/internalInfra.routes.js

@@ -2,7 +2,7 @@
 import express from 'express';
 import {
   migrateClient, migrateStores, basicList, clientList, setTicketTime, downStoresList,
-  openTicketList, assigntoUser, updateRefreshTicket, closeTicket, emailUserList, infraReportSent,
+  openTicketList, assigntoUser, updateRefreshTicket, closeTicket, spocmailchange, emailUserList, infraReportSent,
 } from '../controllers/internalInfra.controller.js';
 
 export const internalInfraRouter = express.Router();
@@ -19,5 +19,6 @@ internalInfraRouter.post( '/updateRefreshTicket', updateRefreshTicket );
 internalInfraRouter.post( '/closeTicket', closeTicket );
 internalInfraRouter.get( '/emailUserList', emailUserList );
 internalInfraRouter.post( '/infraReportSent', infraReportSent );
+internalInfraRouter.post( '/spocmailchange', spocmailchange );
 
 

package/src/validations/infra.validation.js

@@ -30,15 +30,18 @@ export async function validateDetails( req, res, next ) {
     };
 
     if ( req.body.issueType == 'infra' ) {
+      let refreshdate = dayjs().add( client.ticketConfigs.refreshAlert, 'days' );
       req.body.ticketDetails = {
-        ticketRefreshTime: dayjs().add( client.ticketConfigs.refreshAlert, 'days' ),
+        ticketRefreshTime: new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
       };
     } else if ( req.body.issueType == 'installation' ) {
+      let refreshdate = dayjs().add( client.ticketConfigs.installationReAssign, 'days' );
       req.body.ticketDetails = {
-        ticketRefreshTime: dayjs().add( client.ticketConfigs.installationReAssign, 'days' ),
+        ticketRefreshTime: new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
       };
     }
 
+
     next();
   } catch ( error ) {
     logger.error( { error: error, function: 'validateDetails' } );
@@ -64,6 +67,7 @@ export async function validateTicket( req, res, next ) {
             'basicDetails.storeId': req.body.basicDetails.storeId,
             'issueType': 'infra',
             'status': { $ne: 'closed' },
+            'ticketDetails.ticketRefreshTime': { $lte: new Date() },
             'ticketDetails.ticketType': 'refreshticket',
           },
       );