tango-app-api-audit 3.4.0-alpha.1 → 3.4.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.0-alpha.1",
+    "version": "3.4.0-alpha.10",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.1.5",
+        "tango-api-schema": "^2.1.7",
         "tango-app-api-middleware": "^3.1.33",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/audit.controllers.js

@@ -1450,6 +1450,9 @@ export async function userAuditHistory( req, res ) {
     const dateRangeCreatedAt = await getDateWithCustomizeTime( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [
       { userId: { $eq: userId } },
+      {
+        moduleType: { $eq: inputData.moduleType },
+      },
     ];
 
     if ( inputData.dateType == 'fileDate' ) {
@@ -1464,12 +1467,6 @@ export async function userAuditHistory( req, res ) {
       );
     }
 
-    if ( inputData.filterByModuleType?.length > 0 ) {
-      filter.push( {
-        moduleType: { $in: inputData.filterByModuleType },
-      } );
-    }
-
     if ( inputData.filterByAuditType?.length > 0 ) {
       filter.push( {
         auditType: { $in: inputData.filterByAuditType },
@@ -1705,23 +1702,18 @@ export async function clientMetrics( req, res ) {
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
     ];
 
     let storeAuditFilter = [
       { $eq: [ '$clientId', '$$clientId' ] },
       { $eq: [ '$fileDate', '$$fileDate' ] },
+      {
+        $eq: [ '$moduleType', inputData.moduleType ],
+      },
 
     ];
 
-    if ( inputData?.filterByModuleType?.length> 0 ) {
-      filter.push(
-          { moduleType: { $in: inputData.filterByModuleType } },
-      );
-      storeAuditFilter.push( {
-        $in: [ '$moduleType', inputData.filterByModuleType ],
-      } );
-    }
-
     if ( inputData?.filterByClient?.length> 0 ) {
       filter.push(
           { clientId: { $in: inputData.filterByClient } },
@@ -1930,6 +1922,7 @@ export async function storeMetrics( req, res ) {
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
     if ( inputData.filterByClientId && inputData.filterByClientId?.length > 0 ) {
@@ -1948,11 +1941,6 @@ export async function storeMetrics( req, res ) {
       filter.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
 
-    if ( inputData.filterByModuleType && inputData.filterByModuleType?.length > 0 ) {
-      filter.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
-
     const query = [
       {
         $match: {
@@ -2175,6 +2163,8 @@ export async function storeMetrics( req, res ) {
             'Zone Name': element.zoneName,
             'User Name': element.userName,
             'User Email': element.userEmail,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
             'Audit Type': element.auditType,
             'Accuracy': element.accuracy,
             'Time Spent': element.timeSpent,
@@ -2189,6 +2179,8 @@ export async function storeMetrics( req, res ) {
             'Client Name': element.clientName,
             'User Name': element.userName,
             'User Email': element.userEmail,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
             'Audit Type': element.auditType,
             'Accuracy': element.accuracy,
             'Time Spent': element.timeSpent,
@@ -2219,20 +2211,17 @@ export async function userMetrics( req, res ) {
       filter.push(
           { updatedAt: { $gte: dateRangeUpdatedAt.start } },
           { updatedAt: { $lte: dateRangeUpdatedAt.end } },
+          { moduleType: { $eq: inputData.moduleType } },
 
       );
     } else {
       filter.push(
           { fileDateISO: { $gte: dateRange.start } },
           { fileDateISO: { $lte: dateRange.end } },
+          { moduleType: { $eq: inputData.moduleType } },
 
       );
     }
-    if ( inputData?.filterByModuleType?.length> 0 ) {
-      filter.push(
-          { moduleType: { $in: inputData.filterByModuleType } },
-      );
-    }
     if ( inputData?.filterByStatus?.length> 0 ) {
       filter.push(
           { auditStatus: { $in: inputData.filterByStatus } },
@@ -2489,6 +2478,7 @@ export async function pendingSummaryTable( req, res ) {
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
       { auditStatus: { $ne: 'completed' } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
 
@@ -2496,10 +2486,6 @@ export async function pendingSummaryTable( req, res ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
 
-    if ( inputData.filterByModuleType.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
@@ -2680,7 +2666,7 @@ export async function overAllAuditSummary( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
-      { moduleType: { $in: inputData.moduleType },
+      { moduleType: { $eq: inputData.moduleType },
       },
     ];
     if ( inputData.clientId.length > 0 ) {
@@ -3030,13 +3016,11 @@ export async function summarySplit( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
     ];
     if ( inputData.clientId.length > 0 ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
-    if ( inputData?.moduleType?.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.moduleType } } );
-    }
     const query =[
       {
         $match: {
@@ -3146,6 +3130,7 @@ export async function overviewTable( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
 
@@ -3153,10 +3138,6 @@ export async function overviewTable( req, res ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
 
-    if ( inputData.filterByModuleType.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
@@ -3323,6 +3304,7 @@ export async function totalNotAssignedCount( req, res ) {
       totalAuditCount: 0,
       totalZoneCount: 0,
       totalTrafficCount: 0,
+      totalTraxAuditCount: 0,
     };
     const getStoreData = await findOneStoreData(
         {},