tango-app-api-infra 3.0.107-dev → 3.0.108-dev

package/package.json

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

package/src/controllers/infra.controllers.js

@@ -30,7 +30,7 @@ export async function createTicket( req, res ) {
       } ];
       let ticketExists= await findOneTangoTicket( { ticketId: req.body.ticketId } );
       if ( ticketExists ) {
-        res.status( 200 ).send( { storeId: req.body.storeId } );
+        return res.status( 200 ).send( { message: 'ticketId Exists', storeId: req.body.storeId } );
       }
     }
     if ( req.body.issueType == 'installation' ) {
@@ -72,7 +72,7 @@ export async function createTicket( req, res ) {
       downtimetotal = 0;
     }
 
-
+    console.log( req.body );
     let create = await createTangoTicket( req.body );
     let Timestamp = dayjs().format( 'YYYY-MM-DD HH:mm' );
     const attachments = null;
@@ -239,14 +239,16 @@ export async function updateTicketIssue( req, res ) {
         'status': 'inprogress',
       };
     }
-    let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, query );
     if ( req.body.issueType === 'infra' ) {
       let client = await findOneClient( { clientId: req.body.basicDetails.clientId } );
       let refreshdate = dayjs().add( client.ticketConfigs.refreshAlert, 'days' );
-      req.body.ticketDetails = {
-        ticketRefreshTime: new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
+      console.log( new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ) );
+      query = { ...query, 'ticketDetails.ticketRefreshTime': new Date( dayjs( refreshdate ).format( 'YYYY-MM-DD' ) ),
       };
     }
+    console.log( query );
+    let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, query );
+
     if ( req.body.ticketDetails.ticketType === 'refreshticket' ) {
       await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketDetails.refreshTicketStatus': 'identified' } );
     }

package/src/controllers/storeInfra.controlller.js

