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

package/app.js

@@ -0,0 +1,38 @@
+import express from 'express';
+import { auditRouter } from './index.js';
+import dotenv from 'dotenv';
+import { logger } from 'tango-app-api-middleware';
+import { connectdb } from './config/database/database.js';
+import responseMiddleware from './config/response/response.js';
+import errorMiddleware from './config/response/error.js';
+import pkg from 'body-parser';
+import { swaggerConfig } from './config/swagger/swagger.js';
+import swagger from 'swagger-ui-express';
+
+const { json, urlencoded } = pkg;
+const env=dotenv.config();
+
+const app = express();
+const PORT = process.env.PORT || 3000;
+
+
+app.use( json( { limit: '500mb' } ) );
+app.use(
+    urlencoded( {
+      extended: true,
+    } ),
+);
+app.use( responseMiddleware );
+app.use( errorMiddleware );
+if ( env.error ) {
+  logger.error( '.env not found' );
+  process.exit( 1 );
+}
+app.use( '/api-docs', swagger.serve, swagger.setup( swaggerConfig ) );
+app.use( '/v3/audit', auditRouter );
+
+app.listen( PORT, () => {
+  logger.info( `server is running on port= ${PORT} ` );
+  connectdb();
+} );
+

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-alpha.5",
+    "version": "3.3.0-alpha.7",
     "description": "audit & audit metrics apis",
-    "main": "index.js",
+    "main": "app.js",
     "type": "module",
     "scripts": {
-        "start": "nodemon --exec \"eslint --fix . && node index.js\""
+        "start": "nodemon --exec \"eslint --fix . && node app.js\""
     },
     "engines": {
         "node": ">=18.10.0"

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( {
@@ -714,8 +717,6 @@ export async function getAuditImage( msg ) {
 
 export const getReauditImg = async ( filter, image ) => {
   const chunkedMappingData = await chunkArray( image, 10 );
-  logger.info( { chunkedMappingData: chunkedMappingData, level: 5 } );
-
   const promises = chunkedMappingData.map( async ( chunk ) => {
     return mapFunction( chunk, filter );
   } );
@@ -1160,6 +1161,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 +1171,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 +2792,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 +2853,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 +3065,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 +3091,16 @@ 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 );
+        logger.info( { reauditImg: reauditImg } );
+        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,9 +212,10 @@ export async function getAuditImageData( data ) {
     const fileDate = data.fileDate;
     const files = [];
     const fetchData = {
-      Bucket: `${bucket.auditOutput}`,
+      Bucket: `${bucket.auditInput}`,
       filePath: `${fileDate}/${storeId}/${data.zoneName}/`,
     };
+
     const folderPath = await listFileWithoutLimit( fetchData );
     if ( folderPath.statusCode == 404 ) {
       return folderPath;
@@ -233,11 +234,10 @@ export async function getAuditImageData( data ) {
           };
           const data = await signedUrl( params );
           files.push( {
-            imgPath: data,
-            imgName: indexes[1],
-            imgId: image[0],
+            img_path: data,
             img_name: indexes[1],
-            // imgFile: auditImages[i],
+            img_id: image[0],
+            imgFile: auditImages[i],
           } );
         }
         return files;
@@ -254,9 +254,8 @@ export async function getAuditImageData( data ) {
           };
           const data = await signedUrl( params );
           files.push( {
-            imgPath: data,
-            imgName: indexes[1],
-            imgId: image[0],
+            img_path: data,
+            img_id: image[0],
             imgFile: auditImages[i],
             img_name: indexes[1],
           } );
@@ -272,6 +271,7 @@ export async function getAuditImageData( data ) {
 
 export async function zipDownloadImage( data ) {
   try {
+    logger.info( { zipDownloadImage: data } );
     const bucket = JSON.parse( process.env.BUCKET );
     const zip = new AdmZip();
     const split = await chunkArray( data, 10 );
@@ -281,6 +281,7 @@ export async function zipDownloadImage( data ) {
           Bucket: `${bucket.auditInput}`,
           Key: chunk[i].imgFile.Key,
         };
+        logger.info( { params: params } );
         const fileBuffer = await getObject( params );
         zip.addFile( chunk[i].imgFile.Key, fileBuffer.Body );
       }