tango-app-api-audit 3.4.7 → 3.4.8

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -4589,6 +4589,7 @@ export async function auditViewLogs( req, res ) {
     } else {
       switch ( inputData.moduleType ) {
         case 'unattended-customer':
+          const tempId = Number( inputData.tempId );
           logsQuery = {
             'size': 100,
             'query': {
@@ -4596,22 +4597,22 @@ export async function auditViewLogs( req, res ) {
                 'must': [
                   {
                     'term': {
-                      'data.fileDate.keyword': inputData.fileDate,
+                      'logData.fileDate.keyword': inputData.fileDate,
                     },
                   },
                   {
                     'term': {
-                      'data.storeId.keyword': inputData.storeId,
+                      'logData.storeId.keyword': inputData.storeId,
                     },
                   },
                   {
                     'term': {
-                      'data.moduleType.keyword': inputData.moduleType,
+                      'logData.moduleType.keyword': inputData.moduleType,
                     },
                   },
                   {
                     'term': {
-                      'data.tempId.keyword': inputData.tempId,
+                      'logData.tempId.keyword': tempId,
                     },
                   },
                   {
@@ -4632,22 +4633,22 @@ export async function auditViewLogs( req, res ) {
                 'must': [
                   {
                     'term': {
-                      'data.fileDate.keyword': inputData.fileDate,
+                      'logData.fileDate.keyword': inputData.fileDate,
                     },
                   },
                   {
                     'term': {
-                      'data.storeId.keyword': inputData.storeId,
+                      'logData.storeId.keyword': inputData.storeId,
                     },
                   },
                   {
                     'term': {
-                      'data.moduleType.keyword': inputData.moduleType,
+                      'logData.moduleType.keyword': inputData.moduleType,
                     },
                   },
                   {
                     'term': {
-                      'data.question.keyword': inputData.question,
+                      'logData.question.keyword': inputData.question,
                     },
                   },
                   {
@@ -4700,22 +4701,22 @@ export async function auditViewLogs( req, res ) {
                 'must': [
                   {
                     'term': {
-                      'data.fileDate.keyword': inputData.fileDate,
+                      'logData.fileDate.keyword': inputData.fileDate,
                     },
                   },
                   {
                     'term': {
-                      'data.storeId.keyword': inputData.storeId,
+                      'logData.storeId.keyword': inputData.storeId,
                     },
                   },
                   {
                     'term': {
-                      'data.moduleType.keyword': inputData.moduleType,
+                      'logData.moduleType.keyword': inputData.moduleType,
                     },
                   },
                   {
                     'term': {
-                      'data.streamName.keyword': inputData.streamName,
+                      'logData.streamName.keyword': inputData.streamName,
                     },
                   },
                   {

package/src/controllers/traxAudit.controllers.js

@@ -1194,7 +1194,7 @@ export async function getAuditFile( req, res ) {
       userName: userdata.name,
       logType: 'traxAudit',
       logSubType: 'auditStart',
-      data: {
+      logData: {
         fileDate: msg.fileDate,
         storeId: msg.storeId,
         clientId: storeInfo?.clientId,
@@ -1362,7 +1362,7 @@ export async function getUpdatedFile( req, res ) {
       userName: userdata.name,
       logType: 'traxAudit',
       logSubType: 'auditStart',
-      data: {
+      logData: {
         fileDate: msg.fileDate,
         storeId: msg.storeId,
         clientId: storeInfo?.clientId,
@@ -1431,6 +1431,32 @@ export async function saveBinary( req, res ) {
         if ( updatDataunattended.modifiedCount==0 ) {
           return res.sendError( 'Update failed, it may be invalid request', 400 );
         }
+        const logData2 = {
+          userId: req.user._id,
+          userName: req.user.userName,
+          logType: 'traxAudit',
+          logSubType: 'auditDone',
+          logData: {
+            fileDate: req.userAudit?.fileDate,
+            auditType: req.userAudit?.auditType,
+            storeId: req.userAudit?.storeId,
+            moduleType: req.userAudit?.moduleType,
+            queueName: req.userAudit?.queueName,
+            clientId: req.userAudit?.clientId,
+            // beforeCount: req.userAudit?.beforeCount,
+            // afterCount: inputData.employeeCount,
+            startTime: req.userAudit?.startTime,
+            streamName: req.userAudit?.streamName,
+            tempId: req.userAudit?.tempId,
+            question: req.userAudit?.question,
+            result: req.userAudit?.answer,
+            endTime: Date.now(),
+            timeSpent: timeDifferenceInMinutes,
+            auditId: new mongoose.Types.ObjectId( inputData.auditId ),
+          },
+          createdAt: Date.now(),
+        };
+        await insertOpenSearchData( openSearch.auditLog, logData2 );
         logger.info( 'update in binary data', { query: unattendedquery, update: update } );
         return res.sendSuccess( `Successfully updated in ${value}` );
 
@@ -1455,6 +1481,32 @@ export async function saveBinary( req, res ) {
         if ( updatDataleft.modifiedCount==0 ) {
           return res.sendError( 'Update failed, it may be invalid request', 400 );
         }
+        const logData1 = {
+          userId: req.user._id,
+          userName: req.user.userName,
+          logType: 'traxAudit',
+          logSubType: 'auditDone',
+          logData: {
+            fileDate: req.userAudit?.fileDate,
+            auditType: req.userAudit?.auditType,
+            storeId: req.userAudit?.storeId,
+            moduleType: req.userAudit?.moduleType,
+            queueName: req.userAudit?.queueName,
+            clientId: req.userAudit?.clientId,
+            // beforeCount: req.userAudit?.beforeCount,
+            // afterCount: inputData.employeeCount,
+            startTime: req.userAudit?.startTime,
+            streamName: req.userAudit?.streamName,
+            tempId: req.userAudit?.tempId,
+            question: req.userAudit?.question,
+            result: req.userAudit?.answer,
+            endTime: Date.now(),
+            timeSpent: timeDifferenceInMinutes,
+            auditId: new mongoose.Types.ObjectId( inputData.auditId ),
+          },
+          createdAt: Date.now(),
+        };
+        await insertOpenSearchData( openSearch.auditLog, logData1 );
         logger.info( 'update in binary data', { query: leftquery, update: leftupdate } );
         return res.sendSuccess( `Successfully updated in ${value}` );
 
@@ -1477,33 +1529,35 @@ export async function saveBinary( req, res ) {
         };
         let updatDatacamera= await updateOneBinaryAuditModel( cameraquery, cameraupdate );
         if ( updatDatacamera.modifiedCount==0 ) {
-          const logData = {
-            userId: req.user._id,
-            userName: req.user.userName,
-            logType: 'traxAudit',
-            logSubType: 'auditDone',
-            logData: {
-              fileDate: req.userAudit?.fileDate,
-              auditType: req.userAudit?.auditType,
-              storeId: req.userAudit?.storeId,
-              moduleType: req.userAudit?.moduleType,
-              queueName: req.userAudit?.queueName,
-              clientId: req.userAudit?.clientId,
-              beforeCount: req.userAudit?.beforeCount,
-              afterCount: inputData.employeeCount,
-              startTime: req.userAudit?.startTime,
-              streamName: req.userAudit?.streamName,
-              tempId: req.userAudit?.tempId,
-              question: req.userAudit?.question,
-              endTime: Date.now(),
-              timeSpent: timeDifferenceInMinutes,
-              auditId: new mongoose.Types.ObjectId( inputData.auditId ),
-            },
-            createdAt: Date.now(),
-          };
-          await insertOpenSearchData( openSearch.auditLog, logData );
           return res.sendError( 'Update failed, it may be invalid request', 400 );
         }
+
+        const logData = {
+          userId: req.user._id,
+          userName: req.user.userName,
+          logType: 'traxAudit',
+          logSubType: 'auditDone',
+          logData: {
+            fileDate: req.userAudit?.fileDate,
+            auditType: req.userAudit?.auditType,
+            storeId: req.userAudit?.storeId,
+            moduleType: req.userAudit?.moduleType,
+            queueName: req.userAudit?.queueName,
+            clientId: req.userAudit?.clientId,
+            // beforeCount: req.userAudit?.beforeCount,
+            // afterCount: inputData.employeeCount,
+            startTime: req.userAudit?.startTime,
+            streamName: req.userAudit?.streamName,
+            tempId: req.userAudit?.tempId,
+            question: req.userAudit?.question,
+            result: req.userAudit?.answer,
+            endTime: Date.now(),
+            timeSpent: timeDifferenceInMinutes,
+            auditId: new mongoose.Types.ObjectId( inputData.auditId ),
+          },
+          createdAt: Date.now(),
+        };
+        await insertOpenSearchData( openSearch.auditLog, logData );
         logger.info( 'update in binary data', { query: cameraquery, update: cameraupdate } );
         return res.sendSuccess( `Successfully updated in ${value}` );
 
@@ -1879,9 +1933,9 @@ export async function clientMetrics( req, res ) {
             },
             {
               $project: {
-                completedStores: { $cond: [ { $eq: [ '$status', 'completed' ] }, 1, 0 ] },
-                notAssignedStores: { $cond: [ { $eq: [ '$status', 'not_assign' ] }, 1, 0 ] },
-                inprogressStores: { $cond: [ { $in: [ '$status', [ 'inprogress', 'drafted', 'assigned' ] ] }, 1, 0 ] },
+                completedStores: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
+                notAssignedStores: { $cond: [ { $eq: [ '$auditStatus', 'not_assign' ] }, 1, 0 ] },
+                inprogressStores: { $cond: [ { $in: [ '$auditStatus', [ 'inprogress', 'drafted', 'assigned' ] ] }, 1, 0 ] },
               },
             },
             {
@@ -2077,6 +2131,12 @@ export async function clientMetrics( req, res ) {
           },
 
       );
+      MappingQuery.push(
+          {
+            $match: { clientStatus: { $in: inputData.filterByStatus } },
+          },
+
+      );
     }
 
     if ( inputData.searchValue && inputData.searchValue!== '' ) {
@@ -2091,6 +2151,18 @@ export async function clientMetrics( req, res ) {
 
         },
       } );
+
+      MappingQuery.push( {
+        $match: {
+          $or: [
+            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
+            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
+            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { clientStatus: { $regex: inputData.searchValue, $options: 'i' } },
+          ],
+
+        },
+      } );
     }
     if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
@@ -2099,6 +2171,11 @@ export async function clientMetrics( req, res ) {
         $sort: { [sortColumn]: sortBy },
       },
       );
+
+      MappingQuery.push( {
+        $sort: { [sortColumn]: sortBy },
+      },
+      );
     }
 
     const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
@@ -2107,10 +2184,25 @@ 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 } );
+
+      MappingQuery.push( { $limit: 10000 } );
+    } else {
+      query.push( {
+        $skip: offset,
+      },
+      {
+        $limit: limit,
+      } );
+
+      MappingQuery.push( {
+        $skip: offset,
+      },
+      {
+        $limit: limit,
+      } );
+    }
     if ( inputData.isExport ) {
       query.push(
           {
@@ -2131,9 +2223,28 @@ export async function clientMetrics( req, res ) {
             },
           },
       );
+
+      MappingQuery.push(
+          {
+            $project: {
+              '_id': 0,
+              'File Date': '$fileDate',
+              'Brand Name': '$clientName',
+              'Brand Id': '$clientId',
+              'Product Type': '$value',
+              // 'Completed Percentage': '$completionPercentage',
+              'Installed Stores': '$installedStore',
+              'Audit Stores': '$totalFilesCount',
+              'Inprogress Stores': '$inprogressStoresCount',
+              'Not Assigned Stores': '$notAssignedCount',
+              // 'Not Assigned Stores': '$notAssignedStores',
+              'Completed Stores': '$completedStores',
+              'Status': '$clientStatus',
+            },
+          },
+      );
     }
 
-    logger.info( { query: query } );
     const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateTraxAuditData( MappingQuery ) : await aggregateTraxAuditData( query );
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
@@ -2169,7 +2280,7 @@ export async function storeMetrics( req, res ) {
     }
 
     if ( inputData.filterByStatus && inputData.filterByStatus?.length > 0 ) {
-      filter.push( { status: { $in: inputData.filterByStatus } } );
+      [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? filter.push( { status: { $in: inputData.filterByStatus } } ) : filter.push( { auditStatus: { $in: inputData.filterByStatus } } );
     }
 
     if ( inputData.filterByAuditType && inputData.filterByAuditType?.length > 0 ) {
@@ -2567,6 +2678,26 @@ export async function storeMetrics( req, res ) {
           ],
         },
       } );
+
+      binaryQuery.push( {
+        $match: {
+          $or: [
+            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
+            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
+            { storeId: { $regex: inputData.searchValue, $options: 'i' } },
+            { storeName: { $regex: inputData.searchValue, $options: 'i' } },
+            { userName: { $regex: inputData.searchValue, $options: 'i' } },
+            { status: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditType: { $regex: inputData.searchValue, $options: 'i' } },
+            { value: { $regex: inputData.searchValue, $options: 'i' } },
+            { tempId: { $regex: inputData.searchValue, $options: 'i' } },
+            { question: { $regex: inputData.searchValue, $options: 'i' } },
+            { answer: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
+            { userComments: { $regex: inputData.searchValue, $options: 'i' } },
+          ],
+        },
+      } );
     }
 
     if ( inputData.sortColumnName ) {
@@ -2576,6 +2707,11 @@ export async function storeMetrics( req, res ) {
         $sort: { [sortColumn]: sortBy },
       },
       );
+
+      binaryQuery.push( {
+        $sort: { [sortColumn]: sortBy },
+      },
+      );
     }
     logger.info( { keyss: [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType ) } );
     const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
@@ -2584,15 +2720,23 @@ export async function storeMetrics( req, res ) {
     if ( count.length == 0 ) {
       return res.sendError( 'No data Found', 204 );
     }
-    if ( !inputData.isExport ) {
+    if ( inputData.isExport ) {
+      query.push( { $limit: 10000 } );
+      binaryQuery.push( { $limit: 10000 } );
+    } else {
       query.push( {
         $skip: offset,
       },
       {
         $limit: limit,
       } );
-    } else {
-      query.push( { $limit: 10000 } );
+
+      binaryQuery.push( {
+        $skip: offset,
+      },
+      {
+        $limit: limit,
+      } );
     }
     const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
     if ( inputData.isExport ) {
@@ -2612,12 +2756,14 @@ export async function storeMetrics( req, res ) {
           case 'camera-angle-change':
             temp['stream Name'] = element.streamName;
             temp['User Comments'] = element.userComments;
+            temp['Status'] = toCamelCase( element.auditStatus );
             temp['Result'] = element.answer;
             break;
           case 'unattended-customer':
             temp['Customer ID'] = element.tempId;
             temp['Question'] = element.question;
             temp['User Comments'] = element.userComments;
+            temp['Status'] = toCamelCase( element.auditStatus );
             temp['Result'] = element.answer;
             break;
           case 'left-in-middle':
@@ -2694,12 +2840,13 @@ export async function userMetrics( req, res ) {
           $and: filter,
         },
       },
+
       {
         $project: {
           userId: 1,
           fileDate: 1,
           startTime: 1,
-          endTime: 1,
+          endTime: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$endTime', '$$REMOVE' ] },
           beforeCount: 1,
           moduleType: 1,
           afterCount: 1,
@@ -2711,6 +2858,11 @@ export async function userMetrics( req, res ) {
             $replaceAll: { input: '$moduleType', find: '-', replacement: ' ' },
           } },
       },
+      {
+        $sort: {
+          endTime: -1,
+        },
+      },
       {
         $group: {
           _id: { userId: '$userId', fileDate: '$fileDate' },
@@ -2720,7 +2872,7 @@ export async function userMetrics( req, res ) {
           beforeCount: { $sum: '$beforeCount' },
           afterCount: { $sum: '$afterCount' },
           checkIntime: { $first: '$startTime' },
-          checkOutTime: { $last: '$endTime' },
+          checkOutTime: { $first: '$endTime' },
           moduleType: { $last: '$moduleType' },
           value: { $last: '$value' },
           createdAt: { $first: '$createdAt' },