tango-app-api-audit 3.4.5 → 3.4.6

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -1927,10 +1927,16 @@ export async function clientMetrics( req, res ) {
       return res.sendError( 'No Data Found', 204 );
     }
 
-    query.push(
-        { $skip: offset },
-        { $limit: limit },
-    );
+    if ( inputData.isExport ) {
+      query.push( { $limit: 10000 } );
+    } else {
+      query.push( {
+        $skip: offset,
+      },
+      {
+        $limit: limit,
+      } );
+    }
     if ( inputData.isExport ) {
       query.push(
           {
@@ -2311,7 +2317,7 @@ export async function userMetrics( req, res ) {
           startTime: 1,
           endTime: 1,
           totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
-          beforeCount: 1,
+          beforeCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$beforeCount', 0 ] },
           afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$afterCount', 0 ] },
           createdAt: 1,
         },
@@ -2504,10 +2510,16 @@ export async function userMetrics( req, res ) {
       return res.sendError( 'No Data Found', 204 );
     }
 
-    query.push(
-        { $skip: offset },
-        { $limit: limit },
-    );
+    if ( inputData.isExport ) {
+      query.push( { $limit: 10000 } );
+    } else {
+      query.push( {
+        $skip: offset,
+      },
+      {
+        $limit: limit,
+      } );
+    }
     if ( inputData.isExport ) {
       query.push(
           {
@@ -4536,52 +4548,208 @@ export async function getUserAuditCountMTD( req, res ) {
 export async function auditViewLogs( req, res ) {
   try {
     const inputData = req.query;
+    let logsQuery;
     const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
     const logData =[];
-    let logsQuery = {
-      'size': 100,
-      'query': {
-        'bool': {
-          'must': [
-            {
-              'term': {
-                'logData.fileDate.keyword': inputData.fileDate,
+    if ( inputData.moduleType == 'traffic' ||inputData.moduleType == 'zone' ) {
+      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' ],
+                },
+              },
+            ],
+          },
+        },
+      };
+    } else {
+      switch ( inputData.moduleType ) {
+        case 'unattended-customer':
+          logsQuery = {
+            'size': 100,
+            'query': {
+              'bool': {
+                'must': [
+                  {
+                    'term': {
+                      'data.fileDate.keyword': inputData.fileDate,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.storeId.keyword': inputData.storeId,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.moduleType.keyword': inputData.moduleType,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.tempId.keyword': inputData.tempId,
+                    },
+                  },
+                  {
+                    'terms': {
+                      'logSubType.keyword': [ 'auditDone', 'reTrigger' ],
+                    },
+                  },
+                ],
               },
             },
-            {
-              'term': {
-                'logData.storeId.keyword': inputData.storeId,
+          };
+          break;
+        case 'left-in-middle':
+          logsQuery = {
+            'size': 100,
+            'query': {
+              'bool': {
+                'must': [
+                  {
+                    'term': {
+                      'data.fileDate.keyword': inputData.fileDate,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.storeId.keyword': inputData.storeId,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.moduleType.keyword': inputData.moduleType,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.question.keyword': inputData.question,
+                    },
+                  },
+                  {
+                    'terms': {
+                      'logSubType.keyword': [ 'auditDone', 'reTrigger' ],
+                    },
+                  },
+                ],
               },
             },
-            {
-              'term': {
-                'logData.moduleType.keyword': inputData.moduleType,
+          };
+          break;
+        case 'uniform-detection':
+        case 'mobile-detection': // Handle both in the same block
+          logsQuery = {
+            'size': 100,
+            'query': {
+              'bool': {
+                'must': [
+                  {
+                    'term': {
+                      'logData.fileDate.keyword': inputData.fileDate,
+                    },
+                  },
+                  {
+                    'term': {
+                      'logData.storeId.keyword': inputData.storeId,
+                    },
+                  },
+                  {
+                    'term': {
+                      'logData.moduleType.keyword': inputData.moduleType,
+                    },
+                  },
+                  {
+                    'terms': {
+                      'logSubType.keyword': [ 'auditDone', 'reTrigger' ],
+                    },
+                  },
+                ],
               },
             },
-            {
-              'terms': {
-                'logSubType.keyword': [ 'auditDone', 'reAuditPush', 'reTrigger' ],
+          };
+          break;
+        case 'camera-angle-change':
+          logsQuery = {
+            'size': 100,
+            'query': {
+              'bool': {
+                'must': [
+                  {
+                    'term': {
+                      'data.fileDate.keyword': inputData.fileDate,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.storeId.keyword': inputData.storeId,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.moduleType.keyword': inputData.moduleType,
+                    },
+                  },
+                  {
+                    'term': {
+                      'data.streamName.keyword': inputData.streamName,
+                    },
+                  },
+                  {
+                    'terms': {
+                      'logSubType.keyword': [ 'auditDone', 'reTrigger' ],
+                    },
+                  },
+                ],
               },
             },
-          ],
-        },
-      },
-    };
+          };
+          break;
+        default:
+          return res.sendError( 'Please give valid modueType', 400 );
+      }
+    }
     const logs = await getOpenSearchData( parsedOpenSearch.auditLog, logsQuery );
     logger.info( { logs: logs.body.hits, inputData: inputData, auditLog: parsedOpenSearch.auditLog } );
     if ( logs.body.hits.hits.length > 0 ) {
-      if ( logs.body.hits.hits[0]._source.logSubType == 'auditDone' ) {
-        const convertedTime = await convertTimestampToDateTime( logs.body.hits.hits[0]._source.logData.endTime );
-        logData.push( {
-          ...logs.body.hits.hits[0]._source, // Spread the _source object
-          time: convertedTime, // Add the converted time
-        } );
-      } else {
-        const convertedTime = await convertTimestampToDateTime( logs.body.hits.hits[0]._source.createdAt );
-        logData.push( {
-          ...logs.body.hits.hits[0]._source, // Spread the _source object
-          time: convertedTime, // Add the converted time
-        } );
+      const sourcesArray = logs.body.hits.hits.map( ( hit ) => hit._source );
+      for ( const i of sourcesArray ) { // Loop through sourcesArray, not result._doc.camera
+        if ( i.logSubType == 'auditDone' ) {
+          const convertedTime = await convertTimestampToDateTime( i.logData.endTime );
+          logData.push( {
+            ...i, // Spread the individual log object
+            time: convertedTime, // Add the converted time
+          } );
+        } else {
+          const convertedTime = await convertTimestampToDateTime( i.createdAt );
+          logData.push( {
+            ...i, // Spread the individual log object
+            time: convertedTime, // Add the converted time
+          } );
+        }
       }
       return res.sendSuccess( logData );
     } else {

package/src/controllers/traxAudit.controllers.js

@@ -1192,7 +1192,7 @@ export async function getAuditFile( req, res ) {
     const logData = {
       userId: insertData.userId,
       userName: userdata.name,
-      logType: 'audit',
+      logType: 'traxAudit',
       logSubType: 'auditStart',
       data: {
         fileDate: msg.fileDate,
@@ -1360,7 +1360,7 @@ export async function getUpdatedFile( req, res ) {
     const logData = {
       userId: req.user._id,
       userName: userdata.name,
-      logType: 'audit',
+      logType: 'traxAudit',
       logSubType: 'auditStart',
       data: {
         fileDate: msg.fileDate,
@@ -2600,10 +2600,9 @@ export async function storeMetrics( req, res ) {
       result.forEach( ( element ) => {
         const temp ={
           'File Date': element.fileDate,
-          'Store ID': element.storeId,
           'Store Name': element.storeName,
-          'Client Id': element.clientId,
-          'Client Name': element.clientName,
+          'Store ID': element.storeId,
+          'Product Type': element.value,
           'User Name': element.userName,
           'User Email': element.userEmail,
           'Audit Type': element.auditType,
@@ -2613,16 +2612,19 @@ export async function storeMetrics( req, res ) {
           case 'camera-angle-change':
             temp['stream Name'] = element.streamName;
             temp['User Comments'] = element.userComments;
+            temp['Result'] = element.answer;
             break;
           case 'unattended-customer':
             temp['Customer ID'] = element.tempId;
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
+            temp['Result'] = element.answer;
             break;
           case 'left-in-middle':
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
             temp['Status'] = toCamelCase( element.auditStatus );
+            temp['Result'] = element.answer;
             break;
           case 'mobile-detection':
             temp['Before Count'] = element.beforeCount;