tango-app-api-infra 3.1.12 → 3.1.14

package/index.js

@@ -6,9 +6,10 @@ import { userInfraRouter } from './src/routes/userInfra.routes.js';
 import { storeInfraRouter } from './src/routes/storeInfra.routes.js';
 import { clientInfraRouter } from './src/routes/clientInfra.routes.js';
 import { employeeTrainigRouter } from './src/routes/employeetrainig.routes.js';
-import { dataMismatchRouter } from './src/routes/dataMismatch.routes.js';
+import { dataMismatchTicketRouter } from './src/routes/dataMismatch.routes.js';
+import { infraDocs } from './src/docs/infra.docs.js';
 
 
-export { infraRouter, internalInfraRouter, userInfraRouter, storeInfraRouter, dataMismatchRouter, clientInfraRouter, employeeTrainigRouter };
+export { infraRouter, internalInfraRouter, userInfraRouter, storeInfraRouter, dataMismatchTicketRouter, clientInfraRouter, employeeTrainigRouter, infraDocs };
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.1.12",
+    "version": "3.1.14",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -22,10 +22,12 @@
         "express-fileupload": "^1.5.0",
         "handlebars": "^4.7.8",
         "html-pdf-node": "^1.0.8",
+        "joi-to-swagger": "^6.2.0",
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
-        "tango-api-schema": "^2.0.94",
-        "tango-app-api-middleware": "^3.1.7",
+        "swagger-ui-express": "^5.0.0",
+        "tango-api-schema": "^2.0.104",
+        "tango-app-api-middleware": "^3.1.11",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/clientInfra.controller.js

@@ -1,16 +1,16 @@
 
-import { aggregateStore, countDocumentsStore } from '../services/store.service.js';
+import { countDocumentsStore } from '../services/store.service.js';
 import { logger, download, getUTC } from 'tango-app-api-middleware';
 import { aggregateTangoTicket } from '../services/tangoTicket.service.js';
 import { findinfraReason } from '../services/infraReason.service.js';
-import { aggregateClient } from '../services/client.service.js';
+import { aggregateClient, findClient } from '../services/client.service.js';
 import dayjs from 'dayjs';
 import { getOpenSearchData } from 'tango-app-api-middleware';
 
 export async function infraCard( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
-    let storeCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId }, 'edge.firstFile': true, 'status': 'active' } );
+    let storeCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId }, 'createdAt': { $lte: date.end }, 'edge.firstFile': true, 'status': 'active' } );
     let infraStoreCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -18,7 +18,7 @@ export async function infraCard( req, res ) {
             { issueType: 'infra' },
             { status: { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: date.start } },
+            // { createdAt: { $gte: date.start } },
             { createdAt: { $lte: date.end } },
           ],
         },
@@ -54,7 +54,7 @@ export async function infraCard( req, res ) {
           { status: { $ne: 'closed' } },
           { 'ticketDetails.issueStatus': 'identified' },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
-          { createdAt: { $gte: date.start } },
+          // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
       },
@@ -134,6 +134,14 @@ export async function infraCard( req, res ) {
         count: 0,
       } ) );
     }
