tango-app-api-audit 3.3.0-alpha.5 → 3.3.0-alpha.6

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -337,7 +337,7 @@ export async function getAuditFile( req, res ) {
             logType: 'audit',
             logSubType: 'auditStart',
             logData: {
-              file_date: userDetails[0].fileDate,
+              fileDate: userDetails[0].fileDate,
               auditType: userDetails[0].auditType,
               storeId: userDetails[0].storeId,
               clientName: log.queueName,
@@ -345,9 +345,10 @@ export async function getAuditFile( req, res ) {
               moduleType: userDetails[0].moduleType,
               zoneName: userDetails[0].zoneName,
             },
+            createdAt: new Date(),
           };
           logger.info( { logData: logData } );
-          await insertOpenSearchData( openSearch.activityLog, logData );
+          await insertOpenSearchData( openSearch.auditLog, logData );
         }
         const storeQuery = {
           storeId: userDetails[0].storeId,
@@ -446,8 +447,9 @@ export async function getAuditFile( req, res ) {
             zoneName: msg.zone_id,
             moduleType: inputData.moduleType,
           },
+          createdAt: new Date(),
         };
-        await insertOpenSearchData( openSearch.activityLog, logData );
+        await insertOpenSearchData( openSearch.auditLog, logData );
       }
 
       const storeQuery = {
@@ -598,8 +600,9 @@ export async function getAuditFile( req, res ) {
           zoneName: msg.zone_id,
           moduleType: inputData.moduleType,
         },
+        createdAt: new Date(),
       };
-      await insertOpenSearchData( openSearch.activityLog, logData );
+      await insertOpenSearchData( openSearch.auditLog, logData );
     }
     logger.info( { storeInfo: storeInfo } );
     return res.sendSuccess( {
@@ -1160,6 +1163,7 @@ export async function saveDraft( req, res ) {
         logType: 'audit',
         logSubType: 'auditDraft',
         logData: {
+          fileDate: insertData.fileDate,
           auditType: inputData.auditType,
           storeId: inputData.storeId,
           clientName: inputData.queueName,
@@ -1169,8 +1173,9 @@ export async function saveDraft( req, res ) {
           moduleType: inputData.moduleType,
           zoneName: inputData.zoneName,
         },
+        createdAt: new Date(),
       };
-      await insertOpenSearchData( openSearch.activityLog, logData );
+      await insertOpenSearchData( openSearch.auditLog, logData );
     }
     await createAuditLog( inputData );
     await updateOneUserAudit( userQuery, userRecord );
@@ -2789,8 +2794,9 @@ export async function reTrigger( req, res ) {
               triggerId: req.user._id,
               triggerType: inputData.triggerType,
             },
+            createdAt: new Date(),
           };
-          await insertOpenSearchData( openSearch.activityLog, logData );
+          await insertOpenSearchData( openSearch.auditLog, logData );
         }
         break;
       case 'user':
@@ -2849,8 +2855,9 @@ export async function reTrigger( req, res ) {
             triggerId: req.user._id,
             triggerType: inputData.triggerType,
           },
+          createdAt: new Date(),
         };
-        await insertOpenSearchData( openSearch.activityLog, logData );
+        await insertOpenSearchData( openSearch.auditLog, logData );
     }
 
     return res.sendSuccess( { result: 'The File has been Re Trigger Succesfully' } );
@@ -3060,10 +3067,13 @@ export async function auditImages( req, res ) {
       case 'BC':
         const auditImageBC = await getAuditImageData( inputData );
         if ( auditImageBC?.errorCode ) {
-          const error = auditImageBC?.errorMsg;
+          const error = auditImageBC?.error || 'Internal Server Error- get BC from Bucket';
           const code = auditImageBC?.errorCode;
           return res.sendError( { error: error }, code );
         }
+        if ( auditImageBC?.length == 0 ) {
+          return res.sendError( 'No Data Found', 204 );
+        }
 
         if ( inputData.export==true ) {
           auditImageDownload= await zipDownloadImage( auditImageBC );
@@ -3083,12 +3093,15 @@ export async function auditImages( req, res ) {
         const [ filterData, auditImageAC ] = await Promise.all( [ getAuditFilterData( inputData ), getAuditImageData( inputData ) ] );
 
         if ( filterData?.errorCode || auditImageAC?.errorCode ) {
-          const error = filterData?.errorMsg || auditImageAC.errorMsg;
+          const error = ( filterData?.error || auditImageAC.error ) || 'Internal Server Error- get AC from Bucket';
           const code = filterData?.errorCode || auditImageAC.errorCode;
           return res.sendError( { error: error }, code );
         }
 
         const reauditImg = await getReauditImg( filterData, auditImageAC );
+        if ( reauditImg?.length == 0 ) {
+          return res.sendError( 'No Data Found', 204 );
+        }
 
         logger.info( { auditImageAC: auditImageAC, filterData: filterData, reauditImg: reauditImg } );
         if ( inputData.export==true ) {

package/src/validation/audit.validation.js

@@ -212,7 +212,7 @@ export async function getAuditImageData( data ) {
     const fileDate = data.fileDate;
     const files = [];
     const fetchData = {
-      Bucket: `${bucket.auditOutput}`,
+      Bucket: `${bucket.auditUploadBucket}`,
       filePath: `${fileDate}/${storeId}/${data.zoneName}/`,
     };
     const folderPath = await listFileWithoutLimit( fetchData );