tango-app-api-audit 3.3.0-beta.1 → 3.3.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-beta.1",
+    "version": "3.3.0-beta.3",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,8 +24,8 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.0.157",
-        "tango-app-api-middleware": "^3.3.0-alpha.0",
+        "tango-api-schema": "^2.0.159",
+        "tango-app-api-middleware": "^3.1.32",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/audit.controllers.js

@@ -496,7 +496,6 @@ export async function getAuditFile( req, res ) {
     const list = await listFileByPath( fetchData );
     const folderPath = list.data;
     const nextQuery = list.pageToken;
-    logger.info( { nextQuery: folderPath } );
     if ( folderPath?.length > 0 ) {
       for ( let i = 0; i < folderPath.length; i++ ) {
         const img = folderPath[i].Key.split( '/' );
@@ -762,6 +761,11 @@ export async function workSpace( req, res ) {
         $project: {
           clientName: 1,
           clientId: 1,
+          queueName: {
+            $cond: [
+              { $eq: [ inputData.moduleType, 'zone' ] }, '$auditConfigs.zoneQueueName', '$auditConfigs.trafficQueueName',
+            ],
+          },
         },
       },
     ];
@@ -818,7 +822,7 @@ export async function workSpace( req, res ) {
           clientId: { $last: '$clientId' },
           clientName: { $last: '$clientName' },
           installedStore: { $last: '$installedStore' },
-          queueName: { $last: '$queueName' },
+          // queueName: { $last: '$queueName' },
           totalCount: { $sum: 1 },
         },
       },
@@ -1642,25 +1646,46 @@ export async function userAuditHistory( req, res ) {
       const promises = chunkedMappingData.map( async ( chunk ) => {
         const exportData = [];
         chunk.forEach( ( element ) => {
-          exportData.push( {
+          if ( element.moduleType == 'zone' ) {
+            exportData.push( {
+              'File Date': element.fileDate,
+              'Brand ID': element.clientId,
+              'Brand Name': element.clientName,
+              'Store ID': element.storeId,
+              'Store Name': element.storeName,
+              'Zone Name': element.zoneName,
+              'Audit Type': element.auditType,
+              'Product Type': element.moduleType,
+              'Before Count': element.beforeCount,
+              'After Count': element.afterCount || '',
+              'Accuracy': element.accuracy || '',
+              'Start Time': element.startTime,
+              'End Time': element.endTime || '',
+              'Time Spent': element.timeSpent,
+              'Audit Status': element.auditStatus,
+              'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
 
-            'Brand ID': element.clientId,
-            'Brand Name': element.clientName,
-            'Store ID': element.storeId,
-            'Store Name': element.storeName,
-            'Zone Name': element.zoneName,
-            'Audit Type': element.auditType,
-            'Module Type': element.moduleType,
-            'Before Count': element.beforeCount,
-            'After Count': element.afterCount || '',
-            'Accuracy': element.accuracy || '',
-            'Start Time': element.startTime,
-            'End Time': element.endTime || '',
-            'Time Spent': element.timeSpent,
-            'Audit Status': element.auditStatus,
-            'CreatedAt': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
+            } );
+          } else {
+            exportData.push( {
+              'File Date': element.fileDate,
+              'Brand ID': element.clientId,
+              'Brand Name': element.clientName,
+              'Store ID': element.storeId,
+              'Store Name': element.storeName,
+              'Audit Type': element.auditType,
+              'Product Type': element.moduleType,
+              'Before Count': element.beforeCount,
+              'After Count': element.afterCount || '',
+              'Accuracy': element.accuracy || '',
+              'Start Time': element.startTime,
+              'End Time': element.endTime || '',
+              'Time Spent': element.timeSpent,
+              'Audit Status': element.auditStatus,
+              'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
 
-          } );
+            } );
+          }
         } );
         return exportData;
       } );
@@ -1784,7 +1809,7 @@ export async function clientMetrics( req, res ) {
                 completedStores: 1,
                 inprogressStores: 1,
                 notAssignedStores: 1,
-                fileCount: 1,
+                fileCount: { $ifNull: [ '$fileCount', 0 ] },
                 completionPercentage: { $ifNull: [
                   {
                     $round: [ {
@@ -1824,8 +1849,8 @@ export async function clientMetrics( req, res ) {
           // notAssignedStores: '$storeAudit.notAssignedStores',
           inprogressStoresCount: '$storeAudit.inprogressStores',
           // fileCount: '$storeAudit.fileCount',
-          notAssignedCount: 1,
-          clientStatus: { $cond: [ { $eq: [ '$storeAudit.fileCount', 0 ] }, 'not-taken', { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$storeAudit.notAssignedStores', 0 ] } ] }, 'pending', 'completed' ] } ] },
+          notAssignedCount: { $subtract: [ '$totalFilesCount', { $subtract: [ { $ifNull: [ '$storeAudit.fileCount', 0 ] }, { $ifNull: [ '$storeAudit.notAssignedStores', 0 ] } ] } ] },
+          clientStatus: { $cond: [ { $eq: [ { $ifNull: [ '$storeAudit.fileCount', 0 ] }, 0 ] }, 'not-taken', { $cond: [ { $gte: [ '$storeAudit.completedStores', '$totalFilesCount' ] }, 'completed', 'pending' ] } ] }, // { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$storeAudit.notAssignedStores', 0 ] } ] }
           completedStores: '$storeAudit.completedStores',
           completionPercentage: '$storeAudit.completionPercentage',
 
@@ -1881,7 +1906,7 @@ export async function clientMetrics( req, res ) {
               'File Date': '$fileDate',
               'Client Name': '$clientName',
               'Client Id': '$clientId',
-              'Module Type': '$moduleType',
+              'Product Type': '$moduleType',
               'Completed Percentage': '$completionPercentage',
               'Installed Stores': '$installedStore',
               'Audit Stores': '$totalFilesCount',
@@ -1994,13 +2019,12 @@ export async function storeMetrics( req, res ) {
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
-          accuracy: { $round: [
-            { $divide: [
-              { $multiply: [ { $ifNull: [ '$afterCount', 0 ] }, '$beforeCount' ] }, 100,
-            ] }, 2,
+          accuracy: { $cond: [ { $eq: [ '$status', 'completed' ] }, { $round: [
+            {
+              $multiply: [ { $divide: [ '$afterCount', '$beforeCount' ] }, 100 ],
+            }, 1,
           ],
-
-          },
+          }, null ] },
           timeSpent: 1,
           status: 1,
         },
@@ -2075,13 +2099,12 @@ export async function storeMetrics( req, res ) {
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
-          accuracy: { $round: [
-            { $divide: [
-              { $multiply: [ { $ifNull: [ '$afterCount', 0 ] }, '$beforeCount' ] }, 100,
-            ] }, 1,
+          accuracy: { $cond: [ { $eq: [ '$status', 'completed' ] }, { $round: [
+            {
+              $multiply: [ { $divide: [ '$afterCount', '$beforeCount' ] }, 100 ],
+            }, 1,
           ],
-
-          },
+          }, null ] },
           timeSpent: {
 
             $cond: [
@@ -2125,6 +2148,7 @@ export async function storeMetrics( req, res ) {
             { status: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
             { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
           ],
         },
       } );
@@ -2157,19 +2181,36 @@ export async function storeMetrics( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        exportdata.push( {
-          'File Date': element.fileDate,
-          'Store ID': element.storeId,
-          'Store Name': element.storeName,
-          'Client Id': element.clientId,
-          'Client Name': element.clientName,
-          'User Name': element.userName,
-          'User Email': element.userEmail,
-          'Audit Type': element.auditType,
-          'Accuracy': element.accuracy,
-          'Time Spent': element.timeSpent,
-          'Status': element.status,
-        } );
+        if ( element.moduleType == 'zone' ) {
+          exportdata.push( {
+            'File Date': element.fileDate,
+            'Store ID': element.storeId,
+            'Store Name': element.storeName,
+            'Client Id': element.clientId,
+            'Client Name': element.clientName,
+            'Zone Name': element.zoneName,
+            'User Name': element.userName,
+            'User Email': element.userEmail,
+            'Audit Type': element.auditType,
+            'Accuracy': element.accuracy,
+            'Time Spent': element.timeSpent,
+            'Status': element.status,
+          } );
+        } else {
+          exportdata.push( {
+            'File Date': element.fileDate,
+            'Store ID': element.storeId,
+            'Store Name': element.storeName,
+            'Client Id': element.clientId,
+            'Client Name': element.clientName,
+            'User Name': element.userName,
+            'User Email': element.userEmail,
+            'Audit Type': element.auditType,
+            'Accuracy': element.accuracy,
+            'Time Spent': element.timeSpent,
+            'Status': element.status,
+          } );
+        }
       } );
       await download( exportdata, res );
       return;
@@ -2595,18 +2636,32 @@ export async function pendingSummaryTable( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        exportdata.push( {
-          'Store ID': element.storeId,
-          'zoneName': element.zoneName,
-          'File Date': element.fileDate,
-          'Module Type': element.moduleType,
-          'Audit Type': element.auditType,
-          'Before Count': element.beforeCount,
-          'Start Time': element.startTime,
-          'User Name': element.userName,
-          'User Email': element.userEmail,
-          'Status': element.auditStatus,
-        } );
+        if ( element.moduleType == 'zone' ) {
+          exportdata.push( {
+            'Store ID': element.storeId,
+            'zoneName': element.zoneName,
+            'File Date': element.fileDate,
+            'Product Type': element.moduleType,
+            'Audit Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'Start Time': element.startTime,
+            'User Name': element.userName,
+            'User Email': element.userEmail,
+            'Status': element.auditStatus,
+          } );
+        } else {
+          exportdata.push( {
+            'Store ID': element.storeId,
+            'File Date': element.fileDate,
+            'Product Type': element.moduleType,
+            'Audit Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'Start Time': element.startTime,
+            'User Name': element.userName,
+            'User Email': element.userEmail,
+            'Status': element.auditStatus,
+          } );
+        }
       } );
       await download( exportdata, res );
       return;
@@ -2625,7 +2680,7 @@ export async function overAllAuditSummary( req, res ) {
     let temp = {
       installedStores: 0,
       auditStores: 0,
-      inprogreseStores: 0,
+      inprogressStores: 0,
       completedStores: 0,
       auditInprogress: 0,
       reAuditInprogress: 0,
@@ -2722,7 +2777,7 @@ export async function overAllAuditSummary( req, res ) {
     ];
     const storeAudit = await aggregateStoreAudit( storeAuditQuery );
     if ( storeAudit.length > 0 ) {
-      temp.inprogreseStores= storeAudit[0].inprogreseStores;
+      temp.inprogressStores= storeAudit[0].inprogressStores;
       temp.completedStores = storeAudit[0].completedStores;
       temp.auditInprogress = storeAudit[0].auditInprogress;
       temp.reAuditInprogress = storeAudit[0].reAuditInprogress;
@@ -2881,7 +2936,7 @@ export async function reTrigger( req, res ) {
         await insertOpenSearchData( openSearch.auditLog, logData );
     }
 
-    return res.sendSuccess( { result: 'The File has been Re Trigger Succesfully' } );
+    return res.sendSuccess( { result: 'The File has been Re-Trigger Succesfully' } );
   } catch ( error ) {
     const err = error.message;
     logger.error( { error: error, message: req.body, function: 'reTrigger' } );
@@ -3237,19 +3292,34 @@ export async function overviewTable( req, res ) {
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
-        exportdata.push( {
-          'Store ID': element.storeId,
-          'Client ID': element.clientId,
-          'zoneName': element.zoneName,
-          'File Date': element.fileDate,
-          'Module Type': element.moduleType,
-          'Audit Type': element.auditType,
-          'Before Count': element.beforeCount,
-          'After Count': element.afterCount,
-          // 'User Name': element.userName,
-          // 'User Email': element.userEmail,
-          'Status': element.status,
-        } );
+        if ( element.moduleType == 'zone' ) {
+          exportdata.push( {
+            'Store ID': element.storeId,
+            'Brand ID': element.clientId,
+            'Zone Name': element.zoneName,
+            'File Date': element.fileDate,
+            'Product Type': element.moduleType,
+            'Audit Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
+            // 'User Name': element.userName,
+            // 'User Email': element.userEmail,
+            'Status': element.status,
+          } );
+        } else {
+          exportdata.push( {
+            'Store ID': element.storeId,
+            'Brand ID': element.clientId,
+            'File Date': element.fileDate,
+            'Product Type': element.moduleType,
+            'Audit Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
+            // 'User Name': element.userName,
+            // 'User Email': element.userEmail,
+            'Status': element.status,
+          } );
+        }
       } );
       await download( exportdata, res );
       return;
@@ -3275,7 +3345,7 @@ export async function totalNotAssignedCount( req, res ) {
         { createdAt: -1 },
     );
     const latestDate = getStoreData?.fileDate || dayjs( fileDate ).format( 'DD-MM-YYYY' );
-    const query =[
+    const query = [
       {
         $match: {
           fileDate: { $eq: latestDate },
@@ -3364,7 +3434,7 @@ export async function totalNotAssignedCount( req, res ) {
     } else {
       notAssignedCount.totalAuditCount = getTotalcount[0].totalAuditCount;
       notAssignedCount.totalZoneCount = getTotalcount[0].totalZoneCount;
-      notAssignedCount.totalTrafficCount;
+      notAssignedCount.totalTrafficCount= getTotalcount[0].totalTrafficCount;
     }
     return res.sendSuccess( { result: notAssignedCount } );
   } catch ( error ) {