tango-app-api-infra 3.3.3-beta.4 → 3.3.3-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.3.3-beta.4",
+    "version": "3.3.3-beta.6",
     "description": "infra",
     "main": "index.js",
     "type": "module",

package/src/controllers/infra.controllers.js

@@ -1038,9 +1038,24 @@ export async function saveInfraEmailConfig( req, res ) {
   try {
     let inputData = req.body;
     let client = await findOneClient( { clientId: inputData.clientId } );
+    let intervaltimenew='';
+    let intervaltimeold='';
+    if ( inputData.configuration.type ==='customize' ) {
+      intervaltimeold= `Starts at ${client.ticketConfigs.infraReport.startTime}, repeats every ${client.ticketConfigs.infraReport.interval} minutes, and ends at ${client.ticketConfigs.infraReport.endTime}`;
+      let oldtime=inputData.configuration.times.map( ( data ) => data.interval );
+      oldtime = Array.isArray( oldtime ) ? [ ...new Set( oldtime ) ].join( ', ' ) : '';
+      intervaltimenew = `occurs at ${oldtime}`; ;
+    } else {
+      let oldtime=client.ticketConfigs.infraReport.times.map( ( data ) => data.interval );
+      oldtime = Array.isArray( oldtime ) ? [ ...new Set( oldtime ) ].join( ', ' ) : '';
+      intervaltimeold=`occurs at ${oldtime}`;
+      intervaltimenew=`Starts at ${inputData.configuration.startTime}, repeats every ${inputData.configuration.interval} minutes, and ends at ${inputData.configuration.endTime}`;
+    }
     await updateoneClient( { clientId: inputData.clientId }, {
       'ticketConfigs.infraReport': inputData.configuration,
     } );
+
+
     if ( inputData.type === 'users' ) {
       if ( inputData.userList && inputData.userList.length > 0 ) {
         for ( let user of inputData.userList ) {
@@ -1064,6 +1079,16 @@ export async function saveInfraEmailConfig( req, res ) {
     }
 
 
+    let oldData={
+      alertsType: `${client.ticketConfigs.infraReport.type} Interval`,
+      intervalTime: intervaltimeold,
+    };
+    let newData={
+      alertsType: `${inputData.configuration.type} Interval`,
+      intervalTime: intervaltimenew,
+
+    };
+
     const logObj = {
       clientId: inputData.clientId,
       userName: req.user?.userName,
@@ -1074,14 +1099,12 @@ export async function saveInfraEmailConfig( req, res ) {
       eventType: 'update',
       showTo: [ 'tango' ],
       changes: [ `Email Config` ],
-      previous: client.ticketConfigs.infraReport,
-      current: {
-        infraReport: {
-          start: inputData.start,
-          end: inputData.end,
-        },
-      },
+      oldData: oldData,
+      newData: newData,
+      previous: oldData,
+      current: newData,
     };
+    console.log( logObj );
 
     await insertOpenSearchData( JSON.parse( process.env.OPENSEARCH ).activityLog, logObj );
 
@@ -1857,7 +1880,7 @@ export async function infraTable( req, res ) {
             'Brand ID': element.clientId,
             'Store Name': element.storeName,
             'Store ID': element.storeId,
-            'Resloved By': element.userName,
+            'Resolved By': element.userName,
             'Status': element.status,
             'Primary Issues': element.primaryIssue == '-' ? 'Issue not identified' : element.primaryIssue,
             'Secondary Issues': element.secondaryIssue,
@@ -2339,7 +2362,7 @@ export async function matTable( req, res ) {
           'Brand ID': element.clientId,
           'Store Name': element.storeName,
           'Store ID': element.storeId,
-          'Resloved By': element.userName,
+          'Resolved By': element.userName,
           'Status': element.status,
         } );
       } );
@@ -2688,7 +2711,7 @@ export async function dataMismatchTable( req, res ) {
               'Brand ID': chunk[i]?.clientId,
               'Store Name': chunk[i]?.storeName,
               'Store ID': chunk[i]?.storeId,
-              'Resloved By': chunk[i]?.userName,
+              'Resolved By': chunk[i]?.userName,
               'Issue Type': chunk[i]?.issueType,
               'Query Type ': chunk[i]?.type,
               'Status': chunk[i]?.status,

package/src/controllers/internalInfra.controller.js

@@ -1033,7 +1033,7 @@ export async function infraReportSent( req, res ) {
       const fileContent = readFileSync( join() + '/src/hbs/dailyInfraReport.hbs', 'utf8' );
       const htmlContent = handlebars.compile( fileContent );
       let Uidomain = `${JSON.parse( process.env.URL ).domain}`;
-      const html = htmlContent( { ...req.body, Uidomain: Uidomain, issueCount: issueCount, avgDownTime: avgDownTime, reportdate:dayjs(date).format( 'DD-MM-YYYY' ), content: obj, date: date, csmEmail: csmEmail, domain: JSON.parse( process.env.URL ).apiDomain } );
+      const html = htmlContent( { ...req.body, Uidomain: Uidomain, issueCount: issueCount, avgDownTime: avgDownTime, reportdate: dayjs( date ).format( 'DD-MM-YYYY' ), content: obj, date: date, csmEmail: csmEmail, domain: JSON.parse( process.env.URL ).apiDomain } );
       if ( isValidEmail( req.body.email ) ) {
         const result = await sendEmailWithSES( req.body.email, subject, html, attachments, JSON.parse( process.env.SES ).adminEmail );
         res.sendSuccess( result );

package/src/controllers/storeInfra.controlller.js

@@ -160,7 +160,7 @@ export async function storeTicketList( req, res ) {
           'STORE ID': element.storeId,
           'TICKET ID': element.ticketId,
           'DATE': dayjs( element.createdAt ).format( 'DD MMM, YYYY' ),
-          'ISSUE CLOSED DATE': element.issueClosedDate?dayjs( element.issueClosedDate ).format( 'DD MMM, YYYY' ):"",
+          'ISSUE CLOSED DATE': element.issueClosedDate?dayjs( element.issueClosedDate ).format( 'DD MMM, YYYY' ):'',
           'PRIMARY ISSUE': element.primaryIssue,
           'SECONDARY ISSUE': element.secondaryIssue,
           'STATUS': element.status,

package/src/services/user.service.js

@@ -5,6 +5,10 @@ export async function findOneUser( query, project ) {
   return await dataModel.userModel.findOne( query, project );
 }
 
+export async function findUser( query, project ) {
+  return await dataModel.userModel.find( query, project );
+}
+
 export async function aggregateUser( query ) {
   return await dataModel.userModel.aggregate( query );
 }