tango-app-api-audit 1.0.36 → 1.0.38

package/package.json

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

package/src/controllers/zoneAudit.controller.js

@@ -1,4 +1,4 @@
-import { getJsonFileData, getUTC, insertOpenSearchData, listFileByPath, sendMessageToQueue, signedUrl, sqsReceive } from 'tango-app-api-middleware';
+import { download, fileUpload, getJsonFileData, getUTC, insertOpenSearchData, listFileByPath, sendMessageToQueue, signedUrl, sqsReceive } from 'tango-app-api-middleware';
 import { aggregateZoneUserAudit, createZoneUserAudit, findOneZoneUserAudit } from '../service/zoneUserAudit.service.js';
 import { logger } from 'tango-app-api-middleware';
 import { aggregateAssignZoneAudit } from '../service/assignZoneAudit.service.js';
@@ -10,6 +10,10 @@ import { aggregateUserAudit, findOneUserAudit, updateOneUserAudit } from '../ser
 import { aggregateAssignAudit } from '../service/assignAudit.service.js';
 import { createAuditLog, findOneAuditLog } from '../service/auditLog.service.js';
 import { mapCustomer, mapEmployee, mapJunk, splitB20000, splitE0, splitG20000 } from '../validation/audit.validation.js';
+import { aggregateClient, findClient } from '../service/client.service.js';
+import { aggregateAuditClientData } from '../service/auditClientData.service.js';
+import _ from 'lodash';
+import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
 export async function getZoneAuditFile( req, res ) {
   try {
@@ -353,8 +357,8 @@ export async function getDraftedData( req, res ) {
     };
     const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 
-    if ( result.length == 0 ) {
-      return res.sendError( 'No Data Found', 500 );
+    if ( !result ) {
+      return res.sendError( 'No Data Found', 204 );
     }
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
@@ -422,14 +426,14 @@ 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 );
     }
 
     let getUserAuditData = await findOneUserAudit( {
-      _id: new mongoose.Types.ObjectId( inputData.auditId ),
+      _id: inputData.auditId,
     } );
     const isoDate = getUserAuditData.startTime;
     const currentTime = dayjs();
@@ -437,7 +441,7 @@ export async function save( req, res ) {
     const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
 
     await updateOneUserAudit(
-        { _id: new mongoose.Types.ObjectId( inputData.auditId ) },
+        { _id: inputData.auditId },
         {
           auditStatus: 'completed',
           endTime: Date.now(),
@@ -477,7 +481,7 @@ export async function save( req, res ) {
       storeConfig.auditConfigs.ratio
     ) && inputData.auditType == 'Audit' ) {
       logger.info(
-          `Hit in Reaudit pushing queue  Store Id=${inputData.storeId},File Date=${inputData.fileDate}, /n \nQueue Name = ${clientData[0].auditConfigs.queueName}`,
+          `Hit in Reaudit pushing queue  Store Id=${inputData.storeId},zone Name = ${inputData.zoneName}File Date=${inputData.fileDate}, /n \nQueue Name = ${clientData[0].auditConfigs.queueName}`,
           'Reaudit',
       );
 
@@ -497,7 +501,7 @@ export async function save( req, res ) {
 
       if ( sqsQueue.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 );
@@ -539,7 +543,7 @@ export async function save( req, res ) {
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.body, function: 'save' } );
-    return res.sendError( err );
+    return res.sendError( err, 500 );
   }
 }
 

package/src/docs/zoneAudit.docs.js

@@ -74,7 +74,13 @@ export const zoneAuditDocs = {
           in: 'query',
           name: 'storeId',
           scema: j2s( getDraftedDataSchema ).swagger,
-          require: false,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'zoneName',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
         },
       ],
       responses: {