tango-app-api-audit 1.0.19 → 1.0.21

package/package.json

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

package/src/controllers/auditMetrics.controllers.js

@@ -3,20 +3,9 @@ import { aggregateAuditClientData } from '../service/auditClientData.service.js'
 import { aggregateUserAudit } from '../service/userAudit.service.js';
 import mongoose from 'mongoose';
 import dayjs from 'dayjs';
+import { aggregateStoreAudit } from '../service/storeAudit.service.js';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
-
-export async function getAuditImageList( req, res ) {
-  // try {
-  //   logger.info( { env: env } );
-  //   const inputData = req.body;
-  //   return res.sendSuccess( { result: inputData, config: env.cloud.aws.region } );
-  // } catch ( error ) {
-  //   logger.info( { error: error, message: req.body, function: 'getAuditImageList' } );
-  //   return res.sendError( error );
-  // }
-}
-
 export async function userAuditHistory( req, res ) {
   try {
     const inputData = req.body;
@@ -504,7 +493,7 @@ export async function userMetrics( req, res ) {
     let filter = [];
     if ( inputData.fileType == 'auditedDate' ) {
       filter.push(
-          { createdAt: { $gte: dateRange.start } },
+          { updatedAt: { $gte: dateRange.start } },
           { updatedAt: { $lte: dateRange.end } },
 
       );
@@ -520,9 +509,11 @@ export async function userMetrics( req, res ) {
           { auditStatus: { $in: inputData.filterByStatus } },
       );
     }
-    if ( inputData?.filterByuser?.length> 0 ) {
+    if ( inputData?.filterByUser?.length> 0 ) {
+      const temp = inputData.filterByUser.map( ( item ) => new mongoose.Types.ObjectId( item ) );
+      logger.info( { temp: temp } );
       filter.push(
-          { userId: { $in: inputData.filterByuser } },
+          { userId: { $in: temp } },
       );
     }
 
@@ -532,23 +523,33 @@ export async function userMetrics( req, res ) {
           $and: filter,
         },
       },
+      {
+        $project: {
+          userId: 1,
+          fileDate: 1,
+          startTime: 1,
+          endTime: 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 ] } } ] },
-          checkIntime: { $first: '$createdAt' },
-          checkOutTime: { $last: '$createdAt' },
+          totalCompletedFiles: { $sum: '$totalCompletedFiles' },
+          beforeCount: { $sum: '$beforeCount' },
+          afterCount: { $sum: '$afterCount' },
+          checkIntime: { $first: '$startTime' },
+          checkOutTime: { $last: '$endTime' },
 
         },
       },
       {
         $project: {
           _id: 0,
-          userName: '$userId',
           userId: 1,
           fileDate: 1,
           totalCompletedFiles: 1,
@@ -556,19 +557,18 @@ export async function userMetrics( req, res ) {
           afterCount: 1,
           mappingPerc: { $round: [
             { $multiply: [
-              { $divide: [ '$afterCount', 'beforeCount' ] }, 100,
+              { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
             ] }, 2,
           ] },
           checkIntime: 1,
           checkOutTime: 1,
           differenceInSeconds: {
-            $divide: [ { $subtract: [ '$checkIntime', '$checkoutTime' ] }, 1000 ],
+            $divide: [ { $subtract: [ '$checkOutTime', '$checkIntime' ] }, 1000 ],
           },
         },
       },
       {
         $project: {
-          userName: 1,
           userId: 1,
           fileDate: 1,
           totalCompletedFiles: 1,
@@ -585,7 +585,40 @@ export async function userMetrics( req, res ) {
       {
         $project: {
           event: 1,
-          userName: 1,
+          userId: 1,
+          fileDate: 1,
+          totalCompletedFiles: 1,
+          beforeCount: 1,
+          afterCount: 1,
+          checkIntime: 1,
+          checkOutTime: 1,
+          hours: {
+            $cond: {
+              if: { $lt: [ '$hours', 10 ] },
+              then: { $concat: [ '0', { $toString: { $round: [ '$hours', 0 ] } } ] },
+              else: { $toString: { $round: [ '$hours', 0 ] } },
+            },
+          },
+          minutes: {
+            $cond: {
+              if: { $lt: [ '$minutes', 10 ] },
+              then: { $concat: [ '0', { $toString: { $round: [ '$minutes', 0 ] } } ] },
+              else: { $toString: { $round: [ '$minutes', 0 ] } },
+            },
+          },
+          seconds: {
+            $cond: {
+              if: { $lt: [ '$seconds', 10 ] },
+              then: { $concat: [ '0', { $toString: { $round: [ '$seconds', 0 ] } } ] },
+              else: { $toString: { $round: [ '$seconds', 0 ] } },
+            },
+          },
+
+        },
+      },
+      {
+        $project: {
+          event: 1,
           userId: 1,
           fileDate: 1,
           totalCompletedFiles: 1,
@@ -594,14 +627,50 @@ export async function userMetrics( req, res ) {
           checkIntime: 1,
           checkOutTime: 1,
           workingHours: {
-            $concat: [
-              { $toString: '$hours' }, ':',
-              { $substr: [ { $toString: { $add: [ { $cond: [ { $lt: [ '$minutes', 10 ] }, '0', '' ] }, '$minutes' ] } }, 0, 2 ] }, ':',
-              { $substr: [ { $toString: { $add: [ { $cond: [ { $lt: [ '$seconds', 10 ] }, '0', '' ] }, '$seconds' ] } }, 0, 2 ] },
-            ],
+            $concat: [ '$hours', ':', '$minutes', ':', '$seconds' ],
           },
         },
       },
+      {
+        $lookup: {
+          from: 'users',
+          let: { userId: '$userId' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $eq: [ '$_id', '$$userId' ],
+                },
+              },
+            },
+            {
+              $project: {
+                _id: 0,
+                userName: 1,
+              },
+            },
+          ], as: 'userInfo',
+        },
+      },
+      {
+        $unwind: {
+          path: '$userInfo', preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $project: {
+          event: 1,
+          userName: '$userInfo.userName',
+          userId: 1,
+          fileDate: 1,
+          totalCompletedFiles: 1,
+          beforeCount: 1,
+          afterCount: 1,
+          checkIntime: 1,
+          checkOutTime: 1,
+          workingHours: 1,
+        },
+      },
     ];
     if ( inputData.searchValue && inputData.searchValue!== '' ) {
       query.push( {
@@ -663,3 +732,85 @@ export async function userMetrics( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function overViewCard( req, res ) {
+  try {
+    const inputData = req.body;
+    const temp = {
+      totalCount: 0,
+      auditFileCount: 0,
+      ReAuditFileCount: 0,
+      inprogressCount: 0,
+      completedCount: 0,
+    };
+
+    const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
+    let filters =[
+      { fileDateISO: { $gte: dateRange.start } },
+      { fileDateISO: { $lte: dateRange.end } },
+    ];
+    if ( inputData.clientId.length > 0 ) {
+      filters.push( { clientId: { $in: inputData.clientId } } );
+    }
+    const query =[
+      {
+        $match: {
+          $and: filters,
+        },
+
+      },
+      {
+        $project: {
+          auditFileCount: {
+            $cond: [
+              { $eq: [ '$auditType', 'Audit' ] }, 1, 0,
+            ],
+          },
+          ReAuditFileCount: {
+            $cond: [
+              { $eq: [ '$auditType', 'ReAudit' ] }, 1, 0,
+            ],
+          },
+          inprogressCount: {
+            $cond: [
+              { $ne: [ '$status', 'completed' ] }, 1, 0,
+            ],
+          },
+          completedCount: {
+            $cond: [
+              { $eq: [ '$status', 'completed' ] }, 1, 0,
+            ],
+          },
+        },
+      },
+      {
+        $group: {
+          _id: { fileDate: '$fileDate', clientId: '$clientId' },
+          totalCount: { $sum: 1 },
+          auditFileCount: { $sum: '$auditFileCount' },
+          ReAuditFileCount: { $sum: '$ReAuditFileCount' },
+          inprogressCount: { $sum: '$inprogressCount' },
+          completedCount: { $sum: '$completedCount' },
+
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          totalCount: 1,
+          auditFileCount: 1,
+          ReAuditFileCount: 1,
+          inprogressCount: 1,
+          completedCount: 1,
+        },
+      },
+    ];
+    const result = await aggregateStoreAudit( query );
+    logger.info( { result: result } );
+    return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.body, function: 'overViewCard' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/docs/auditMetrics.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { clientMetricsSchema, getAuditImagesSchema, storeMetricsSchema, userAuditHistorySchema, userMetricsSchema } from '../dtos/auditMetrics.dtos.js';
+import { clientMetricsSchema, getAuditImagesSchema, overViewCardSchema, storeMetricsSchema, userAuditHistorySchema, userMetricsSchema } from '../dtos/auditMetrics.dtos.js';
 
 export const auditMetricsDocs = {
 
@@ -95,7 +95,7 @@ export const auditMetricsDocs = {
     post: {
       tags: [ 'Audit Metrics' ],
       description: `Get list of file wise details with date range and users`,
-      operationId: 'client-metrics',
+      operationId: 'user-metrics',
       parameters: {},
       requestBody: {
         content: {
@@ -113,4 +113,26 @@ export const auditMetricsDocs = {
       },
     },
   },
+  '/v3/audit-metrics/overview-card': {
+    post: {
+      tags: [ 'Audit Metrics' ],
+      description: `Get overall high level audited files count splitup`,
+      operationId: 'overview-card',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( overViewCardSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
 };

package/src/dtos/auditMetrics.dtos.js

@@ -94,3 +94,15 @@ export const userMetricsSchema = joi.object(
 export const userMetricsValid = {
   body: userMetricsSchema,
 };
+
+export const overViewCardSchema = joi.object(
+    {
+      fromDate: joi.string().required(),
+      toDate: joi.string().required(),
+      clientId: joi.array().optional(),
+    },
+);
+
+export const overViewCardValid = {
+  body: overViewCardSchema,
+};

package/src/routes/auditMetrics.routes.js

@@ -1,15 +1,15 @@
 
 import express from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { clientMetrics, getAuditImageList, storeMetrics, userAuditHistory, userMetrics } from '../controllers/auditMetrics.controllers.js';
-import { clientMetricsValid, getAuditImagesValid, storeMetricsValid, userAuditHistoryValid, userMetricsValid } from '../dtos/auditMetrics.dtos.js';
+import { clientMetrics, overViewCard, storeMetrics, userAuditHistory, userMetrics } from '../controllers/auditMetrics.controllers.js';
+import { clientMetricsValid, overViewCardValid, storeMetricsValid, userAuditHistoryValid, userMetricsValid } from '../dtos/auditMetrics.dtos.js';
 
 export const auditMetricsRouter = express.Router();
 
-auditMetricsRouter.post( '/get-audit-images', validate( getAuditImagesValid ), getAuditImageList );
-auditMetricsRouter.post( '/user-audit-history', validate( userAuditHistoryValid ), isAllowedSessionHandler, userAuditHistory );
-auditMetricsRouter.post( '/store-metrics', validate( storeMetricsValid ), isAllowedSessionHandler, storeMetrics );
-auditMetricsRouter.post( '/client-metrics', validate( clientMetricsValid ), isAllowedSessionHandler, clientMetrics );
-auditMetricsRouter.post( '/user-metrics', validate( userMetricsValid ), isAllowedSessionHandler, userMetrics );
+auditMetricsRouter.post( '/user-audit-history', isAllowedSessionHandler, validate( userAuditHistoryValid ), userAuditHistory );
+auditMetricsRouter.post( '/store-metrics', isAllowedSessionHandler, validate( storeMetricsValid ), storeMetrics );
+auditMetricsRouter.post( '/client-metrics', isAllowedSessionHandler, validate( clientMetricsValid ), clientMetrics );
+auditMetricsRouter.post( '/user-metrics', isAllowedSessionHandler, validate( userMetricsValid ), userMetrics );
+auditMetricsRouter.post( '/overview-card', isAllowedSessionHandler, validate( overViewCardValid ), overViewCard );
 
 export default auditMetricsRouter;