+    response.unshift( {
+      name: 'All Issues',
+      count: infraStoreCount.length > 0 ? infraStoreCount[0].identifiedcount : 0,
+    } );
+    response.push( {
+      name: 'Issues Not Identified',
+      count: infraStoreCount.length > 0 ? infraStoreCount[0].infraCount - infraStoreCount[0].identifiedcount : 0,
+    } );
     res.sendSuccess( {
       total: storeCount,
       liveStoreCount: infraStoreCount.length > 0 ? storeCount - infraStoreCount[0].infraCount : 0,
@@ -149,15 +157,21 @@ export async function infraCard( req, res ) {
 }
 export async function installationCard( req, res ) {
   try {
+    let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
     let onboardedCount = await countDocumentsStore( {
       '$and': [
         { 'clientId': { $in: req.body.clientId } },
+        { 'createdAt': { $lte: date.end } },
       ],
     } );
-    let installedCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId },
-      'edge.firstFile': true, 'status': 'active' } );
-    let deactiveCount = await countDocumentsStore( { 'clientId': { $in: req.body.clientId },
-      'status': 'deactive' } );
+    let installedCount = await countDocumentsStore( {
+      'clientId': { $in: req.body.clientId },
+      'edge.firstFile': true, 'status': 'active', 'createdAt': { $lte: date.end },
+    } );
+    let deactiveCount = await countDocumentsStore( {
+      'clientId': { $in: req.body.clientId },
+      'status': 'deactive',
+    } );
     let yettoInstallCount = await aggregateTangoTicket( [
       {
         $match: {
@@ -166,7 +180,7 @@ export async function installationCard( req, res ) {
             { 'status': { $ne: 'closed' } },
             { 'ticketDetails.issueStatus': 'notidentified' },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: new Date( req.body.fromDate ) } },
+            { createdAt: { $lte: new Date( req.body.toDate ) } },
           ],
         },
       },
@@ -178,7 +192,7 @@ export async function installationCard( req, res ) {
           { 'status': { $ne: 'closed' } },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
           { 'ticketDetails.issueStatus': 'identified' },
-          { createdAt: { $gte: new Date( req.body.fromDate ) } },
+          { createdAt: { $lte: new Date( req.body.toDate ) } },
         ],
       },
     },
