tango-app-api-audit 3.3.0-beta.3 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-beta.3",
+    "version": "3.3.1",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.0.159",
-        "tango-app-api-middleware": "^3.1.32",
+        "tango-app-api-middleware": "^3.1.33",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/audit.controllers.js

@@ -3,11 +3,12 @@ import {
   download,
   fileUpload,
   getJsonFileData,
-  getUTC,
   insertOpenSearchData,
   listFileByPath,
   listFileWithoutLimit,
   signedUrl,
+  getDate, getDateWithCustomizeTime,
+  getUTC,
 } from 'tango-app-api-middleware';
 import {
   aggregateUserAudit,
@@ -194,7 +195,9 @@ export async function getAuditFile( req, res ) {
     const bucket = JSON.parse( process.env.BUCKET );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    const data = await getUTC( new Date(), new Date() );
+    const data = await getDate( new Date(), new Date() );
+    logger.info( { data: data, function: 'data', newDate: new Date() } );
+    logger.info( { userId: req.user._id, queueName: inputData.queueName, moduleType: inputData.moduleType } );
     const start = data.start;
     const end = data.end;
     const fetchData = {};
@@ -221,6 +224,7 @@ export async function getAuditFile( req, res ) {
     ];
 
     const userDetails = await aggregateUserAudit( userQuery );
+    logger.info( { userDetails: userDetails, function: 'userDetails' } );
     const auditStatus =
       userDetails && userDetails.length > 0 ? userDetails[0].auditStatus : null;
     switch ( auditStatus ) {
@@ -240,7 +244,7 @@ export async function getAuditFile( req, res ) {
         const userAssign = await aggregateAssignAudit( query );
         if ( userAssign.length > 0 ) {
           logger.info( 'Hit in user assign', { inputData } );
-          userAssign[0].fileType == 'Audit' ?
+          userAssign[0].auditType == 'Audit' ?
             ( msg = {
               store_id: userAssign[0].storeId,
               curr_date: userAssign[0].fileDate,
@@ -250,7 +254,7 @@ export async function getAuditFile( req, res ) {
             ( msg = {
               store_id: userAssign[0].storeId,
               curr_date: userAssign[0].fileDate,
-              audit_type: userAssign[0].fileType,
+              audit_type: userAssign[0].auditType,
               total_count: userAssign[0].fileCount,
               zone_id: userAssign[0].zoneName,
             } );
@@ -1143,6 +1147,7 @@ export async function saveDraft( req, res ) {
     const storeQuery = {
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
+      zoneName: inputData.zoneName,
     };
 
     let storeRecord = {
@@ -1442,7 +1447,7 @@ export async function userAuditHistory( req, res ) {
     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 ) );
-
+    const dateRangeCreatedAt = await getDateWithCustomizeTime( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [
       { userId: { $eq: userId } },
     ];
@@ -1454,8 +1459,8 @@ export async function userAuditHistory( req, res ) {
       );
     } else {
       filter.push(
-          { createdAt: { $gte: dateRange.start } },
-          { createdAt: { $lte: dateRange.end } },
+          { createdAt: { $gte: dateRangeCreatedAt.start } },
+          { createdAt: { $lte: dateRangeCreatedAt.end } },
       );
     }
 
@@ -1646,46 +1651,25 @@ export async function userAuditHistory( req, res ) {
       const promises = chunkedMappingData.map( async ( chunk ) => {
         const exportData = [];
         chunk.forEach( ( element ) => {
-          if ( element.moduleType == 'zone' ) {
-            exportData.push( {
-              'File Date': element.fileDate,
-              'Brand ID': element.clientId,
-              'Brand Name': element.clientName,
-              'Store ID': element.storeId,
-              'Store Name': element.storeName,
-              'Zone Name': element.zoneName,
-              'Audit Type': element.auditType,
-              'Product 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,
-              'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
-
-            } );
-          } else {
-            exportData.push( {
-              'File Date': element.fileDate,
-              'Brand ID': element.clientId,
-              'Brand Name': element.clientName,
-              'Store ID': element.storeId,
-              'Store Name': element.storeName,
-              'Audit Type': element.auditType,
-              'Product 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,
-              'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
+          exportData.push( {
+            'File Date': element.fileDate,
+            'Brand ID': element.clientId,
+            'Brand Name': element.clientName,
+            'Store ID': element.storeId,
+            'Store Name': element.storeName,
+            'Zone Name': element.moduleType == 'zone'? element.zoneName : '',
+            'Audit Type': element.auditType,
+            'Product 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,
+            'Audited Date': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
 
-            } );
-          }
+          } );
         } );
         return exportData;
       } );
@@ -2229,11 +2213,12 @@ export async function userMetrics( req, res ) {
     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 ) );
+    const dateRangeUpdatedAt = await getDateWithCustomizeTime( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [];
     if ( inputData.dateType == 'auditedDate' ) {
       filter.push(
-          { updatedAt: { $gte: dateRange.start } },
-          { updatedAt: { $lte: dateRange.end } },
+          { updatedAt: { $gte: dateRangeUpdatedAt.start } },
+          { updatedAt: { $lte: dateRangeUpdatedAt.end } },
 
       );
     } else {
@@ -2936,7 +2921,7 @@ export async function reTrigger( req, res ) {
         await insertOpenSearchData( openSearch.auditLog, logData );
     }
 
-    return res.sendSuccess( { result: 'The File has been Re-Trigger Succesfully' } );
+    return res.sendSuccess( { result: 'The File has been Re-Triggered Succesfully' } );
   } catch ( error ) {
     const err = error.message;
     logger.error( { error: error, message: req.body, function: 'reTrigger' } );

package/src/routes/audit.routes.js

@@ -12,7 +12,7 @@ auditRouter.get( '/clients', isAllowedSessionHandler, validate( clientValid ), c
 auditRouter.post( '/audit-stores', isAllowedSessionHandler, validate( auditStoreValid ), auditStoreList );
 auditRouter.get( '/tango-users', isAllowedSessionHandler, auditUserList );
 
-//  Audit Mapping
+// Audit Mapping
 auditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ), isExistsQueue, getAuditFile );
 auditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraftValid ), saveDraft );
 auditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraftedDataValid ), getDraftedData );