tango-app-api-audit 1.0.8 → 1.0.10

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -475,7 +475,7 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    if ( inputData.searchValue ) {
+    if ( inputData.searchValue&& inputData.searchValue!== '' ) {
       clientQuery.push( {
         $match: {
           $or: [
@@ -696,17 +696,17 @@ export async function workSpace( req, res ) {
     const CompletedCount = await aggregateStoreAudit( completedFiles );
 
     const clientAssignresult = await aggregateAssignAudit( clientAssign );
-
     const userAsignCount = await aggregateAssignAudit( userAsign );
     const mergeAll = _.merge( _.keyBy( clientDetails, 'clientId' ), _.keyBy( auditCount, 'clientId' ), _.keyBy( draftedCount, 'clientId' ), _.keyBy( clientAssignresult, 'clientId' ) );
     const finalResult = _.values( mergeAll );
     const merge = _.values( _.merge( _.keyBy( finalResult, 'clientId' ), _.keyBy( auditDetails, 'clientId' ), _.keyBy( userAsignCount, 'clientId' ), _.keyBy( CompletedCount, 'clientId' ) ) );
-
+    logger.info( { merge: merge } );
     let totalStores = 0;
     for ( let i = 0; i < merge.length; i++ ) {
       totalStores = totalStores + merge[i].totalFilesCount;
 
       const pending = await listQueue( merge[i].queueName );
+
       if ( !pending.statusCode ) {
         temp.push( {
           clientId: merge[i].clientId,
@@ -729,8 +729,8 @@ export async function workSpace( req, res ) {
       const exportdata = [];
       temp.forEach( ( element ) => {
         exportdata.push( {
-          'Client Name': element.client_name,
-          'Client Id': element.client_id,
+          'Client Name': element.clientName,
+          'Client Id': element.clientId,
           'Completed Percentage': element.completedRatio + ' %',
           'Pending Queue': element.pendingByQueue,
           'Pending User': element.pendingByUser,

package/src/controllers/auditMetrics.controllers.js

@@ -1,5 +1,7 @@
 import { download, getUTC, logger } from 'tango-app-api-middleware';
 import { aggregateAuditClientData } from '../service/auditClientData.service.js';
+import { aggregateUserAudit } from '../service/userAudit.service.js';
+import mongoose from 'mongoose';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
 
@@ -15,13 +17,98 @@ export async function getAuditImageList( req, res ) {
 }
 
 export async function userAuditHistory( req, res ) {
-  // try {
-  //   const inputData = req.body;
-  //   return res.sendSuccess( { result: inputData } );
-  // } catch ( error ) {
-  //   logger.info( { error: error, message: req.body, function: 'userAuditHistory' } );
-  //   return res.sendError( error );
-  // }
+  try {
+    const inputData = req.body;
+    const userId = inputData.userId || req.user._id;
+    const limit = inputData.limit || 10;
+    const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
+    const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
+    let filter = [
+
+      { userId: { $eq: new mongoose.Types.ObjectId( userId ) } },
+
+    ];
+    if ( inputData.fileType == 'fileDate' ) {
+      filter.push(
+          { fileDateISO: { $gte: dateRange.start } },
+          { fileDateISO: { $lte: dateRange.end } },
+      );
+    } else {
+      filter.push(
+          { createdAt: { $gte: dateRange.start } },
+          { createdAt: { $lte: dateRange.end } },
+      );
+    }
+
+    const query = [
+      {
+        $match: {
+          $and: filter,
+        },
+      },
+    ];
+
+    if ( inputData.searchValue && inputData.searchValue!== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
+            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
+          ],
+
+        },
+      } );
+    }
+    if ( inputData.sortColumnName ) {
+      const sortBy = inputData.sortBy || -1;
+      query.push( {
+        $sort: { [inputData.sortColumName]: sortBy },
+      },
+      );
+    }
+
+    query.push( {
+      $project: {
+        storeId: 1,
+        storeName: '$storeId',
+        auditType: 1,
+        beforeCount: 1,
+        afterCount: 1,
+        accuracy: { $round: [
+          {
+            $divide: [ { $multiply: [ '$beforeCount', { $ifNull: [ '$afterCount', 0 ] } ] }, 100 ],
+          }, 2,
+        ],
+        },
+        startTime: 1,
+        endTime: 1,
+        timeSpent: { $round: [
+          { $divide: [ '$timeSpent', 60 ] }, 2,
+        ] },
+        auditStatus: 1,
+        createdAt: 1,
+      },
+    } );
+
+    const count = await aggregateUserAudit( query );
+    if ( count.length == 0 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
+
+    query.push( {
+      $skip: offset,
+    },
+    {
+      $limit: limit,
+    } );
+    const result = await aggregateUserAudit( query );
+
+    return res.sendSuccess( { result: result } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.body, function: 'userAuditHistory' } );
+    return res.sendError( err, 500 );
+  }
 }
 
 export async function storeMetrics( req, res ) {
@@ -347,7 +434,7 @@ export async function clientMetrics( req, res ) {
         },
       },
     ];
-    if ( inputData.searchValue ) {
+    if ( inputData.searchValue && inputData.searchValue!== '' ) {
       query.push( {
         $match: {
           $or: [

package/src/docs/auditMetrics.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { clientMetricsSchema, getAuditImagesSchema } from '../dtos/auditMetrics.dtos.js';
+import { clientMetricsSchema, getAuditImagesSchema, userAuditHistorySchema } from '../dtos/auditMetrics.dtos.js';
 
 export const auditMetricsDocs = {
 
@@ -47,4 +47,26 @@ export const auditMetricsDocs = {
       },
     },
   },
+  '/v3/audit-metrics/user-audit-history': {
+    post: {
+      tags: [ 'Audit Metrics' ],
+      description: `Get list of user wise audit user details with date range`,
+      operationId: 'user-audit-history',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( userAuditHistorySchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
 };

package/src/dtos/audit.dtos.js

@@ -62,7 +62,7 @@ export const saveValid = {
 
 export const workSpaceSchema = joi.object(
     {
-      searchValue: joi.string().optional(),
+      searchValue: joi.string().optional().allow( '' ),
       offset: joi.string().optional(),
       limit: joi.number().optional(),
       isExport: joi.boolean().optional(),

package/src/dtos/auditMetrics.dtos.js

@@ -15,12 +15,20 @@ export const getAuditImagesValid = {
 
 export const userAuditHistorySchema = joi.object(
     {
-      fromDate: joi.string().required(), // need to clarify  about keys  --userId
+      userId: joi.string().optional(),
+      fromDate: joi.string().required(),
       toDate: joi.string().required(),
-      storeId: joi.string().required(),
-      fileDate: joi.string().required(),
       fileType: joi.string().required(),
-      storeId: joi.string().required(),
+      filterByStoreId: joi.array().required(),
+      filterByType: joi.array().optional(),
+      filterByStatus: joi.array().optional(),
+      searchValue: joi.string().optional().allow( '' ),
+      limit: joi.number().optional(),
+      offset: joi.number().optional(),
+      sortColumnName: joi.string().optional(),
+      sortBy: joi.number().optional(),
+      isExport: joi.boolean().optional(),
+
     },
 );
 
@@ -45,7 +53,7 @@ export const clientMetricsSchema = joi.object(
     {
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
-      searchValue: joi.string().optional(),
+      searchValue: joi.string().optional().allow( '' ),
       filterByClient: joi.array().required(),
       filterByStatus: joi.array().optional(),
       sortColumnName: joi.string().optional(),