tango-app-api-infra 3.0.15 → 3.0.16

package/package.json

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

package/src/controllers/clientInfra.controller.js

@@ -1,9 +1,9 @@
 
-import { countDocumentsStore, findStorewithpagination } from '../services/store.service.js';
+import { aggregateStore, countDocumentsStore } from '../services/store.service.js';
 import { logger, download } from 'tango-app-api-middleware';
 import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findinfraReason } from '../services/infraReason.service.js';
-import { findClientwithpagination } from '../services/client.service.js';
+import { aggregateClient } from '../services/client.service.js';
 import dayjs from 'dayjs';
 import { getOpenSearchData } from 'tango-app-api-middleware';
 
@@ -91,7 +91,7 @@ export async function infraCard( req, res ) {
       },
     },
     ];
-    if ( req.body.filter&&req.body.filter.length>0 ) {
+    if ( req.body.filter && req.body.filter.length > 0 ) {
       query.push(
           {
             $match: {
@@ -336,7 +336,7 @@ export async function infraIssuesTable( req, res ) {
       );
     }
     let result = await aggregateTangoTicket( query );
-    if ( req.body.export ) {
+    if ( req.body.export && result.length > 0 ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         exportdata.push( {
@@ -445,13 +445,47 @@ export async function InstallationIssuesTable( req, res ) {
 export async function hourWiseDownClients( req, res ) {
   try {
     let inputData = req.body;
-    let skip = 0;
-    let limit = 10;
+
+    let query = [
+      {
+        $match: {
+          clientId: { $in: req.body.clientId },
+        },
+      },
+      {
+        $project: {
+          clientId: 1,
+          clientName: 1,
+        },
+      },
+    ];
+
+
+    if ( req.body.searchValue && req.body.searchValue !== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { clientName: { $regex: req.body.searchValue, $options: 'i' } },
+          ],
+        },
+      } );
+    }
+    if ( req.body.sortColumName && req.body.sortColumName != '' && req.body.sortBy && req.body.sortBy != '' ) {
+      query.push( {
+        $sort: { [req.body.sortColumName]: req.body.sortBy },
+      } );
+    }
+    let count = await aggregateClient( query );
     if ( req.body.limit && req.body.offset && !req.body.export ) {
-      skip = ( req.body.offset - 1 ) * req.body.limit,
-      limit = Number( req.body.limit );
+      query.push(
+          { $skip: ( req.body.offset - 1 ) * req.body.limit },
+          { $limit: Number( req.body.limit ) },
+      );
+    }
+    let clientlist = await aggregateClient( query );
+    if ( clientlist.length == 0 ) {
+      return res.sendError( 'no data', 204 );
     }
-    let clientlist = await findClientwithpagination( { clientId: { $in: req.body.clientId } }, { clientId: 1, clientName: 1 }, skip, limit );
     let data = {};
     let result = [];
     for ( const client of clientlist ) {
@@ -460,7 +494,7 @@ export async function hourWiseDownClients( req, res ) {
       let clientdata = await livecountCheck( data, inputData );
       result.push( clientdata[0] );
     }
-    res.sendSuccess( { result: result } );
+    res.sendSuccess( { count: count.length, result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'hourWiseDownClients' } );
     return res.sendError( error, 500 );
@@ -556,13 +590,47 @@ export async function hourWiseDownstores( req, res ) {
   try {
     let inputData = req.body;
     inputData.Date = dayjs().format( 'YYYY-MM-DD' );
-    let skip = 0;
-    let limit = 10;
+
+    let query = [ {
+      $match: {
+        clientId: req.body.clientId,
+      },
+    },
+    {
+      $project: {
+        storeId: 1,
+        storeName: 1,
+        storeProfile: 1,
+      },
+    },
+
+    ];
+    if ( req.body.searchValue && req.body.searchValue !== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { storeName: { $regex: req.body.searchValue, $options: 'i' } },
+            { storeId: { $regex: req.body.searchValue, $options: 'i' } },
+          ],
+        },
+      } );
+    }
+    if ( req.body.sortColumName && req.body.sortColumName != '' && req.body.sortBy && req.body.sortBy != '' ) {
+      query.push( {
+        $sort: { [req.body.sortColumName]: req.body.sortBy },
+      } );
+    }
+    let count = await aggregateStore( query );
     if ( req.body.limit && req.body.offset && !req.body.export ) {
-      skip = ( req.body.offset - 1 ) * req.body.limit,
-      limit = Number( req.body.limit );
+      query.push(
+          { $skip: ( req.body.offset - 1 ) * req.body.limit },
+          { $limit: Number( req.body.limit ) },
+      );
+    }
+    let storeslist = await aggregateStore( query );
+    if ( storeslist.length == 0 ) {
+      return res.sendError( 'no data', 204 );
     }
-    let storeslist = await findStorewithpagination( { clientId: req.body.clientId }, { storeId: 1, storeName: 1, storeProfile: 1 }, skip, limit );
     let data = {};
     let result = [];
     for ( const store of storeslist ) {
@@ -571,7 +639,7 @@ export async function hourWiseDownstores( req, res ) {
       let storedata = await downStoresCheck( data, inputData );
       result.push( storedata[0] );
     }
-    res.sendSuccess( { result: result } );
+    res.sendSuccess( { count: count.length, result: result } );
   } catch ( error ) {
     logger.error( { error: error, function: 'hourWiseDownstores' } );
     return res.sendError( error, 500 );

package/src/controllers/infra.controllers.js

@@ -2,7 +2,9 @@
 
 import { createTangoTicket, findOneTangoTicket, updateOneTangoTicket } from '../services/tangoTicket.service.js';
 import { createinfraReason, findinfraReason } from '../services/infraReason.service.js';
-import { logger } from 'tango-app-api-middleware';
+import { updateOneStore } from '../services/store.service.js';
+import { logger, fileUpload } from 'tango-app-api-middleware';
+import dayjs from 'dayjs';
 export async function createTicket( req, res ) {
   try {
     req.body.issueDate = new Date( req.body.Date );
@@ -124,8 +126,30 @@ export async function AlertTicketReply( req, res ) {
       statusCheckReply: req.body.statusCheckReply,
       hibernationDays: req.body.hibernationDays,
     } );
+    await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketActivity': req.body.ticketActivity } );
+    if ( req.body.hibernationDays ) {
+      req.body.hibernationDays = dayjs().add( req.body.hibernationDays, 'days' ).format( 'YYYY-MM-DD' );
+      await updateOneStore( { storeId: req.body.basicDetails.storeId }, { 'ticketConfigs.hibernation': new Date( req.body.hibernationDays ) } );
+    }
+    res.sendSuccess( 'Updated Successfully' );
   } catch ( error ) {
     logger.error( { error: error, function: 'AlertTicketReply' } );
     return res.sendError( error, 500 );
   }
 }
+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 );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'uploadAttachments' } );
+    return res.sendError( error, 500 );
+  }
+}

package/src/controllers/internalInfra.controller.js

@@ -1,6 +1,11 @@
 
 import { logger } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc.js';
+import timezone from 'dayjs/plugin/timezone.js';
+import 'dayjs/locale/en.js';
+dayjs.extend( utc );
+dayjs.extend( timezone );
 import { createClient, findClient } from '../services/client.service.js';
 import { createStore, findStore, updateOneStore } from '../services/store.service.js';
 import { findTangoTicket, findOneTangoTicket, updateOneTangoTicket } from '../services/tangoTicket.service.js';
@@ -98,8 +103,7 @@ export async function setTicketTime( req, res ) {
 
 export async function downStoresList( req, res ) {
   try {
-    let getCurrentHour = dayjs().startOf( 'hour' ).format( 'YYYY-MM-DDTHH:mm' );
-    let storesList = await findStore( { 'ticketConfigs.nextTicektGenerationTime': new Date( getCurrentHour ) }, { storeId: 1, storeName: 1, storeProfile: 1, ticketConfigs: 1 } );
+    let storesList = await findStore( { 'ticketConfigs.hibernation': { $lt: new Date() }, 'ticketConfigs.nextTicektGenerationTime': new Date( req.body.getTime ) }, { storeId: 1, storeName: 1, storeProfile: 1, ticketConfigs: 1 } );
     if ( storesList.length > 0 ) {
       res.sendSuccess( storesList );
     } else {

package/src/controllers/userInfra.controller.js

@@ -139,6 +139,7 @@ export async function workHistory( req, res ) {
       $match: {
         $and: [
           { 'status': 'closed' },
+          { issueType: req.body.issueType },
           { 'ticketDetails.addressingUser': new mongoose.Types.ObjectId( req.body.userId ) },
           { createdAt: { $gte: new Date( req.body.fromDate ) } },
           { createdAt: { $lte: new Date( req.body.toDate ) } },

package/src/routes/infra.routes.js

@@ -2,7 +2,7 @@
 import express from 'express';
 import { isAllowedSessionHandler } from 'tango-app-api-middleware';
 import { validateDetails, validateTicket, ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert } from '../validations/infra.validation.js';
-import { createTicket, updateStatus, createReason, PrimaryReasons, secondaryReason, updateTicketIssue, viewTicket, AlertTicketReply } from '../controllers/infra.controllers.js';
+import { createTicket, updateStatus, createReason, PrimaryReasons, secondaryReason, updateTicketIssue, viewTicket, AlertTicketReply, uploadAttachments } from '../controllers/infra.controllers.js';
 
 
 export const infraRouter = express.Router();
@@ -15,5 +15,6 @@ infraRouter.post( '/secondaryReason', isAllowedSessionHandler, secondaryReason )
 infraRouter.post( '/updateTicketIssue', isAllowedSessionHandler, ticketExists, infraReasonExists, InfrastepstoResolve, InfraAlert, updateTicketIssue );
 infraRouter.post( '/viewTicket', isAllowedSessionHandler, ticketExists, viewTicket );
 infraRouter.post( '/AlertTicketReply', isAllowedSessionHandler, ticketExists, AlertTicketReply );
+infraRouter.put( '/uploadAttachments/:ticketId', isAllowedSessionHandler, ticketExists, uploadAttachments );
 
 

package/src/services/client.service.js

@@ -13,3 +13,6 @@ export async function findOneClient( query, project ) {
 export async function findClientwithpagination( query, project ) {
   return await dataModel.clientModel.find( query, project );
 }
+export async function aggregateClient( query ) {
+  return await dataModel.clientModel.aggregate( query );
+}

package/src/validations/infra.validation.js

@@ -71,9 +71,10 @@ export async function validateTicket( req, res, next ) {
 };
 export async function ticketExists( req, res, next ) {
   try {
+    let ticketId = req.body.ticketId?req.body.ticketId:req.params.ticketId;
     let Ticket = await findOneTangoTicket(
         {
-          ticketId: req.body.ticketId,
+          ticketId: ticketId,
         },
     );
     if ( !Ticket ) {