tango-app-api-audit 3.4.13 → 3.4.15

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -2304,6 +2304,11 @@ export async function userMetrics( req, res ) {
           $and: filter,
         },
       },
+      {
+        $sort: {
+          createdAt: -1,
+        },
+      },
       {
         $project: {
           userId: 1,
@@ -2319,7 +2324,7 @@ export async function userMetrics( req, res ) {
       },
       {
         $sort: {
-          endTime: -1,
+          createdAt: -1,
         },
       },
       {
@@ -2330,8 +2335,8 @@ export async function userMetrics( req, res ) {
           totalCompletedFiles: { $sum: '$totalCompletedFiles' },
           beforeCount: { $sum: '$beforeCount' },
           afterCount: { $sum: '$afterCount' },
-          checkIntime: { $first: '$startTime' },
-          checkOutTime: { $first: '$endTime' },
+          checkIntime: { $last: '$startTime' },
+          checkOutTime: { $first: { $ifNull: [ '$endTime', '$startTime' ] } },
           createdAt: { $first: '$createdAt' },
           to: { $last: '$createdAt' },
 

package/src/controllers/traxAudit.controllers.js

@@ -2908,6 +2908,11 @@ export async function userMetrics( req, res ) {
           $and: filter,
         },
       },
+      {
+        $sort: {
+          createdAt: -1,
+        },
+      },
 
       {
         $project: {
@@ -2928,7 +2933,7 @@ export async function userMetrics( req, res ) {
       },
       {
         $sort: {
-          endTime: -1,
+          createdAt: -1,
         },
       },
       {
@@ -2939,8 +2944,8 @@ export async function userMetrics( req, res ) {
           totalCompletedFiles: { $sum: '$totalCompletedFiles' },
           beforeCount: { $sum: '$beforeCount' },
           afterCount: { $sum: '$afterCount' },
-          checkIntime: { $first: '$startTime' },
-          checkOutTime: { $first: '$endTime' },
+          checkIntime: { $last: '$startTime' },
+          checkOutTime: { $first: { $ifNull: [ '$endTime', '$startTime' ] } },
           moduleType: { $last: '$moduleType' },
           value: { $last: '$value' },
           createdAt: { $first: '$createdAt' },

package/src/validation/audit.validation.js

@@ -155,8 +155,8 @@ const mapFunction = async ( chunkData, filterData ) => {
         chunkData.find( ( item ) => {
           if ( mappedId.img_name === item.temp_ids ) {
             item.temp_ids = data.img_name;
-            mappedId.img_name === data.img_name? null: item.query_status = '';
-            item.demographic = data.demographic || '';
+           ( mappedId.img_name !== data.img_name )? item.query_status = '': null;
+           item.demographic = data.demographic || '';
           }
         } );
       }