@@ -265,14 +279,18 @@ export async function installationCard( req, res ) {
 export async function infraIssuesTable( req, res ) {
   try {
     let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
+    let issueStatus = 'identified';
+    if ( req.body.filterIssue == 'Issues Not Identified' ) {
+      issueStatus = 'notidentified';
+    };
     let query = [ {
       $match: {
         $and: [
           { issueType: 'infra' },
           { status: { $ne: 'closed' } },
           { 'basicDetails.clientId': { $in: req.body.clientId } },
-          { 'ticketDetails.issueStatus': 'identified' },
-          { createdAt: { $gte: date.start } },
+          { 'ticketDetails.issueStatus': issueStatus },
+          // { createdAt: { $gte: date.start } },
           { createdAt: { $lte: date.end } },
         ],
       },
@@ -343,7 +361,7 @@ export async function infraIssuesTable( req, res ) {
       },
     },
     ];
-    if ( req.body.filterIssue && req.body.filterIssue != '' ) {
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'All Issues' && req.body.filterIssue != 'Issues Not Identified' ) {
       query.push( {
         $match: {
           primaryIssue: req.body.filterIssue,
@@ -418,9 +436,10 @@ export async function InstallationIssuesTable( req, res ) {
         $match: {
           $and: [
             { issueType: 'installation' },
+            { 'status': { $ne: 'closed' } },
             { 'basicDetails.clientId': { $in: req.body.clientId } },
-            { createdAt: { $gte: new Date( req.body.fromDate ) } },
-            // { createdAt: { $lte: new Date( req.body.toDate ) } },
+            // { createdAt: { $gte: new Date( req.body.fromDate ) } },
+            { createdAt: { $lte: new Date( req.body.toDate ) } },
           ],
         },
       },
@@ -537,11 +556,15 @@ export async function InstallationIssuesTable( req, res ) {
 export async function hourWiseDownClients( req, res ) {
   try {
     let inputData = req.body;
-
+    let clientList = await findClient( { clientId: { $in: req.body.clientId }, status: 'active' } );
+    let activeClient = [];
+    for ( let client of clientList ) {
+      activeClient.push( client.clientId );
+    }
     let query = [
       {
         $match: {
-          clientId: { $in: req.body.clientId },
+          clientId: { $in: activeClient },
         },
       },
       {
@@ -685,22 +708,55 @@ function generateTimeSlots( startHour, endHour, interval, time ) {
 export async function hourWiseDownstores( req, res ) {
   try {
     let inputData = req.body;
-    inputData.Date = dayjs().format( 'YYYY-MM-DD' );
+    inputData.Date = dayjs( req.body.toDate ).format( 'YYYY-MM-DD' );
 
     let query = [ {
       $match: {
-        clientId: req.body.clientId,
-        status: 'active',
+        $and: [
+          { 'basicDetails.clientId': req.body.clientId },
+          { 'status': { $ne: 'closed' } },
+          { 'issueDate': { $lte: new Date( req.body.toDate ) } },
+        ],
+      },
+    },
+    {
+      $project: {
+        storeId: '$basicDetails.storeId',
+        storeName: '$basicDetails.storeName',
+        primaryIssue: {
+          $filter: {
+            input: '$ticketActivity',
+            as: 'item',
+            cond: { $eq: [ '$$item.actionType', 'issueUpdate' ] },
+          },
+        },
+      },
+    },
+    {
+      $unwind: {
+        path: '$primaryIssue', preserveNullAndEmptyArrays: true,
+      },
+    },
+    {
+      $unwind: {
+        path: '$primaryIssue.reasons', preserveNullAndEmptyArrays: true,
       },
     },
     {
       $project: {
         storeId: 1,
         storeName: 1,
-        storeProfile: 1,
+        primaryIssue: { $ifNull: [ '$primaryIssue.reasons.primaryIssue', 'NotIdentified' ] },
+      },
+    },
+    {
+      $group: {
+        _id: '$storeId',
+        storeId: { $first: '$storeId' },
+        storeName: { $first: '$storeName' },
+        primaryIssue: { $last: '$primaryIssue' },
       },
     },
-
     ];
     if ( req.body.searchValue && req.body.searchValue !== '' ) {
       query.push( {
@@ -717,14 +773,21 @@ export async function hourWiseDownstores( req, res ) {
         $sort: { [req.body.sortColumName]: req.body.sortBy },
       } );
     }
-    let count = await aggregateStore( query );
+    if ( req.body.filterIssue && req.body.filterIssue != '' && req.body.filterIssue != 'All Issues' && req.body.filterIssue != 'Issues Not Identified' ) {
+      query.push( {
+        $match: {
+          primaryIssue: req.body.filterIssue,
+        },
+      } );
+    }
+    let count = await aggregateTangoTicket( query );
     if ( req.body.limit && req.body.offset && !req.body.export ) {
       query.push(
           { $skip: ( req.body.offset - 1 ) * req.body.limit },
           { $limit: Number( req.body.limit ) },
       );
     }
-    let storeslist = await aggregateStore( query );
+    let storeslist = await aggregateTangoTicket( query );
     if ( storeslist.length == 0 ) {
       return res.sendError( 'no data', 204 );
     }
@@ -733,6 +796,7 @@ export async function hourWiseDownstores( req, res ) {
     for ( const store of storeslist ) {
       data.storeId = store.storeId;
       data.storeName = store.storeName;
+      data.primaryIssue = store.primaryIssue;
       let storedata = await downStoresCheck( data, inputData );
       result.push( storedata[0] );
     }
@@ -801,7 +865,7 @@ function downStoresCheck( data, inputData ) {
       const mergedData = {
         storeName: data.storeName,
         storeId: data.storeId,
-
+        PrimaryIssue: data.primaryIssue,
       };
       timewise.forEach( ( obj ) => {
         for ( const key in obj ) {

package/src/controllers/dataMismatch.controller.js

@@ -1,6 +1,8 @@
 
-import { findOneTangoTicket, createTangoTicket } from '../services/tangoTicket.service.js';
-import { logger } from 'tango-app-api-middleware';
+import { findOneTangoTicket, createTangoTicket, updateOneTangoTicket, aggregateTangoTicket, countDocumentsTangoTicket } from '../services/tangoTicket.service.js';
+import { logger, getUTC, appConfig, fileUpload, signedUrl, sendMessageToQueue } from 'tango-app-api-middleware';
+import dayjs from 'dayjs';
+
 export async function createTicket( req, res ) {
   try {
     let ticketExist = await findOneTangoTicket( { 'issueType': req.body.issueType, 'issueDate': ( new Date( req.body.Date ) ), 'basicDetails.storeId': req.body.storeId } );
@@ -8,11 +10,58 @@ export async function createTicket( req, res ) {
     if ( ticketExist ) {
       return res.sendSuccess( 'MAT Ticket Already Exists for the store' );
     }
+    let actionBy = '';
+    if ( req.user.userType == 'tango' ) {
+      actionBy = 'Tango';
+    } else if ( req.user.userType == 'client' ) {
+      actionBy = 'User';
+    }
     req.body.ticketDetails = {};
-    req.body.ticketDetails.dataMismatch = req.body.dataMismatch;
+    req.body.dataMismatch ={
+      actualCount: req.body.actualCount,
+      expectedCount: req.body.expectedCount,
+      contactEmail: req.body.contactEmail,
+    };
     req.body.issueDate = new Date( req.body.Date );
     req.body.ticketId = 'TE_DM_' + new Date().valueOf();
     let create = await createTangoTicket( req.body );
+    let getObject = {};
+    if ( req.files ) {
+      let params = {
+        Bucket: appConfig.cloud.aws.bucket.ticket,
+        Key: create.ticketId + '/',
+        ContentType: 'multipart/form-data',
+        body: req.files.img.data,
+        fileName: req.files.img.name,
+      };
+      let upload = await fileUpload( params );
+      if ( upload ) {
+        getObject = {
+          fileName: req.files.img.name,
+          filePath: create.ticketId + '/' + req.files.img.name,
+        };
+      }
+    }
+    req.body.ticketActivity = [ {
+      actionType: 'Created',
+      timeStamp: new Date(),
+      actionBy: actionBy,
+      IdentifiedBy: req.user.userName,
+      description: req.body.description,
+      attachments: [ getObject ],
+    } ];
+    await updateOneTangoTicket( { ticketId: create.ticketId }, { ticketActivity: req.body.ticketActivity } );
+
+    const ticket = await findOneTangoTicket( { ticketId: req.body.ticketId }, { 'issueDate': 1, 'basicDetails': 1, 'issueType': 1, 'dataMismatch.contactEmail': 1, '_id': 0 } );
+
+    const obj = {
+      storeId: ticket.basicDetails.storeId,
+      issueDate: dayjs( ticket.issueDate ).format( 'DD-MM-YYYY' ),
+    };
+
+    if ( req.body.issueType === 'highcount' ) {
+      await sendMessageToQueue( `${appConfig.cloud.aws.sqs.url}${appConfig.cloud.aws.sqs.highcountTopic}`, JSON.stringify( obj ) );
+    }
     if ( create ) {
       res.sendSuccess( 'Ticket Created Successfully' );
     }
@@ -21,3 +70,165 @@ export async function createTicket( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+
+export async function updateMat( req, res ) {
+  try {
+    let updateValue = {};
+    if ( req.body.actionType && req.body.actionType != '' ) {
+      let actionBy = '';
+      if ( req.user.userType == 'tango' ) {
+        actionBy = 'Tango';
+      } else if ( req.user.userType == 'client' ) {
+        actionBy = 'User';
+      }
+      req.body.ticketActivity.push( {
+        actionType: req.body.actionType,
+        actionBy: actionBy,
+        timeStamp: new Date(),
+        IdentifiedBy: req.user.userName,
+        description: req.body.description,
+        attachments: req.body.attachments,
+      } );
+      updateValue = { ticketActivity: req.body.ticketActivity };
+    }
+
+    let updateTicket = await updateOneTangoTicket( { ticketId: req.body.ticketId }, updateValue );
+    if ( updateTicket ) {
+      res.sendSuccess( 'Ticket Updated  Successfully' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'updateMat' } );
+    return res.sendError( error, 500 );
+  }
+}
+
+
+export async function activityList( req, res ) {
+  try {
+    let date = await getUTC( new Date( req.body.fromDate ), new Date( req.body.toDate ) );
+    let query = [ {
+      $match: {
+        $and: [
+          { 'basicDetails.storeId': req.body.storeId },
+          { issueType: { $in: [ 'lowcount', 'highcount' ] } },
+          { createdAt: { $gte: date.start } },
+          { createdAt: { $lte: date.end } },
+        ],
+      },
+    },
+    {
+      $project: {
+        storeId: '$basicDetails.storeId',
+        status: 1,
+        issueDate: '$issueDate',
+        Date: { $dateToString: { format: '%d-%m-%Y', date: '$createdAt' } },
+        issueClosedDate: 1,
+        ticketId: 1,
+        issueType: 1,
+        ticketActivity: 1,
+        comments: { $size: '$ticketActivity' },
+      },
+    },
+    {
+      $unwind: {
+        path: '$ticketActivity', preserveNullAndEmptyArrays: true,
+      },
+    },
+    {
+      $group: {
+        _id: '$ticketId',
+        storeId: { $first: '$storeId' },
+        Date: { $first: '$Date' },
+        issueClosedDate: { $first: '$issueClosedDate' },
+        status: { $first: '$status' },
+        issueDate: { $first: '$issueDate' },
+        ticketId: { $first: '$ticketId' },
+        issueType: { $first: '$issueType' },
+        comments: { $first: '$comments' },
+        description: { $last: '$ticketActivity.description' },
+      },
+    },
+    {
+      $sort: {
+        issueDate: -1,
+      },
+    },
+    ];
+
+    if ( req.body.filter && req.body.filter !== '' ) {
+      query.push( {
+        $match: {
+          issueType: req.body.filter,
+        },
+      } );
+    }
+    let ticketList = await aggregateTangoTicket( query );
+    if ( req.body.export && ticketList.length > 0 ) {
+      const exportdata = [];
+      ticketList.forEach( ( element ) => {
+        exportdata.push( {
+          'STORE ID': element.storeId,
+          'TICKET ID': element.ticketId,
+          'DATE': element.Date,
+          'ISSUE CLOSED DATE': element.issueClosedDate,
+          'STATUS': element.status,
+          'COMMENT': element.description,
+        } );
+      } );
+      await download( exportdata, res );
+      return;
+    }
+    if ( ticketList.length ) {
+      let highCount = await countDocumentsTangoTicket( {
+        $and: [
+          { 'basicDetails.storeId': req.body.storeId },
+          { issueType: 'highcount' },
+          { createdAt: { $gte: date.start } },
+          { createdAt: { $lte: date.end } },
+        ],
+      } );
+      let lowCount = await countDocumentsTangoTicket( {
+        $and: [
+          { 'basicDetails.storeId': req.body.storeId },
+          { issueType: 'lowcount' },
+          { createdAt: { $gte: date.start } },
+          { createdAt: { $lte: date.end } },
+        ],
+      } );
+
+      res.sendSuccess( {
+        count: ticketList.length,
+        data: ticketList,
+        highCount: highCount,
+        lowCount: lowCount,
+      } );
+    } else {
+      return res.sendError( 'NO data', 204 );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'activityList' } );
+    return res.sendError( error, 500 );
+  }
+}
+
+
+export async function showActivity( req, res ) {
+  try {
+    for ( let activity of req.body.ticketActivity ) {
+      if ( activity.attachments&&activity.attachments.length>0 ) {
+        for ( let attchment of activity.attachments ) {
+          let params = {
+            Bucket: appConfig.cloud.aws.bucket.ticket,
+            file_path: attchment.filePath,
+          };
+          let attachments = await signedUrl( params );
+          attchment.signedUrl = attachments;
+        }
+      }
+    }
+    res.sendSuccess( req.body );
+  } catch ( error ) {
+    logger.error( { error: error, function: 'showActivity' } );
+    return res.sendError( error, 500 );
+  }
+}

package/src/controllers/employeeTraning.controller.js

@@ -5,7 +5,7 @@ export async function createTicket( req, res ) {
   try {
     let ticketExist = await findOneTangoTicket( { 'issueType': req.body.issueType, 'basicDetails.storeId': req.body.storeId } );
     if ( ticketExist ) {
-      return res.sendSuccess( 'MAT Ticket Already Exists for the store' );
+      return res.status( 409 ).send( 'DataMismatch Ticket Already Exists for the store' );
     }
 
     req.body.issueDate = new Date( req.body.Date );
@@ -48,3 +48,16 @@ export async function activityLog( req, res ) {
     return res.sendError( error, 500 );
   }
 }
+
+
+export async function updateMatStatus( req, res ) {
+  try {
+    let update = await updateOneTangoTicket( { ticketId: req.body.ticketId }, { 'ticketDetails.matStatus': req.body.matStatus } );
+    if ( update ) {
+      res.sendSuccess( 'Updated Successfully' );
+    }
+  } catch ( error ) {
+    logger.error( { error: error, function: 'updateMatStatus' } );
+    return res.sendError( error, 500 );
+  }
+}