tango-app-api-audit 1.0.46 → 1.0.48

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.46",
+    "version": "1.0.48",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.0.146",
+        "tango-api-schema": "^2.0.149",
         "tango-app-api-middleware": "^3.1.28",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/audit.controllers.js

@@ -34,7 +34,6 @@ import {
   findOneStoreAudit,
   updateOneStoreAudit,
 } from '../service/storeAudit.service.js';
-import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import _ from 'lodash';
 import {
   createAuditLog,
@@ -69,6 +68,7 @@ export async function getAuditFile( req, res ) {
             { auditStatus: { $nin: [ 'completed', 'skipped' ] } },
             { createdAt: { $gte: start } },
             { createdAt: { $lte: end } },
+            { moduleType: inputData.moduleType },
           ],
         },
       },
@@ -83,7 +83,6 @@ export async function getAuditFile( req, res ) {
     const userDetails = await aggregateUserAudit( userQuery );
     const auditStatus =
       userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
-
     switch ( auditStatus ) {
       case null:
         const query = [
@@ -93,6 +92,7 @@ export async function getAuditFile( req, res ) {
                 { userId: { $eq: req.user._id } },
                 { isCompleted: { $eq: false } },
                 { queueName: inputData.queueName },
+                { moduleType: inputData.moduleType },
               ],
             },
           },
@@ -105,12 +105,14 @@ export async function getAuditFile( req, res ) {
               store_id: userAssign[0].storeId,
               curr_date: userAssign[0].fileDate,
               total_count: userAssign[0].fileCount,
+              zone_id: userAssign[0].zoneName,
             } ) :
             ( msg = {
               store_id: userAssign[0].storeId,
               curr_date: userAssign[0].fileDate,
               audit_type: userAssign[0].fileType,
               total_count: userAssign[0].fileCount,
+              zone_id: userAssign[0].zoneName,
             } );
           await updateOneAssignAudit(
               { _id: userAssign[0]._id },
@@ -143,6 +145,8 @@ export async function getAuditFile( req, res ) {
               fileDate: userDetails[0].fileDate,
               storeId: userDetails[0].storeId,
               totalCount: userDetails[0].beforeCount,
+              moduleType: userDetails[0].moduleType,
+              zoneName: userDetails[0].zoneName,
             },
             {},
             { createdAt: -1 },
@@ -166,6 +170,8 @@ export async function getAuditFile( req, res ) {
           type: userDetails[0].auditType,
           queueName: log.queueName,
           userId: log.userId,
+          moduleType: userDetails[0].moduleType,
+          zoneName: userDetails[0].zoneName,
         };
         const result = {
           junk: log.junk,
@@ -196,6 +202,8 @@ export async function getAuditFile( req, res ) {
               storeId: userDetails[0].storeId,
               clientName: log.queueName,
               auditId: userDetails[0]._id,
+              moduleType: userDetails[0].moduleType,
+              zoneName: userDetails[0].zoneName,
             },
           };
           logger.info( { logData: logData } );
@@ -227,6 +235,7 @@ export async function getAuditFile( req, res ) {
           curr_date: userDetails[0].fileDate,
           audit_type: userDetails[0].auditType,
           total_count: userDetails[0].beforeCount,
+          zone_id: userDetails[0].zoneName,
         };
         break;
     }
@@ -261,6 +270,8 @@ export async function getAuditFile( req, res ) {
           fileDateISO: start,
           timeSpent: 0,
           startTime: new Date(),
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         };
         const storeRecord = {
           userId: req.user._id,
@@ -273,6 +284,8 @@ export async function getAuditFile( req, res ) {
           status: 'inprogress',
           fileDateISO: start,
           timeSpent: 0,
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         };
         reauditInsert = await createUserAudit( record );
         await createStoreAudit( storeRecord );
@@ -292,6 +305,8 @@ export async function getAuditFile( req, res ) {
             storeId: msg.store_id,
             clientName: inputData.queueName,
             auditId: reauditInsert._id,
+            zoneName: msg.zone_id,
+            moduleType: inputData.moduleType,
           },
         };
         await insertOpenSearchData( openSearch.activityLog, logData );
