tango-app-api-audit 3.4.11-alpha.10 → 3.4.11-alpha.12

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.11-alpha.10",
+    "version": "3.4.11-alpha.12",
     "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.36",
+        "tango-api-schema": "^2.1.37",
         "tango-app-api-middleware": "^3.1.33",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/traxAudit.controllers.js

@@ -799,11 +799,11 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    const auditUserCount = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
-    const userIncompleteFilesCount = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
+    const auditUserCount = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
+    const userIncompleteFilesCount = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
     logger.info( { moduleType: inputData.moduleType, userIncompleteFiles: userIncompleteFilesCount } );
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
-    const completedStoresCount = [ 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
+    const completedStoresCount = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
     const auditStoreData = await aggregateTraxAuditData(
         auditStoreDataQuery,
@@ -980,7 +980,7 @@ export async function getAuditFile( req, res ) {
             query ={
               storeId: userDetails[0].storeId,
               fileDate: userDetails[0].fileDate,
-              tempId: userDetails[0].tempId,
+              // tempId: userDetails[0].tempId,
               moduleType: userDetails[0].moduleType,
             };
             break;
@@ -1445,7 +1445,7 @@ export async function saveBinary( req, res ) {
           _id: inputData.auditId,
           storeId: inputData.storeId,
           fileDate: inputData.fileDate,
-          tempId: inputData.tempId,
+          // tempId: inputData.tempId,
           moduleType: inputData.moduleType,
         };
 
@@ -1841,7 +1841,7 @@ export async function userAuditHistory( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1886,10 +1886,13 @@ export async function userAuditHistory( req, res ) {
               temp['User Comments'] = element.userComments;
               break;
             case 'uniform-detection':
-              temp['Customer ID'] = element.tempId;
-              temp['Question'] = element.question;
-              temp['Result'] = element.answer;
-              temp['User Comments'] = element.userComments;
+              // temp['Customer ID'] = element.tempId;
+              // temp['Question'] = element.question;
+              // temp['Result'] = element.answer;
+              // temp['User Comments'] = element.userComments;
+              temp['Before Count'] = element.beforeCount;
+              temp['After Count'] = element.afterCount;
+              temp['Accuracy'] = element.accuracy || '';
               break;
             case 'mobile-detection':
               temp['Before Count'] = element.beforeCount;
@@ -1914,7 +1917,7 @@ export async function userAuditHistory( req, res ) {
     {
       $limit: limit,
     } );
-    const result = [ 'mobile-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
 
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
@@ -2239,7 +2242,7 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-    const count = [ 'mobile-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
+    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
     logger.info( { count: count } );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
@@ -2306,7 +2309,7 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-    const result = [ 'mobile-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
+    const result = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2341,7 +2344,7 @@ export async function storeMetrics( req, res ) {
     }
 
     if ( inputData.filterByStatus && inputData.filterByStatus?.length > 0 ) {
-      [ 'mobile-detection' ].includes( inputData.moduleType )? filter.push( { status: { $in: inputData.filterByStatus } } ) : filter.push( { auditStatus: { $in: inputData.filterByStatus } } );
+      [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? filter.push( { status: { $in: inputData.filterByStatus } } ) : filter.push( { auditStatus: { $in: inputData.filterByStatus } } );
     }
 
     if ( inputData.filterByAuditType && inputData.filterByAuditType?.length > 0 ) {
@@ -2774,7 +2777,7 @@ export async function storeMetrics( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
 
 
     if ( count.length == 0 ) {
@@ -2798,7 +2801,7 @@ export async function storeMetrics( req, res ) {
         $limit: limit,
       } );
     }
-    const result = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    const result = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -2839,11 +2842,15 @@ export async function storeMetrics( req, res ) {
             temp['Accuracy'] = element.accuracy;
             break;
           case 'uniform-detection':
-            temp['Customer ID'] = element.tempId;
-            temp['Question'] = element.question;
-            temp['User Comments'] = element.userComments;
-            temp['Status'] = toCamelCase( element.auditStatus );
-            temp['Result'] = element.answer;
+            // temp['Customer ID'] = element.tempId;
+            // temp['Question'] = element.question;
+            // temp['User Comments'] = element.userComments;
+            // temp['Status'] = toCamelCase( element.auditStatus );
+            // temp['Result'] = element.answer;
+            temp['Before Count'] = element.beforeCount;
+            temp['After Count'] = element.afterCount;
+            temp['Status'] = toCamelCase( element.status );
+            temp['Accuracy'] = element.accuracy;
             break;
         }
         exportdata.push( temp );
@@ -3117,7 +3124,7 @@ export async function userMetrics( req, res ) {
       );
     }
 
-    const count = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3153,7 +3160,7 @@ export async function userMetrics( req, res ) {
         'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
         // 'Mapping Percentage': '$mappingPerc',
       };
-      [ 'mobile-detection' ].includes( inputData.moduleType )?
+      [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )?
       query.push(
           {
             $project: detection,
@@ -3167,7 +3174,7 @@ export async function userMetrics( req, res ) {
     }
 
 
-    const result = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       await download( result, res );
       return;
@@ -3311,7 +3318,7 @@ export async function pendingSummaryTable( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3327,7 +3334,7 @@ export async function pendingSummaryTable( req, res ) {
       } );
     }
 
-    const result = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3356,8 +3363,9 @@ export async function pendingSummaryTable( req, res ) {
             temp['Before Count'] = element.beforeCount;
             break;
           case 'uniform-detection':
-            temp['Customer ID'] = element.tempId;
-            temp['Question'] = element.question;
+            // temp['Customer ID'] = element.tempId;
+            // temp['Question'] = element.question;
+            temp['Before Count'] = element.beforeCount;
             break;
         }
         exportdata.push( temp );
@@ -3522,7 +3530,7 @@ export async function overAllAuditSummary( req, res ) {
       },
     ];
 
-    const storeAudit = [ 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
+    const storeAudit = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
     if ( storeAudit.length > 0 ) {
       temp.inprogressStores= storeAudit[0].inprogressStores;
       temp.completedStores = storeAudit[0].completedStores;
@@ -3710,7 +3718,7 @@ export async function summarySplit( req, res ) {
         },
       },
     ];
-    const result = [ 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryAuditQuery );
+    const result = [ 'mobile-detection' ,'uniform-detection'].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryAuditQuery );
     const totalCount = await aggregateTraxAuditData( totalQuery );
     result[0].totalCount = totalCount[0]?.total;
     return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
@@ -3740,7 +3748,7 @@ export async function overviewTable( req, res ) {
     }
 
     if ( inputData.filterByStatus.length > 0 ) {
-      [ 'mobile-detection' ].includes( inputData.moduleType )? filters.push( { status: { $in: inputData.filterByStatus } } ):filters.push( { auditStatus: { $in: inputData.filterByStatus } } );
+      [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? filters.push( { status: { $in: inputData.filterByStatus } } ):filters.push( { auditStatus: { $in: inputData.filterByStatus } } );
     }
 
     const query =[
@@ -3857,7 +3865,7 @@ export async function overviewTable( req, res ) {
       },
       );
     }
-    const count = [ 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3872,7 +3880,7 @@ export async function overviewTable( req, res ) {
         $limit: limit,
       } );
     }
-    const result = [ 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'mobile-detection','uniform-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3909,11 +3917,15 @@ export async function overviewTable( req, res ) {
             temp['Status'] = toCamelCase( element.status );
             break;
           case 'uniform-detection':
-            temp['Customer ID'] = element.tempId;
-            temp['Question'] = element.question;
-            temp['User Comments'] = element.userComments;
+            // temp['Customer ID'] = element.tempId;
+            // temp['Question'] = element.question;
+            // temp['User Comments'] = element.userComments;
+            // temp['Audit Type'] = element.auditType;
+            // temp['Status'] = toCamelCase( element.auditStatus );
+            temp['Before Count'] = element.beforeCount;
+            temp['After Count'] = element.afterCount;
             temp['Audit Type'] = element.auditType;
-            temp['Status'] = toCamelCase( element.auditStatus );
+            temp['Status'] = toCamelCase( element.status );
             break;
         }
         exportdata.push( temp );

package/src/validation/traxAuditValidation.js

@@ -83,7 +83,7 @@ export async function isTraxAuditDocumentExist( req, res, next ) {
         query ={
           storeId: inputData.storeId,
           fileDate: inputData.fileDate,
-          tempId: inputData.tempId,
+          // tempId: inputData.tempId,
           moduleType: inputData.moduleType,
         };
         break;