tango-app-api-audit 1.0.51 → 1.0.52

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -96,6 +96,7 @@ export async function clients( req, res ) {
   }
 }
 
+//   store
 export async function auditStoreList( req, res ) {
   try {
     const inputData = req.body;
@@ -139,6 +140,7 @@ export async function auditStoreList( req, res ) {
   }
 }
 
+//  user
 export async function auditUserList( req, res ) {
   try {
     const inputData = req.query;
@@ -726,9 +728,9 @@ export const mapFunction = async ( chunk, filter ) => {
 export async function workSpace( req, res ) {
   try {
     const inputData = req.query;
-    const limit = Number( inputData.limit ) || 10;
+    const limit = inputData.limit || 10;
     const offset = inputData.offset ?
-      ( Number( inputData.offset ) - 1 ) * limit :
+      ( inputData.offset - 1 ) * limit :
       0;
     const dateRange = await getUTC( new Date(), new Date() );
 
@@ -744,12 +746,13 @@ export async function workSpace( req, res ) {
       },
       {
         $project: {
-          clientName: '$clientName',
-          clientId: '$clientId',
+          clientName: 1,
+          clientId: 1,
         },
       },
     ];
 
+
     if ( inputData.searchValue && inputData.searchValue !== '' ) {
       clientQuery.push( {
         $match: {
@@ -760,6 +763,15 @@ export async function workSpace( req, res ) {
         },
       } );
     }
+    if ( inputData.sortColumnName ) {
+      const sortBy = inputData.sortBy || -1;
+      logger.info( { sortBy: sortBy } );
+      clientQuery.push( {
+        $sort: { [inputData.sortColumName]: sortBy },
+      },
+      );
+    }
+
     const count = await aggregateClient( clientQuery );
     if ( count?.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
@@ -814,6 +826,7 @@ export async function workSpace( req, res ) {
           $and: [
             { clientId: { $in: clientList } },
             { fileDate: { $eq: latestDate } },
+            { moduleType: { $eq: inputData.moduleType } },
           ],
         },
       },
@@ -856,6 +869,7 @@ export async function workSpace( req, res ) {
             { clientId: { $in: clientList } },
             { createdAt: { $gte: dateRange.start } },
             { createdAt: { $lte: dateRange.end } },
+            { moduleType: { $eq: inputData.moduleType } },
           ],
         },
       },
@@ -894,6 +908,7 @@ export async function workSpace( req, res ) {
           $and: [
             { clientId: { $in: clientList } },
             { userId: { $eq: req.user._id } },
+            { moduleType: { $eq: inputData.moduleType } },
             { createdAt: { $gte: dateRange.start } },
             { createdAt: { $lte: dateRange.end } },
           ],
@@ -934,6 +949,7 @@ export async function workSpace( req, res ) {
             { userId: { $eq: req.user._id } },
             { isCompleted: false },
             { clientId: { $in: clientList } },
+            { moduleType: { $eq: inputData.moduleType } },
           ],
         },
       },
@@ -956,7 +972,10 @@ export async function workSpace( req, res ) {
     const clientAssign = [
       {
         $match: {
-          $and: [ { isCompleted: false }, { clientId: { $in: clientList } } ],
+          $and: [ { isCompleted: false },
+            { clientId: { $in: clientList } },
+            { moduleType: { $eq: inputData.moduleType } },
+          ],
         },
       },
       {
@@ -1071,7 +1090,7 @@ export async function workSpace( req, res ) {
       return;
     } else {
       return res.sendSuccess( {
-        result: temp.sort( ( a, b ) => a.isEnable-b.isEnable ),
+        result: temp,
         count: count.length,
         totalStores: totalStores,
       } );
@@ -1386,3 +1405,258 @@ export async function save( req, res ) {
     return res.sendError( err );
   }
 }
+
+/*           < -- *** Audit  Metrics ***   -->      */
+
+export async function userAuditHistory( req, res ) {
+  try {
+    const inputData = req.body;
+    const userId = inputData.userId? new mongoose.Types.ObjectId( 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: userId } },
+    ];
+
+    if ( inputData.dateType == 'fileDate' ) {
+      filter.push(
+          { fileDateISO: { $gte: dateRange.start } },
+          { fileDateISO: { $lte: dateRange.end } },
+      );
+    } else {
+      filter.push(
+          { createdAt: { $gte: dateRange.start } },
+          { createdAt: { $lte: dateRange.end } },
+      );
+    }
+
+    if ( inputData.filterByModuleType?.length > 0 ) {
+      filter.push( {
+        moduleType: { $in: inputData.filterByModuleType },
+      } );
+    }
+
+    if ( inputData.filterByAuditType?.length > 0 ) {
+      filter.push( {
+        auditType: { $in: inputData.filterByAuditType },
+      } );
+    }
+
+    if ( inputData.filterByStoreId?.length > 0 ) {
+      filter.push( {
+        storeId: { $in: inputData.filterByStoreId },
+      } );
+    }
+
+    if ( inputData.filterByStatus?.length > 0 ) {
+      filter.push( {
+        auditStatus: { $in: inputData.filterByStatus },
+      } );
+    }
+
+    const query = [
+      {
+        $match: {
+          $and: filter,
+        },
+      },
+      {
+        $lookup: {
+          from: 'stores',
+          let: { storeId: '$storeId' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $eq: [ '$storeId', '$$storeId' ],
+                },
+              },
+            },
+            {
+              $project: {
+                storeName: 1,
+              },
+            },
+          ], as: 'store',
+        },
+      },
+      {
+        $unwind: {
+          path: '$store', preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $lookup: {
+          from: 'clients',
+          let: { clientId: '$clientId' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $eq: [ '$clientId', '$$clientId' ],
+                },
+              },
+            },
+            {
+              $project: {
+                clientName: 1,
+              },
+            },
+          ], as: 'client',
+        },
+
+      },
+      {
+        $unwind: {
+          path: '$client', preserveNullAndEmptyArrays: true,
+        },
+      },
+      {
+        $project: {
+          storeId: 1,
+          userId: 1,
+          storeName: '$store.storeName',
+          clientId: 1,
+          clientName: '$client.clientName',
+          fileDate: 1,
+          auditType: 1,
+          zoneName: 1,
+          moduleType: 1,
+          beforeCount: 1,
+          afterCount: 1,
+          accuracy: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, { $round: [
+            {
+              $multiply: [ { $divide: [ '$afterCount', '$beforeCount' ] }, 100 ],
+            }, 1,
+          ],
+          }, null ] },
+
+          startTime: {
+            $dateToString: {
+              format: '%Y-%m-%d %H:%M:%S',
+              date: '$startTime',
+              timezone: 'Asia/Kolkata',
+            },
+          },
+          endTime: {
+            $dateToString: {
+              format: '%Y-%m-%d %H:%M:%S',
+              date: '$endTime',
+              timezone: 'Asia/Kolkata',
+            },
+          },
+          // timeSpent: { $round: [
+          //   { $divide: [ '$timeSpent', 60 ] }, 2,
+          // ] },
+          timeSpent: {
+
+            $cond: [
+              { $lt: [ '$timeSpent', 60 ] }, // Case 1: If less than 60 seconds
+              { $concat: [ { $toString: '$timeSpent' }, ' sec' ] },
+              {
+                $cond: [
+                  { $lt: [ '$timeSpent', 3600 ] }, // Case 2: If less than 60 minutes (3600 seconds)
+                  {
+                    $concat: [
+                      { $toString: { $round: [ { $divide: [ '$timeSpent', 60 ] }, 1 ] } }, // Convert to minutes
+                      ' min',
+                    ],
+                  },
+                  {
+                    $concat: [
+                      { $toString: { $round: [ { $divide: [ '$timeSpent', 3600 ] }, 1 ] } }, // Convert to hours
+                      ' hr',
+                    ],
+                  },
+                ],
+              },
+            ],
+
+          },
+          auditStatus: 1,
+          createdAt: 1,
+        },
+      },
+    ];
+
+    if ( inputData.searchValue && inputData.searchValue!== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
+            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
+            { storeId: { $regex: inputData.searchValue, $options: 'i' } },
+            { storeName: { $regex: inputData.searchValue, $options: 'i' } },
+            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
+            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditType: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
+          ],
+
+        },
+      } );
+    }
+
+    if ( inputData.sortColumnName ) {
+      const sortBy =inputData.sortBy || -1;
+      query.push( {
+        $sort: { [inputData.sortColumName]: sortBy },
+      },
+      );
+    }
+    const count = await aggregateUserAudit( query );
+    if ( count.length == 0 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
+
+    if ( inputData.isExport ) {
+      const chunkedMappingData = await chunkArray( count, 10 );
+      const promises = chunkedMappingData.map( async ( chunk ) => {
+        const exportData = [];
+        chunk.forEach( ( element ) => {
+          exportData.push( {
+
+            'Client Id': element.clientId,
+            'Client Name': element.clientName,
+            'Store Id': element.storeId,
+            'Store Name': element.storeName,
+            'Zone Name': element.zoneName,
+            'Audit Type': element.auditType,
+            'Module Type': element.moduleType,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
+            'Accuracy': element.accuracy,
+            'Start Time': element.startTime,
+            'End Time': element.endTime,
+            'Time Spent': element.timeSpent,
+            'Audit Status': element.auditStatus,
+            'CreatedAt': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
+
+          } );
+        } );
+        return exportData;
+      } );
+      const mappedArrays = await Promise.all( promises );
+      mappedArrays.flat();
+
+      await download( mappedArrays, res );
+      return;
+    }
+
+    query.push( {
+      $skip: offset,
+    },
+    {
+      $limit: limit,
+    } );
+    const result = await aggregateUserAudit( query );
+
+    return res.sendSuccess( { result: result, count: count.length } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.body, function: 'userAuditHistory' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/controllers/auditMetrics.controllers.js

@@ -1,4 +1,4 @@
-import { chunkArray, download, getUTC, insertOpenSearchData, logger, sendMessageToQueue } from 'tango-app-api-middleware';
+import { download, getUTC, insertOpenSearchData, logger, sendMessageToQueue } from 'tango-app-api-middleware';
 import { aggregateUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
 import mongoose from 'mongoose';
 import { aggregateStoreAudit, updateOneStoreAudit } from '../service/storeAudit.service.js';
@@ -11,258 +11,6 @@ import { getAuditFilterData, getAuditImageData, zipDownloadImage } from '../vali
 import { getReauditImg } from './audit.controllers.js';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
-export async function userAuditHistory( req, res ) {
-  try {
-    const inputData = req.body;
-    const userId = inputData.userId? new mongoose.Types.ObjectId( 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: 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 } },
-      );
-    }
-
-    if ( inputData.filterByAuditType?.length > 0 ) {
-      filter.push( {
-        moduleType: { $in: inputData.filterByAuditType },
-      } );
-    }
-
-    if ( inputData.filterByStoreId?.length > 0 ) {
-      filter.push( {
-        storeId: { $in: inputData.filterByStoreId },
-      } );
-    }
-
-    if ( inputData.filterByStatus?.length > 0 ) {
-      filter.push( {
-        auditStatus: { $in: inputData.filterByStatus },
-      } );
-    }
-
-    const query = [
-      {
-        $match: {
-          $and: filter,
-        },
-      },
-    ];
-
-
-    query.push( {
-      $lookup: {
-        from: 'stores',
-        let: { storeId: '$storeId' },
-        pipeline: [
-          {
-            $match: {
-              $expr: {
-                $eq: [ '$storeId', '$$storeId' ],
-              },
-            },
-          },
-          {
-            $project: {
-              storeName: 1,
-            },
-          },
-        ], as: 'store',
-      },
-
-    } );
-
-
-    query.push( {
-      $unwind: {
-        path: '$store', preserveNullAndEmptyArrays: true,
-      },
-    } );
-
-    query.push( {
-      $lookup: {
-        from: 'clients',
-        let: { clientId: '$clientId' },
-        pipeline: [
-          {
-            $match: {
-              $expr: {
-                $eq: [ '$clientId', '$$clientId' ],
-              },
-            },
-          },
-          {
-            $project: {
-              clientName: 1,
-            },
-          },
-        ], as: 'client',
-      },
-
-    } );
-
-
-    query.push( {
-      $unwind: {
-        path: '$client', preserveNullAndEmptyArrays: true,
-      },
-    } );
-
-    query.push( {
-      $project: {
-        storeId: 1,
-        userId: 1,
-        storeName: '$store.storeName',
-        clientId: 1,
-        clientName: 'client.clientName',
-        fileDate: 1,
-        auditType: 1,
-        zoneName: 1,
-        moduleType: 1,
-        beforeCount: 1,
-        afterCount: 1,
-        accuracy: { $round: [
-          {
-            $divide: [ { $multiply: [ '$beforeCount', { $ifNull: [ '$afterCount', 0 ] } ] }, 100 ],
-          }, 1,
-        ],
-        },
-        startTime: {
-          $dateToString: {
-            format: '%Y-%m-%d %H:%M:%S',
-            date: '$startTime',
-            timezone: 'Asia/Kolkata',
-          },
-        },
-        endTime: {
-          $dateToString: {
-            format: '%Y-%m-%d %H:%M:%S',
-            date: '$endTime',
-            timezone: 'Asia/Kolkata',
-          },
-        },
-        // timeSpent: { $round: [
-        //   { $divide: [ '$timeSpent', 60 ] }, 2,
-        // ] },
-        timeSpent: {
-
-          $cond: [
-            { $lt: [ '$timeSpent', 60 ] }, // Case 1: If less than 60 seconds
-            { $concat: [ { $toString: '$timeSpent' }, ' sec' ] },
-            {
-              $cond: [
-                { $lt: [ '$timeSpent', 3600 ] }, // Case 2: If less than 60 minutes (3600 seconds)
-                {
-                  $concat: [
-                    { $toString: { $round: [ { $divide: [ '$timeSpent', 60 ] }, 1 ] } }, // Convert to minutes
-                    ' min',
-                  ],
-                },
-                {
-                  $concat: [
-                    { $toString: { $round: [ { $divide: [ '$timeSpent', 3600 ] }, 1 ] } }, // Convert to hours
-                    ' hr',
-                  ],
-                },
-              ],
-            },
-          ],
-
-        },
-        auditStatus: 1,
-        createdAt: 1,
-      },
-    } );
-
-    if ( inputData.searchValue && inputData.searchValue!== '' ) {
-      query.push( {
-        $match: {
-          $or: [
-            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
-            { clientType: { $regex: inputData.searchValue, $options: 'i' } },
-            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
-            { storeId: { $regex: inputData.searchValue, $options: 'i' } },
-            { storeName: { $regex: inputData.searchValue, $options: 'i' } },
-            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
-            { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
-          ],
-
-        },
-      } );
-    }
-
-    if ( inputData.sortColumnName ) {
-      const sortBy = inputData.sortBy || -1;
-      query.push( {
-        $sort: { [inputData.sortColumName]: sortBy },
-      },
-      );
-    }
-    const count = await aggregateUserAudit( query );
-    if ( count.length == 0 ) {
-      return res.sendError( 'No Data Found', 204 );
-    }
-
-    if ( inputData.isExport ) {
-      const chunkedMappingData = await chunkArray( count, 10 );
-      const promises = chunkedMappingData.map( async ( chunk ) => {
-        const exportData = [];
-        chunk.forEach( ( element ) => {
-          exportData.push( {
-            'Client Id': element.clientId,
-            'Client Name': element.clientName,
-            'Store Id': element.storeId,
-            'Store Name': element.storeName,
-            'Type': element.auditType,
-            'Before Count': element.beforeCount,
-            'After Count': element.afterCount,
-            'Accuracy': element.accuracy,
-            'Zone Name': element.zoneName,
-            'Audit Type': element.moduleType,
-            'Start Time': element.startTime,
-            'End Time': element.endTime,
-            'Time Spent': element.timeSpent,
-            'Audit Status': element.auditStatus,
-            'CreatedAt': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
-
-          } );
-        } );
-        return exportData;
-      } );
-      const mappedArrays = await Promise.all( promises );
-      mappedArrays.flat();
-
-      await download( mappedArrays, res );
-      return;
-    }
-
-    query.push( {
-      $skip: offset,
-    },
-    {
-      $limit: limit,
-    } );
-    const result = await aggregateUserAudit( query );
-
-    return res.sendSuccess( { result: result, count: count.length } );
-  } 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 ) {
   try {

package/src/docs/audit.docs.js

@@ -1,4 +1,4 @@
-import { auditStoreSchema, clientSchema, getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema, userSchema, workSpaceSchema } from '../dtos/audit.dtos.js';
+import { auditStoreSchema, clientSchema, getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema, userAuditHistorySchema, userSchema, workSpaceSchema } from '../dtos/audit.dtos.js';
 import j2s from 'joi-to-swagger';
 
 export const auditDocs = {
@@ -91,6 +91,7 @@ export const auditDocs = {
     },
   },
 
+  /*           < -- *** Audit Mapping ***   -->      */
   '/v3/audit/get-file': {
     get: {
       tags: [ 'Audit Mapping' ],
@@ -239,6 +240,18 @@ export const auditDocs = {
           scema: j2s( workSpaceSchema ).swagger,
           require: false,
         },
+        {
+          in: 'query',
+          name: 'sortColumnName',
+          scema: j2s( workSpaceSchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'sortBy',
+          scema: j2s( workSpaceSchema ).swagger,
+          require: false,
+        },
       ],
       responses: {
         200: { description: 'Successful' },
@@ -249,5 +262,29 @@ export const auditDocs = {
       },
     },
   },
+  /*           < -- *** Audit Metrics ***   -->      */
+
+  '/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/docs/auditMetrics.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { auditImageValidSchema, clientMetricsSchema, getAuditImagesSchema, overAllAuditSummarySchema, overViewCardSchema, overViewTableSchema, reTriggerValidSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema } from '../dtos/auditMetrics.dtos.js';
+import { auditImageValidSchema, clientMetricsSchema, getAuditImagesSchema, overAllAuditSummarySchema, overViewCardSchema, overViewTableSchema, reTriggerValidSchema, storeMetricsSchema, summarySplitSchema, userMetricsSchema } from '../dtos/auditMetrics.dtos.js';
 
 export const auditMetricsDocs = {
 
@@ -47,28 +47,7 @@ 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' },
-      },
-    },
-  },
+
   '/v3/audit-metrics/store-metrics': {
     post: {
       tags: [ 'Audit Metrics' ],

package/src/dtos/audit.dtos.js

@@ -125,12 +125,40 @@ export const workSpaceSchema = joi.object(
     {
       searchValue: joi.string().optional().allow( '' ),
       moduleType: joi.string().required(),
-      offset: joi.string().optional(),
+      offset: joi.number().optional(),
       limit: joi.number().optional(),
       isExport: joi.boolean().optional(),
+      sortColumnName: joi.string().optional(),
+      sortBy: joi.number().optional(),
     },
 );
 
 export const workSpaceValid = {
   query: workSpaceSchema,
 };
+
+/*           < -- *** Audit Metrics ***   -->      */
+
+export const userAuditHistorySchema = joi.object(
+    {
+      userId: joi.string().optional(),
+      fromDate: joi.string().required(),
+      toDate: joi.string().required(),
+      dateType: joi.string().required(),
+      filterByStoreId: joi.array().required(),
+      filterByModuleType: joi.array().optional(),
+      filterByAuditType: 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(),
+
+    },
+);
+
+export const userAuditHistoryValid = {
+  body: userAuditHistorySchema,
+};

package/src/dtos/auditMetrics.dtos.js

@@ -13,29 +13,6 @@ export const getAuditImagesValid = {
   body: getAuditImagesSchema,
 };
 
-export const userAuditHistorySchema = joi.object(
-    {
-      userId: joi.string().optional(),
-      fromDate: joi.string().required(),
-      toDate: joi.string().required(),
-      fileType: joi.string().required(),
-      filterByStoreId: joi.array().required(),
-      filterByType: joi.array().optional(),
-      filterByAuditType: 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(),
-
-    },
-);
-
-export const userAuditHistoryValid = {
-  body: userAuditHistorySchema,
-};
 
 export const storeMetricsSchema = joi.object(
     {

package/src/routes/audit.routes.js

@@ -1,8 +1,8 @@
 import express from 'express';
 import { isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { auditStoreList, auditUserList, clients, getAuditFile, getDraftedData, save, saveDraft, workSpace } from '../controllers/audit.controllers.js';
-import { auditStoreValid, clientValid, getDraftedDataValid, getFileValid, saveDraftValid, saveValid, workSpaceValid } from '../dtos/audit.dtos.js';
+import { auditStoreList, auditUserList, clients, getAuditFile, getDraftedData, save, saveDraft, userAuditHistory, workSpace } from '../controllers/audit.controllers.js';
+import { auditStoreValid, clientValid, getDraftedDataValid, getFileValid, saveDraftValid, saveValid, userAuditHistoryValid, workSpaceValid } from '../dtos/audit.dtos.js';
 
 export const auditRouter = express.Router();
 
@@ -19,4 +19,8 @@ auditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraf
 auditRouter.post( '/save', isAllowedSessionHandler, validate( saveValid ), validateUserAudit, save );
 auditRouter.get( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
 
+// Audit Metrics
+auditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, validate( userAuditHistoryValid ), userAuditHistory );
+
+
 export default auditRouter;

package/src/routes/auditMetrics.routes.js

@@ -1,13 +1,13 @@
 
 import express from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { auditImages, clientMetrics, overAllAuditSummary, overViewCard, overViewTable, reTrigger, storeMetrics, summarySplit, userAuditHistory, userMetrics } from '../controllers/auditMetrics.controllers.js';
-import { auditImageValid, clientMetricsValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, reTriggerValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, viewLogValid } from '../dtos/auditMetrics.dtos.js';
+import { auditImages, clientMetrics, overAllAuditSummary, overViewCard, overViewTable, reTrigger, storeMetrics, summarySplit, userMetrics } from '../controllers/auditMetrics.controllers.js';
+import { auditImageValid, clientMetricsValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, reTriggerValid, storeMetricsValid, summarySplitValid, userMetricsValid, viewLogValid } from '../dtos/auditMetrics.dtos.js';
 import { isAuditDocumentExist, isAuditInputFolderExist } from '../validation/audit.validation.js';
 
 export const auditMetricsRouter = express.Router();
 
-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 );