@@ -319,16 +334,19 @@ export async function getAuditFile( req, res ) {
           queueName: inputData.queueName,
           auditId: reauditInsert._id,
           userId: reauditInsert.userId,
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         },
         isDraft: reauditInsert.isDraft,
       } );
     }
     const storeId = msg.store_id;
     const fileDate = msg.curr_date;
+
     const files = [];
     let insertData = {};
     fetchData.Bucket = bucket.auditInput; // need to change
-    fetchData.file_path = `${fileDate}/${storeId}/`;
+    fetchData.file_path = `${fileDate}/${storeId}/${msg.zone_id}/`;
     if ( inputData.limit ) {
       fetchData.MaxKeys = inputData.limit;
     }
@@ -342,7 +360,7 @@ export async function getAuditFile( req, res ) {
     if ( folderPath?.length > 0 ) {
       for ( let i = 0; i < folderPath.length; i++ ) {
         const img = folderPath[i].Key.split( '/' );
-        const image = img[2].split( '.' );
+        const image = img[3].split( '.' );
         const indexes = image[0].split( '_' );
         fetchData.file_path = folderPath[i].Key;
         const data = await signedUrl( fetchData );
@@ -382,6 +400,8 @@ export async function getAuditFile( req, res ) {
           fileDateISO: start,
           timeSpent: 0,
           startTime: new Date(),
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         };
         const storeRecord = {
           userId: req.user._id,
@@ -394,10 +414,12 @@ export async function getAuditFile( req, res ) {
           status: 'inprogress',
           fileDateISO: start,
           timeSpent: 0,
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         };
 
         insertData = await createUserAudit( record );
-        await createAssignZoneAudit( storeRecord );
+        await createStoreAudit( storeRecord );
       } else {
         insertData = userDetails[0];
       }
@@ -430,6 +452,8 @@ export async function getAuditFile( req, res ) {
           storeId: storeId,
           clientName: inputData.queueName,
           auditId: insertData._id,
+          zoneName: msg.zone_id,
+          moduleType: inputData.moduleType,
         },
       };
       await insertOpenSearchData( openSearch.activityLog, logData );
@@ -448,6 +472,8 @@ export async function getAuditFile( req, res ) {
         type: 'Audit',
         auditId: insertData._id,
         userId: insertData.userId,
+        zoneName: msg.zone_id,
+        moduleType: inputData.moduleType,
         nextToken: nextQuery ? encodeURIComponent( nextQuery ) : null,
       },
       isDraft: insertData.isDraft,
@@ -467,7 +493,7 @@ export async function getFilterData( msg ) {
     const bucket = JSON.parse( process.env.BUCKET );
     const params = {
       Bucket: `${bucket.auditOutput}`,
-      Key: `${msg.store_id}/${msg.curr_date}/${bucketName.masterJsonFile}`,
+      Key: `${msg.store_id}/${msg.zone_id}/${msg.curr_date}/${bucketName.masterJsonFile}`,
     };
     const mappingFile = await getJsonFileData( params );
     if ( mappingFile.statusCode ) {
@@ -503,7 +529,7 @@ export async function getAuditImage( msg ) {
     const files = [];
     const fetchData = {};
     fetchData.Bucket = `${bucket.auditInput}`;
-    fetchData.filePath = `${fileDate}/${storeId}/`;
+    fetchData.filePath = `${fileDate}/${storeId}/${msg.zone_id}`;
     const folderPath = await listFileWithoutLimit( fetchData );
     if ( folderPath.statusCode == 404 ) {
       return folderPath;
@@ -512,7 +538,7 @@ export async function getAuditImage( msg ) {
     if ( auditImages && auditImages?.length > 0 ) {
       for ( let i = 0; i < auditImages.length; i++ ) {
         const img = auditImages[i].Key.split( '/' );
-        const image = img[2].split( '.' );
+        const image = img[3].split( '.' );
         const indexes = image[0].split( '_' );
         const params = {
           file_path: auditImages[i].Key,
@@ -537,7 +563,7 @@ export async function getAuditImage( msg ) {
       return files;
     }
   } catch ( error ) {
-    logger.error( { error: error, type: 'GCP BUCKET --getAuditImage' } );
+    logger.error( { error: error, type: 'AWS BUCKET --getAuditImage' } );
     return error;
   }
 }
@@ -612,30 +638,30 @@ export async function workSpace( req, res ) {
 
     const clientDetails = await aggregateClient( clientQuery );
     const clientList = clientDetails.map( ( i ) => i.clientId );
-    const query = [
-      {
-        $match: {
-          clientId: { $in: clientList },
-        },
-      },
-      {
-        $group: {
-          _id: '$clientId',
-          clientId: { $last: '$clientId' },
-          totalFilesCount: { $last: '$totalFilesCount' },
-          clientName: { $last: '$clientName' },
-          queueName: { $last: '$queueName' },
-        },
-      },
-      {
-        $project: {
-          clientId: 1,
-          totalFilesCount: 1,
-          clientName: 1,
-          queueName: 1,
-        },
-      },
-    ];
+    // const query = [
+    //   {
+    //     $match: {
+    //       clientId: { $in: clientList },
+    //     },
+    //   },
+    //   {
+    //     $group: {
+    //       _id: '$clientId',
+    //       clientId: { $last: '$clientId' },
+    //       totalFilesCount: { $last: '$totalFilesCount' },
+    //       clientName: { $last: '$clientName' },
+    //       queueName: { $last: '$queueName' },
+    //     },
+    //   },
+    //   {
+    //     $project: {
+    //       clientId: 1,
+    //       totalFilesCount: 1,
+    //       clientName: 1,
+    //       queueName: 1,
+    //     },
+    //   },
+    // ];
 
     const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' );
 
@@ -799,7 +825,7 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    const auditDetails = await aggregateAuditClientData( query );
+    const auditDetails = [];// await aggregateAuditClientData( query );
     const auditCount = await aggregateUserAudit( auditFiles );
     const draftedCount = await aggregateUserAudit( draftedFiles );
     const CompletedCount = await aggregateStoreAudit( completedFiles );
@@ -956,6 +982,8 @@ export async function saveDraft( req, res ) {
           beforeCount: inputData.totalCount,
           afterCount: inputData.customerCount,
           auditId: inputData.auditId,
+          moduleType: inputData.moduleType,
+          zoneName: inputData.zoneName,
         },
       };
       await insertOpenSearchData( openSearch.activityLog, logData );
@@ -981,6 +1009,8 @@ export async function getDraftedData( req, res ) {
       fileDate: inputData.fileDate,
       storeId: inputData.storeId,
       userId: userId,
+      moduleType: inputData.moduleType,
+      zoneName: inputData.zoneName,
     };
     const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 
@@ -1006,7 +1036,7 @@ export async function save( req, res ) {
 
     const inputData = req.body;
     const params = {
-      Key: `${inputData.storeId}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+      Key: `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
     };
 
     if ( inputData.auditType === 'ReAudit' ) {
@@ -1044,7 +1074,7 @@ export async function save( req, res ) {
 
     const uploadDataParams = {
       Bucket: bucket.auditUploadBucket,
-      Key: `${inputData.storeId}/${inputData.fileDate}/`,
+      Key: `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/`,
       ContentType: 'application/json',
       fileName: `${bucket.masterJsonFile}`,
       body: JSON.stringify( tempObject ),
@@ -1053,7 +1083,7 @@ export async function save( req, res ) {
 
     if ( mappingUpload?.statusCode ) {
       logger.error( {
-        error: `ERROR IN UPLOAD PATH: ${inputData.storeId}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+        error: `ERROR IN UPLOAD PATH: ${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
         type: 'UPLOAD_ERROR',
       } );
       return res.sendError( mappingUpload, 500 );
@@ -1061,6 +1091,8 @@ export async function save( req, res ) {
 
     let getUserAuditData = await findOneUserAudit( {
       _id: new mongoose.Types.ObjectId( inputData.auditId ),
+      moduleType: inputData.moduleType,
+      zoneName: inputData.zoneName,
     } );
     const isoDate = getUserAuditData.startTime;
     const currentTime = dayjs();
@@ -1097,6 +1129,9 @@ export async function save( req, res ) {
     let storeAuditData = await findOneStoreAudit( {
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
+      moduleType: inputData.moduleType,
+      zoneName: inputData.zoneName,
+      auditType: inputData.auditType,
     } );
 
     let clientData = await findClient( { clientId: storeConfig.clientId } );
@@ -1105,7 +1140,7 @@ export async function save( req, res ) {
       ( storeAuditData.beforeCount - inputData.customerCount ) /
       storeAuditData.beforeCount <
       storeConfig.auditConfigs.ratio
-    ) && inputData.auditType == 'Audit' ) {
+    ) && inputData.auditType == 'Audit' && inputData.moduleType=='traffic' ) {
       logger.info(
           `Hit in Reaudit pushing queue  Store Id=${inputData.storeId},File Date=${inputData.fileDate}, /n \nQueue Name = ${clientData[0].auditConfigs.queueName}`,
           'Reaudit',
@@ -1122,31 +1157,39 @@ export async function save( req, res ) {
         } ),
       };
       const sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
-      logger.info( { sqsQueue: sqsQueue } );
 
       if ( sqsQueue.statusCode ) {
         logger.error( {
-          error: `ERROR IN UPLOAD PATH: ${inputData.storeId}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+          error: `${sqsQueue}`,
           type: 'UPLOAD_ERROR',
         } );
         return res.sendError( mappingUpload, 500 );
       }
 
-      await updateOneStoreAudit( { storeId: inputData.storeId },
-          {
-            status: 'not_assign',
-            afterCount: inputData.customerCount,
-            auditType: 'ReAudit',
-            timeSpent: timeDifferenceInMinutes,
-          } );
+      await updateOneStoreAudit( { storeId: inputData.storeId,
+        fileDate: inputData.fileDate,
+        moduleType: inputData.moduleType,
+        zoneName: inputData.zoneName,
+        auditType: inputData.auditType },
+      {
+        status: 'not_assign',
+        afterCount: inputData.customerCount,
+        auditType: 'ReAudit',
+        timeSpent: timeDifferenceInMinutes,
+      } );
     } else {
       logger.info( 'Hit in Features', { data: ( _.omit( inputData, [ 'junk', 'employee', 'customer' ] ) ) } );
-      await updateOneStoreAudit( { storeId: inputData.storeId },
-          {
-            status: 'completed',
-            afterCount: inputData.customerCount,
-            timeSpent: timeDifferenceInMinutes,
-          } );
+      await updateOneStoreAudit( { storeId: inputData.storeId,
+        fileDate: inputData.fileDate,
+        moduleType: inputData.moduleType,
+        zoneName: inputData.zoneName,
+        auditType: inputData.auditType,
+      },
+      {
+        status: 'completed',
+        afterCount: inputData.customerCount,
+        timeSpent: timeDifferenceInMinutes,
+      } );
 
       const sqsProduceQueue = {
         QueueUrl: `${sqs.url}${sqs.feature}`,
@@ -1155,6 +1198,8 @@ export async function save( req, res ) {
           store_id: inputData.storeId,
           store_date: inputData.fileDate,
           bucket_name: `${bucket.auditUploadBucket}`,
+          zone_id: inputData.zoneName,
+          process_type: 'audit',
         } ),
       };
       logger.info( { sqsProduceQueue: sqsProduceQueue } );

package/src/controllers/auditMetrics.controllers.js

@@ -1,5 +1,4 @@
 import { chunkArray, download, getUTC, insertOpenSearchData, logger, sendMessageToQueue } from 'tango-app-api-middleware';
-import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import { aggregateUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
 import mongoose from 'mongoose';
 import { aggregateStoreAudit, updateOneStoreAudit } from '../service/storeAudit.service.js';
@@ -10,7 +9,6 @@ import { countDocumentsStore } from '../service/store.service.js';
 import { findOneClient } from '../service/client.service.js';
 import { getAuditFilterData, getAuditImageData, zipDownloadImage } from '../validation/audit.validation.js';
 import { getReauditImg } from './audit.controllers.js';
-import { aggregateStoreZoneAudit } from '../service/storeZoneAudit.service.js';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
 export async function userAuditHistory( req, res ) {
@@ -663,8 +661,8 @@ export async function clientMetrics( req, res ) {
       },
       );
     }
-
-    const count = await aggregateAuditClientData( query );
+    logger.info( { query: query } );
+    const count = [];// await aggregateAuditClientData( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -694,8 +692,8 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-
-    const result = await aggregateAuditClientData( query );
+    logger.info( { query: query } );
+    const result = [];// await aggregateAuditClientData( query );
     if ( inputData.isExport ) {
       await download( result, res );
       return;
@@ -1339,21 +1337,21 @@ export async function overAllAuditSummary( req, res ) {
     }
     const storeQuery = inputData.clientId.length? { 'edge.firstFile': true, 'clientId': { $in: inputData. clientId } } : { 'edge.firstFile': true };
     temp.installedStores = await countDocumentsStore( storeQuery );
-    const auditClientDataQuery =[
-      {
-        $match: {
-          $and: filters,
-        },
-
-      },
-      {
-        $group: {
-          _id: null,
-          totalFilesCount: { $sum: '$totalFilesCount' },
-        },
-      },
-    ];
-    const auditClientData = await aggregateAuditClientData( auditClientDataQuery );
+    // const auditClientDataQuery =[
+    //   {
+    //     $match: {
+    //       $and: filters,
+    //     },
+
+    //   },
+    //   {
+    //     $group: {
+    //       _id: null,
+    //       totalFilesCount: { $sum: '$totalFilesCount' },
+    //     },
+    //   },
+    // ];
+    const auditClientData = [];// await aggregateAuditClientData( auditClientDataQuery );
     if ( auditClientData.length >0 ) {
       temp.auditStores = auditClientData[0].totalFilesCount;
     }
@@ -1405,7 +1403,7 @@ export async function overAllAuditSummary( req, res ) {
         },
       },
     ];
-    const storeAudit = inputData.moduleType == 'zone'?await aggregateStoreZoneAudit( storeAuditQuery ) : await aggregateStoreAudit( storeAuditQuery );
+    const storeAudit = await aggregateStoreAudit( storeAuditQuery );
     if ( storeAudit.length > 0 ) {
       temp.inprogreseStores= storeAudit[0].inprogreseStores;
       temp.completedStores = storeAudit[0].completedStores;

package/src/controllers/zoneAudit.controller.js

@@ -1,8 +1,6 @@
 import { download, fileUpload, getJsonFileData, getUTC, insertOpenSearchData, listFileByPath, listFileWithoutLimit, sendMessageToQueue, signedUrl, sqsReceive } from 'tango-app-api-middleware';
 import { aggregateZoneUserAudit, createZoneUserAudit, findOneZoneUserAudit, updateOneZoneUserAudit } from '../service/zoneUserAudit.service.js';
 import { logger } from 'tango-app-api-middleware';
-import { aggregateAssignZoneAudit } from '../service/assignZoneAudit.service.js';
-import { aggregateStoreZoneAudit, createStoreZoneAudit, findOneStoreZoneAudit, updateOneStoreZoneAudit } from '../service/storeZoneAudit.service.js';
 import { findOneUser } from '../service/user.service.js';
 import { findOneStore } from '../service/store.service.js';
 import dayjs from 'dayjs';
@@ -11,7 +9,6 @@ import { aggregateAssignAudit, createAssignAudit } from '../service/assignAudit.
 import { createAuditLog, findOneAuditLog } from '../service/auditLog.service.js';
 import { mapCustomer, mapEmployee, mapJunk, splitB20000, splitE0, splitG20000, zipDownloadImage } from '../validation/audit.validation.js';
 import { aggregateClient, findClient, findOneClient } from '../service/client.service.js';
-import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import _ from 'lodash';
 import mongoose from 'mongoose';
 import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
@@ -73,7 +70,7 @@ export async function getZoneAuditFile( req, res ) {
           },
         ];
 
-        const userAssign = await aggregateAssignZoneAudit( query );
+        const userAssign = await aggregateAssignAudit( query );
         if ( userAssign.length > 0 ) {
           logger.info( 'Hit in user assign', { inputData } );
         } else {
@@ -776,38 +773,38 @@ export async function workSpace( req, res ) {
 
     const clientDetails = await aggregateClient( clientQuery );
     const clientList = clientDetails.map( ( i ) => i.clientId );
-    const query = [
-      {
-        $match: {
-          $and: [
-            {
-              clientId: { $in: clientList },
-            },
-            {
-              moduleType: 'zone',
-            },
-          ],
-
-        },
-      },
-      {
-        $group: {
-          _id: '$clientId',
-          clientId: { $last: '$clientId' },
-          totalFilesCount: { $last: '$totalFilesCount' },
-          clientName: { $last: '$clientName' },
-          queueName: { $last: '$queueName' },
-        },
-      },
-      {
-        $project: {
-          clientId: 1,
-          totalFilesCount: 1,
-          clientName: 1,
-          queueName: 1,
-        },
-      },
-    ];
+    // const query = [
+    //   {
+    //     $match: {
+    //       $and: [
+    //         {
+    //           clientId: { $in: clientList },
+    //         },
+    //         {
+    //           moduleType: 'zone',
+    //         },
+    //       ],
+
+    //     },
+    //   },
+    //   {
+    //     $group: {
+    //       _id: '$clientId',
+    //       clientId: { $last: '$clientId' },
+    //       totalFilesCount: { $last: '$totalFilesCount' },
+    //       clientName: { $last: '$clientName' },
+    //       queueName: { $last: '$queueName' },
+    //     },
+    //   },
+    //   {
+    //     $project: {
+    //       clientId: 1,
+    //       totalFilesCount: 1,
+    //       clientName: 1,
+    //       queueName: 1,
+    //     },
+    //   },
+    // ];
 
     const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' );
 
@@ -977,7 +974,7 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    const auditDetails = await aggregateAuditClientData( query );
+    const auditDetails = [];// await aggregateAuditClientData( query );
     const auditCount = await aggregateUserAudit( auditFiles );
     const draftedCount = await aggregateUserAudit( draftedFiles );
     const CompletedCount = await aggregateStoreZoneAudit( completedFiles );
@@ -1626,8 +1623,8 @@ export async function clientMetrics( req, res ) {
       },
       );
     }
-
-    const count = await aggregateAuditClientData( query );
+    logger.info( { query: query } );
+    const count = [];// await aggregateAuditClientData( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1657,8 +1654,8 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-
-    const result = await aggregateAuditClientData( query );
+    logger.info( { query: query } );
+    const result = [];// await aggregateAuditClientData( query );
     if ( inputData.isExport ) {
       await download( result, res );
       return;

package/src/docs/audit.docs.js

@@ -26,6 +26,12 @@ export const auditDocs = {
           scema: j2s( getFileSchema ).swagger,
           require: false,
         },
+        {
+          in: 'query',
+          name: 'moduleType',
+          scema: j2s( getFileSchema ).swagger,
+          require: true,
+        },
       ],
       responses: {
         200: { description: 'Successful' },

package/src/dtos/audit.dtos.js

@@ -6,6 +6,7 @@ export const getFileSchema = joi.object(
       queueName: joi.string().required(),
       nextId: joi.string().optional().allow( '' ),
       limit: joi.number().optional(),
+      moduleType: joi.string().required(),
     },
 );
 
@@ -18,6 +19,8 @@ export const saveDraftSchema = joi.object(
       userCommands: joi.string().optional().allow( '' ),
       storeId: joi.string().required(),
       auditId: joi.string().required(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
       auditType: joi.string().required(),
       fileDate: joi.string().required(),
       queueName: joi.string().required(),
@@ -42,6 +45,8 @@ export const getDraftedDataSchema = joi.object(
       storeId: joi.string().required(),
       fileDate: joi.string().required(),
       userId: joi.string().optional(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
     },
 );
 
@@ -55,6 +60,8 @@ export const saveSchema = joi.object(
       storeId: joi.string().required(),
       fileDate: joi.string().required(),
       auditType: joi.string().required(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
       beforeCount: joi.number().required(),
       junkCount: joi.number().required(),
       junk: joi.array().required(),
@@ -62,6 +69,8 @@ export const saveSchema = joi.object(
       employee: joi.array().required(),
       customerCount: joi.number().required(),
       customer: joi.array().required(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
     },
 );
 

package/src/validation/zoneAudit.validation.js

@@ -1,5 +1,5 @@
 import { checkFileExist, getJsonFileData, listFileWithoutLimit, signedUrl } from 'tango-app-api-middleware';
-import { findOneStoreZoneAudit } from '../service/storeZoneAudit.service.js';
+import { findOneStoreAudit } from '../service/storeAudit.service.js';
 
 export async function isAuditDocumentExist( req, res, next ) {
   try {
@@ -9,7 +9,7 @@ export async function isAuditDocumentExist( req, res, next ) {
       fileDate: inputData.fileDate,
       zoneName: inputData.zoneName,
     };
-    const auditInfo = await findOneStoreZoneAudit( query );
+    const auditInfo = await findOneStoreAudit( query );
     if ( auditInfo ) {
       req.audit = auditInfo;
       return next();

package/src/service/assignZoneAudit.service.js

@@ -1,12 +0,0 @@
-import assignZoneAuditModel from 'tango-api-schema/schema/assignZoneAudit.model.js';
-
-export function aggregateAssignZoneAudit( query ) {
-  return assignZoneAuditModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
-}
-export function updateOneAssignZoneAudit( query, record ) {
-  return assignZoneAuditModel.updateOne( query, { $set: record } );
-}
-
-export function createAssignZoneAudit( query ) {
-  return assignZoneAuditModel.create( query );
-}

package/src/service/auditClientData.service.js

@@ -1,6 +0,0 @@
-import auditClientDataModel from 'tango-api-schema/schema/auditClientData.model.js';
-
-
-export function aggregateAuditClientData( query ) {
-  return auditClientDataModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
-}

package/src/service/storeZoneAudit.service.js

@@ -1,17 +0,0 @@
-import storeZoneAuditModel from 'tango-api-schema/schema/storeZoneAudit.model.js';
-
-export function updateOneStoreZoneAudit( query, record ) {
-  return storeZoneAuditModel.updateOne( query, { $set: record } );
-}
-
-export function createStoreZoneAudit( record ) {
-  return storeZoneAuditModel.create( record );
-}
-
-export function aggregateStoreZoneAudit( query ) {
-  return storeZoneAuditModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
-}
-
-export function findOneStoreZoneAudit( query, fields ) {
-  return storeZoneAuditModel.findOne( query, fields );
-}