@@ -817,27 +817,30 @@ export async function datewiseDowntime( req, res ) {
   try {
     const store = await findOneStore( { storeId: req.body.storeId } );
     if ( !store ) {
-      return res.sendError( 'Stores Not fond', 204 );
+      return res.sendError( 'Store Not Found', 204 );
     }
-    let startHour = store.storeProfile.open.split( ':' )[0];
-    let endHour = store.storeProfile.close.split( ':' )[0];
-
-    let datesArray = getDatesArray( req.body.fromDate, req.body.toDate );
-    let paginatedDates = paginateArray( datesArray, req.body.offset, req.body.limit );
-    let result = [];
-    for ( const singleDate of paginatedDates ) {
-      let inputData = {
+
+    const startHour = parseInt( store.storeProfile.open.split( ':' )[0], 10 );
+    const endHour = parseInt( store.storeProfile.close.split( ':' )[0], 10 );
+
+    const datesArray = getDatesArray( req.body.fromDate, req.body.toDate );
+    const paginatedDates = paginateArray( datesArray, req.body.offset, req.body.limit );
+
+    const resultPromises = paginatedDates.map( ( singleDate ) => {
+      const inputData = {
         start: startHour,
         end: endHour,
         interval: 60,
       };
       req.body.Date = singleDate;
-      let storedata = await livecountCheck( inputData, req );
-      result.push( storedata[0] );
-    }
+      return livecountCheck( inputData, singleDate, req );
+    } );
+
+    const result = await Promise.all( resultPromises );
+
     res.sendSuccess( {
       count: datesArray.length,
-      data: result,
+      data: result.flat(), // Flatten the array of arrays
     } );
   } catch ( error ) {
     logger.error( { error: error, function: 'datewiseDowntime' } );
@@ -897,73 +900,60 @@ export async function streamwiseDowntime( req, res ) {
 }
 
 
-export async function livecountCheck( inputData, req ) {
-  return new Promise( async ( Resolve, Reject ) => {
-    try {
-      let TimeSlots = generateTimeSlots( inputData.start, inputData.end, inputData.interval, req );
-      let timewise = [];
-      for ( const obj of TimeSlots ) {
-        obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
-        obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
-        let downTimeQuery = {
-          'size': 1,
-          'query': {
-            'bool': {
-              'must': [
-                {
-                  'term': {
-                    'doc.date.keyword': dayjs( obj.from ).format( 'DD-MM-YYYY' ),
-                  },
-                },
-                {
-                  'term': {
-                    'doc.store_id.keyword': req.body.storeId,
-                  },
-                },
-                {
-                  'terms': {
-                    'doc.hour.keyword': [ obj.hour ],
-                  },
-                },
-              ],
+export async function livecountCheck( inputData, singleDate, req ) {
+  try {
+    const TimeSlots = generateTimeSlots( inputData.start, inputData.end, inputData.interval, req );
 
-            },
+    const queryPromises = TimeSlots.map( async ( obj ) => {
+      obj.startTime = dayjs( obj.from ).format( 'hh:mm A' );
+      obj.endTime = dayjs( obj.to ).format( 'hh:mm A' );
+
+      const downTimeQuery = {
+        size: 1,
+        query: {
+          bool: {
+            must: [
+              { term: { 'doc.date.keyword': dayjs( obj.from ).format( 'DD-MM-YYYY' ) } },
+              { term: { 'doc.store_id.keyword': req.body.storeId } },
+              { terms: { 'doc.hour.keyword': [ obj.hour ] } },
+            ],
           },
-        };
-        const downtime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly, downTimeQuery );
-        let streamwiseDowntime = downtime.body.hits.hits.length > 0 ? downtime.body.hits.hits[0]._source.doc.streamwise_downtime : [];
-        if ( streamwiseDowntime.length > 0 ) {
-          const sum = streamwiseDowntime.reduce( ( accumulator, currentValue ) => {
-            return accumulator + currentValue.down_time;
-          }, 0 );
-          const average = sum / streamwiseDowntime.length;
-          obj[obj.startTime + '-' + obj.endTime] = Math.round( average );
-        } else {
-          obj[obj.startTime + '-' + obj.endTime] = '';
-        }
+        },
+      };
 
-        timewise.push( obj );
+      const downtime = await getOpenSearchData( JSON.parse( process.env.OPENSEARCH ).downTimeHourly, downTimeQuery );
+      const streamwiseDowntime = downtime.body.hits.hits.length > 0 ? downtime.body.hits.hits[0]._source.doc.streamwise_downtime : [];
+      if ( streamwiseDowntime.length > 0 ) {
+        const sum = streamwiseDowntime.reduce( ( accumulator, currentValue ) => accumulator + currentValue.down_time, 0 );
+        const average = sum / streamwiseDowntime.length;
+        obj[obj.startTime + '-' + obj.endTime] = Math.round( average );
+      } else {
+        obj[obj.startTime + '-' + obj.endTime] = '';
       }
-      const mergedData = {
-        Date: dayjs( req.body.Date ).format( 'YYYY-MM-DD' ),
-      };
-      timewise.forEach( ( obj ) => {
-        for ( const key in obj ) {
-          if ( key !== 'hour' && key !== 'from' && key !== 'to' && key !== 'startTime' && key !== 'endTime' && key !== 'clientId' ) {
-            if ( mergedData[key] ) {
-              mergedData[key] += obj[key];
-            } else {
-              mergedData[key] = obj[key];
-            }
+      return obj;
+    } );
+
+    const timewise = await Promise.all( queryPromises );
+
+
+    const mergedData = {
+      Date: dayjs( singleDate ).format( 'YYYY-MM-DD' ),
+    };
+
+    timewise.forEach( ( obj ) => {
+      for ( const key in obj ) {
+        if ( key !== 'hour' && key !== 'from' && key !== 'to' && key !== 'startTime' && key !== 'endTime' && key !== 'clientId' ) {
+          if ( mergedData[key] ) {
+            mergedData[key] += obj[key];
+          } else {
+            mergedData[key] = obj[key];
           }
         }
-      } );
+      }
+    } );
 
-      // Create an array with the merged data.
-      const mergedArray = [ mergedData ];
-      Resolve( mergedArray );
-    } catch ( err ) {
-      Reject( err );
-    }
-  } );
+    return [ mergedData ];
+  } catch ( err ) {
+    throw err;
+  }
 }

package/src/controllers/userInfra.controller.js

@@ -24,7 +24,8 @@ export async function userTakeTicket( req, res ) {
     if ( req.body.issueType == 'infra' ) {
       let query = {
         'status': { $ne: 'closed' },
-        'issueType': 'infra', 'ticketDetails.assigntoUser': true,
+        'issueType': 'infra',
+        'ticketDetails.assigntoUser': true,
         'ticketDetails.addressingUser': { $exists: false },
         'ticketDetails.issueStatus': 'notidentified',
         'ticketDetails.addressingClient': { $exists: false },
@@ -37,11 +38,12 @@ export async function userTakeTicket( req, res ) {
       if ( !userTicket ) {
         let query = {
           'status': { $ne: 'closed' },
-          'basicDetails.clientId': { $in: assignedClients },
           'issueType': 'infra',
-          'ticketType': 'refreshticket',
+          'ticketDetails.ticketType': 'refreshticket',
           'ticketDetails.refreshTicketStatus': 'notidentified',
         };
+        console.log( query, assignedClients );
+
         if ( assignedClients.length > 0 ) {
           query = ( { ...query, ...{ 'basicDetails.clientId': { $in: assignedClients } } } );
         }
@@ -352,7 +354,6 @@ export async function workHistory( req, res ) {
         $match: {
           $and: [
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { 'status': 'closed' },
             { issueType: req.body.issueType },
             { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
           ],
@@ -363,7 +364,6 @@ export async function workHistory( req, res ) {
         $match: {
           $and: [
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { 'status': 'closed' },
             { issueType: { $in: [ 'highcount', 'lowcount' ] } },
             { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
           ],
@@ -420,6 +420,18 @@ export async function workHistory( req, res ) {
             },
         );
       }
+    } else {
+      query.push(
+          {
+            $match: {
+              $and: [
+                { createdAt: { $gte: date.start } },
+                { createdAt: { $lte: date.end } },
+              ],
+
+            },
+          },
+      );
     }
 
     if ( req.body.storeFilter && req.body.storeFilter.length > 0 ) {
@@ -537,6 +549,8 @@ export async function workHistory( req, res ) {
             'Closed on': element.issueClosedDate,
             'Issue Identified on': element.issueIdentifiedDate,
             'Issue Type': element.infraIssue ? element.infraIssue : '-',
+            'Status': element.status,
+
           };
         }
         if ( req.body.issueType === 'dataMismatch' ) {
@@ -550,6 +564,7 @@ export async function workHistory( req, res ) {
             'Issue date': dayjs( element.issueDate ).format( 'DD MMM, YYYY' ),
             'Closed on': element.issueClosedDate,
             'Issue Type': element.issueType ? element.issueType : '-',
+            'Status': element.status,
           };
         }
         exportdata.push( data );