tango-app-api-infra 3.0.94-dev → 3.0.97-dev

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-infra",
-    "version": "3.0.94-dev",
+    "version": "3.0.97-dev",
     "description": "infra",
     "main": "index.js",
     "type": "module",
@@ -26,7 +26,7 @@
         "mongodb": "^6.4.0",
         "nodemon": "^3.1.0",
         "swagger-ui-express": "^5.0.0",
-        "tango-api-schema": "^2.0.103",
+        "tango-api-schema": "^2.0.113",
         "tango-app-api-middleware": "^1.0.73-test",
         "winston": "^3.12.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/clientInfra.controller.js

@@ -187,7 +187,6 @@ export async function installationCard( req, res ) {
     } );
     let installedCount = await countDocumentsStore( {
       'clientId': { $in: req.body.clientId },
-      'edge.firstFile': true,
       'status': 'active',
       'createdAt': { $lte: date.end },
     } );
@@ -290,7 +289,7 @@ export async function installationCard( req, res ) {
     res.sendSuccess( {
       onboardedStoresCount: onboardedCount,
       inactiveStoresCount: deactiveCount,
-      installedStoresCount: installedCount,
+      installedStoresCount: installedCount-yettoInstallCount.length,
       yettoInstallCount: yettoInstallCount.length,
       installFailedCount: installFailedCount.length,
       infraIssues: response,
@@ -346,6 +345,7 @@ export async function infraIssuesTable( req, res ) {
         clientId: '$basicDetails.clientId',
         ticketId: 1,
         storeName: '$basicDetails.storeName',
+        clientName: '$basicDetails.clientName',
         status: 1,
         createdAt: 1,
         issueIdentifiedDate: '$ticketDetails.issueIdentifiedDate',
@@ -381,6 +381,7 @@ export async function infraIssuesTable( req, res ) {
         storeName: 1,
         createdAt: 1,
         ticketId: 1,
+        clientName: 1,
         actionBy: '$primaryIssue.actionBy',
         issueIdentifiedDate: { $ifNull: [ '$issueIdentifiedDate', '' ] },
         issueClosedDate: { $ifNull: [ '$issueClosedDate', '' ] },
@@ -397,6 +398,7 @@ export async function infraIssuesTable( req, res ) {
         ticketId: { $first: '$ticketId' },
         actionBy: { $first: '$actionBy' },
         storeName: { $first: '$storeName' },
+        clientName: { $first: '$clientName' },
         createdAt: { $first: '$createdAt' },
         issueIdentifiedDate: { $last: '$issueIdentifiedDate' },
         issueClosedDate: { $last: '$issueClosedDate' },
@@ -513,13 +515,13 @@ export async function infraIssuesTable( req, res ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         exportdata.push( {
-          'CREATED AT': element.createdAt,
-          'STORE ID': element.storeId,
-          'STORE NAME': element.storeName,
-          'PRIMARY ISSUE': element.primaryIssue,
-          'SUB ISSUE': element.secondaryIssue,
-          'ISSUE IDENTIFIED ON': dayjs( element.issueIdentifiedDate ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm A' ),
-          'STATUS': element.status,
+          'Created On': element.createdAt,
+          'StoreID': element.storeId,
+          'StoreName': element.storeName,
+          'Primary Issue': element.primaryIssue,
+          'Sub Issue': element.secondaryIssue,
+          'Issue Identified on': element.issueIdentifiedDate? dayjs( element.issueIdentifiedDate ).tz( 'Asia/Kolkata' ).format( 'YYYY-MM-DD HH:mm A' ):'',
+          'Status': element.status,
         } );
       } );
       await download( exportdata, res );
@@ -547,7 +549,6 @@ export async function InstallationIssuesTable( req, res ) {
         $and: [
           { issueType: 'installation' },
           { 'status': { $ne: 'closed' } },
-
           { 'basicDetails.clientId': { $in: req.body.clientId } },
           { createdAt: { $lte: date.end } },
         ],
@@ -559,6 +560,9 @@ export async function InstallationIssuesTable( req, res ) {
     if ( req.body.installtionfilterIssue == 'installFailedStores' ) {
       query.push( { $match: { 'ticketDetails.issueStatus': 'identified' } } );
     }
+    if ( req.body.installtionfilterIssue == 'installedStores' ) {
+      query.push( { $match: { 'ticketDetails.issueStatus': 'notidentified' } } );
+    }
     query.push( {
       $project: {
         createdAt: 1,
@@ -624,11 +628,16 @@ export async function InstallationIssuesTable( req, res ) {
       );
     }
     if ( req.body.installtionfilterIssue == 'installedStores' ) {
+      let pendingstorecount = await aggregateTangoTicket( query );
+      let ticketStore = [];
+      for ( let store of pendingstorecount ) {
+        ticketStore.push( store.storeId );
+      }
       storesQuery.push( {
         $match: {
           '$and': [
             { 'clientId': { $in: req.body.clientId } },
-            { 'edge.firstFile': true },
+            { 'storeId': { $nin: ticketStore } },
             { 'status': 'active' },
             { 'createdAt': { $lte: date.end } },
           ],
@@ -752,10 +761,10 @@ export async function InstallationIssuesTable( req, res ) {
       const exportdata = [];
       storesList.forEach( ( element ) => {
         exportdata.push( {
-          'CLIENT NAME': element.clientName,
-          'STORE ID': element.storeId,
-          'STORE NAME': element.storeName,
-          'STATUS': element.status,
+          'Client Name': element.clientName,
+          'Store ID': element.storeId,
+          'Store Name': element.storeName,
+          'Status': element.status,
         } );
       } );
       await download( exportdata, res );
@@ -1211,6 +1220,9 @@ export async function ticketCountSplit( req, res ) {
       { issueType: { $in: [ 'highcount', 'lowcount' ] } },
 
     ];
+    if ( req.user.userType === 'client' ) {
+      filter.push( { 'dataMismatch.showToClient': true } );
+    }
     if ( inputData?.issueType && inputData?.issueType?.length > 0 ) {
       filter.push( {
         issueType: { $in: inputData.issueType },
@@ -1285,13 +1297,20 @@ export async function overViewTable( req, res ) {
       {
         'basicDetails.clientId': { $in: inputData.clientId },
       },
-
     ];
+    if ( req.user.userType === 'client' ) {
+      filter.push( { 'dataMismatch.showToClient': true } );
+    }
     if ( inputData?.issueType && inputData?.issueType?.length > 0 ) {
       filter.push( {
         issueType: { $in: inputData.issueType },
       } );
     }
+    if ( inputData?.status && inputData?.status!='' ) {
+      filter.push( {
+        status: inputData?.status,
+      } );
+    }
     const query = [
       {
         $match: {
@@ -1314,23 +1333,18 @@ export async function overViewTable( req, res ) {
     ];
     if ( inputData.searchValue ) {
       filter.push( {
-
         $or: [
-          { 'basicDetails.clientName': { $regex: req.body.searchValue, $options: 'i' } },
-          { 'basicDetails.storeId': { $regex: req.body.searchValue, $options: 'i' } },
-          { 'basicDetails.storeName': { $regex: req.body.searchValue, $options: 'i' } },
+          { 'clientName': { $regex: req.body.searchValue, $options: 'i' } },
+          { 'storeId': { $regex: req.body.searchValue, $options: 'i' } },
+          { 'storeName': { $regex: req.body.searchValue, $options: 'i' } },
           { 'status': { $regex: req.body.searchValue, $options: 'i' } },
         ],
-
       } );
     }
-    if ( inputData.sortColumName ) {
+    if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
       query.push( {
-        $sort: {
-          [inputData.sortColumName == 'storeId' ? 'basicDetails.storeId' :
-            inputData.sortColumName == 'clientName' ? 'basicDetails.clientName' :
-              inputData.sortColumName == 'storeName' ? 'basicDetails.storeName' : inputData.sortColumName]: sortBy,
+        $sort: { [inputData.sortColumnName]: sortBy,
         },
       } );
     }
@@ -1348,22 +1362,16 @@ export async function overViewTable( req, res ) {
       return res.sendError( 'No Data Found', 204 );
     }
     if ( inputData.isExport ) {
-      const resultChunk = await chunkArray( count, 10 );
-      const promises = resultChunk.map( async ( chunk ) => {
-        const list = [];
-        for ( let i = 0; i < chunk.length; i++ ) {
-          list.push( {
-            'Client Name': chunk[i]?.clientName,
-            'Store ID': chunk[i]?.storeId,
-            'Store Name': chunk[i]?.storeName,
-            'Status': chunk[i]?.status,
-          } );
-        }
-        return list;
+      const exportdata = [];
+      count.forEach( ( element ) => {
+        exportdata.push( {
+          'ClientName': element.clientName,
+          'Store ID': element.storeId,
+          'Store Name': element.storeName,
+          'Status': element.status,
+        } );
       } );
-      const temp = await Promise.all( promises );
-      const exportResult = temp.flat();
-      await download( exportResult, res );
+      await download( exportdata, res );
       return;
     }
     return res.sendSuccess( { result: result, count: count.length } );
@@ -1383,6 +1391,10 @@ export async function ticketCount( req, res ) {
       },
 
     ];
+
+    if ( req.user.userType === 'client' ) {
+      filter.push( { 'dataMismatch.showToClient': true } );
+    }
     if ( inputData.clientId && inputData?.clientId?.length > 0 ) {
       filter.push( {
         'basicDetails.clientId': { $in: inputData.clientId },

package/src/controllers/dataMismatch.controller.js

@@ -1,6 +1,6 @@
 
 import { findOneTangoTicket, createTangoTicket, updateOneTangoTicket, aggregateTangoTicket, countDocumentsTangoTicket } from '../services/tangoTicket.service.js';
-import { logger, getUTC, appConfig, fileUpload, signedUrl, sendMessageToQueue } from 'tango-app-api-middleware';
+import { logger, getUTC, appConfig, fileUpload, signedUrl, sendMessageToQueue, listFileByPath } from 'tango-app-api-middleware';
 import dayjs from 'dayjs';
 
 export async function createTicket( req, res ) {
@@ -8,8 +8,31 @@ export async function createTicket( req, res ) {
     let ticketExist = await findOneTangoTicket( { 'issueType': req.body.issueType, 'issueDate': ( new Date( req.body.Date ) ), 'basicDetails.storeId': req.body.storeId } );
 
     if ( ticketExist ) {
-      return res.sendSuccess( 'Ticket Already Exists for the store' );
+      return res.sendError( 'Ticket Already Exists for the store', 400 );
     }
+
+    if ( req.body.issueType === 'highcount' ) {
+      let param = {
+        Bucket: appConfig.cloud.aws.bucket.auditInput,
+        file_path: `${dayjs( new Date( req.body.Date ) ).format( 'DD-MM-YYYY' )}/${req.body.storeId}/`,
+        MaxKeys: 1,
+      };
+
+      param.Bucket = appConfig.cloud.aws.bucket.auditOutput;
+
+      param.file_path = `${req.body.storeId}/${dayjs( new Date( req.body.Date ) ).format( 'DD-MM-YYYY' )}/`;
+
+      const auditOutputData = await listFileByPath( param );
+
+      param.Bucket = appConfig.cloud.aws.bucket.edgeAppSource;
+
+      const edgeAppSource = await listFileByPath( param );
+
+      if ( !auditOutputData?.data?.length && !edgeAppSource?.data?.length ) {
+        return res.sendError( `No data available for ${req.body.basicDetails.storeName} on ${dayjs( new Date( req.body.Date ) ).format( 'DD-MM-YYYY' )}.`, 400 );
+      }
+    }
+
     let actionBy = '';
     if ( req.user.userType == 'tango' ) {
       actionBy = 'Tango';
@@ -170,6 +193,14 @@ export async function activityList( req, res ) {
     },
     );
 
+    if ( req.user.userType === 'client' ) {
+      query.forEach( ( e ) => {
+        if ( e.$match ) {
+          $match.$and.push( { 'dataMismatch.showToClient': true } );
+        }
+      } );
+    }
+
     if ( req.body.filter && req.body.filter !== '' ) {
       query.push( {
         $match: {