tango-app-api-audit 1.0.18 → 1.0.20

package/index.js

@@ -8,7 +8,9 @@ import clientRouter from './src/routes/client.routes.js';
 import { clientDocs } from './src/docs/client.docs.js';
 import { storeRouter } from './src/routes/store.routes.js';
 import { storeDocs } from './src/docs/store.docs.js';
+import { userDocs } from './src/docs/user.docs.js';
+import { userRouter } from './src/routes/user.routes.js';
 
-export { auditRouter, auditMetricsRouter, auditMetricsDocs, auditDocs, clientRouter, clientDocs, storeRouter, storeDocs };
+export { auditRouter, auditMetricsRouter, auditMetricsDocs, auditDocs, clientRouter, clientDocs, storeRouter, storeDocs, userRouter, userDocs };
 
 

package/package.json

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

package/src/controllers/auditMetrics.controllers.js

@@ -532,14 +532,25 @@ export async function userMetrics( req, res ) {
           $and: filter,
         },
       },
+      {
+        $project: {
+          userId: 1,
+          fileDate: 1,
+          checkIntime: 1,
+          checkOutTime: 1,
+          totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
+          beforeCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$beforeCount', 0 ] },
+          afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$afterCount', 0 ] },
+        },
+      },
       {
         $group: {
           _id: { userId: '$userId', fileDate: '$fileDate' },
           userId: { $first: '$userId' },
           fileDate: { $first: '$fileDate' },
-          totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, { $sum: 1 } ] },
-          beforeCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, { $sum: { $ifNull: [ '$beforeCount', 0 ] } } ] },
-          afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, { $sum: { $ifNull: [ '$afterCount', 0 ] } } ] },
+          totalCompletedFiles: { $sum: '$totalCompletedFiles' },
+          beforeCount: { $sum: '$beforeCount' },
+          afterCount: { $sum: '$afterCount' },
           checkIntime: { $first: '$createdAt' },
           checkOutTime: { $last: '$createdAt' },
 
@@ -556,7 +567,7 @@ export async function userMetrics( req, res ) {
           afterCount: 1,
           mappingPerc: { $round: [
             { $multiply: [
-              { $divide: [ '$afterCount', 'beforeCount' ] }, 100,
+              { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
             ] }, 2,
           ] },
           checkIntime: 1,