tango-app-api-audit 3.4.21 → 3.4.23

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.21",
+    "version": "3.4.23",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/audit.controllers.js

@@ -4805,6 +4805,42 @@ export async function auditViewLogs( req, res ) {
             },
           };
           break;
+        case 'hygiene':
+          logsQuery = {
+            'size': 100,
+            'query': {
+              'bool': {
+                'must': [
+                  {
+                    'term': {
+                      'logData.fileDate.keyword': inputData.fileDate,
+                    },
+                  },
+                  {
+                    'term': {
+                      'logData.storeId.keyword': inputData.storeId,
+                    },
+                  },
+                  {
+                    'term': {
+                      'logData.moduleType.keyword': inputData.moduleType,
+                    },
+                  },
+                  {
+                    'term': {
+                      'logData.zoneName.keyword': inputData.zoneName,
+                    },
+                  },
+                  {
+                    'terms': {
+                      'logSubType.keyword': [ 'auditDone', 'reTrigger' ],
+                    },
+                  },
+                ],
+              },
+            },
+          };
+          break;
         case 'camera-angle-change':
           logsQuery = {
             'size': 100,

package/src/controllers/traxAudit.controllers.js

@@ -3067,7 +3067,30 @@ export async function summarySplit( req, res ) {
       { moduleType: { $eq: inputData.moduleType } },
       { clientId: { $in: inputData.clientId } },
     ];
+    const totalQuery = [
+      {
+        $match: {
+          $and: filters,
+        },
 
+      },
+      {
+        $group: {
+          _id: null,
+          total: { $sum: 1 },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          total: 1,
+        },
+      },
+    ];
+    const totalCount = await aggregateTraxAuditData( totalQuery );
+    if ( totalCount.length == 0 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
 
     const binaryAuditQuery =[
       {
@@ -3194,28 +3217,8 @@ export async function summarySplit( req, res ) {
         },
       },
     ];
-    const totalQuery = [
-      {
-        $match: {
-          $and: filters,
-        },
 
-      },
-      {
-        $group: {
-          _id: null,
-          total: { $sum: 1 },
-        },
-      },
-      {
-        $project: {
-          _id: 0,
-          total: 1,
-        },
-      },
-    ];
     const result = [ 'mobile-detection', 'uniform-detection', 'hygiene' ].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 } );
   } catch ( error ) {
@@ -3623,23 +3626,23 @@ export async function getDetectionAuditFile( req, res ) {
     const list = await listFileByPath( fetchData );
     const folderPath = list.data;
     const nextQuery = list.pageToken;
-    const bucketCDN = inputData.moduleType=='hygiene' ? url.hygieneInput : url.traxAuditInput;
+    const bucketCDN = url.traxAuditInput;
     if ( folderPath?.length > 0 ) {
       for ( let i = 0; i < folderPath.length; i++ ) {
         const img = folderPath[i].Key.split( '/' );
-        const image = img[3].split( '.' );
+        const image = inputData.moduleType=='hygiene'?img[4].split( '.' ): img[3].split( '.' );
         const indexes = image[0].split( '_' );
         const Key = folderPath[i].Key;
         const data = `${bucketCDN}${Key}`;// await signedUrl( fetchData );
         const mapimg = {
           img_path: data,
           img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}` : inputData.moduleType=='hygiene'?`${indexes[2]}-${indexes[3]}`:image[0],
-          img_id: img[3],
+          img_id: inputData.moduleType=='hygiene'? img[4] : img[3],
         };
         files.push( {
           img_path: data,
           img_name: inputData.moduleType=='mobile-detection'?`${indexes[0]}-${indexes[3]}`: inputData.moduleType=='hygiene'?`${indexes[2]}-${indexes[3]}`:image[0],
-          img_id: img[3],
+          img_id: inputData.moduleType=='hygiene'? img[4] : img[3],
           selected: false,
           dropped: false,
           singleDetection: false,