tango-app-api-audit 3.3.0-alpha.2 → 3.3.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-alpha.2",
+    "version": "3.3.0-alpha.4",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,8 +24,8 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.0.152",
-        "tango-app-api-middleware": "^3.1.30",
+        "tango-api-schema": "^2.0.154",
+        "tango-app-api-middleware": "^3.3.0-alpha.0",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/audit.controllers.js

@@ -42,12 +42,15 @@ import {
 } from '../service/auditLog.service.js';
 import { aggregateStore, countDocumentsStore, findOneStore } from '../service/store.service.js';
 import {
+  getAuditFilterData,
+  getAuditImageData,
   mapCustomer,
   mapEmployee,
   mapJunk,
   splitB20000,
   splitE0,
   splitG20000,
+  zipDownloadImage,
 } from '../validation/audit.validation.js';
 import mongoose from 'mongoose';
 import {
@@ -3047,3 +3050,68 @@ export async function summarySplit( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+
+export async function auditImages( req, res ) {
+  try {
+    const inputData = req.query;
+    let auditImageDownload = '';
+    switch ( inputData.imageType ) {
+      case 'BC':
+        const auditImageBC = await getAuditImageData( inputData );
+        if ( auditImageBC?.errorCode ) {
+          const error = auditImageBC?.errorMsg;
+          const code = auditImageBC?.errorCode;
+          return res.sendError( { error: error }, code );
+        }
+
+        if ( inputData.export==true ) {
+          auditImageDownload= await zipDownloadImage( auditImageBC );
+          // Set response headers for the zip file
+          res.set( 'Content-Type', 'application/zip' );
+          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.imageType}.zip` );
+
+          // Send the zip file as the API response
+          return res.send( auditImageDownload );
+        }
+        res.sendSuccess( { result: auditImageBC } );
+
+        break;
+
+      case 'AC':
+
+        const [ filterData, auditImageAC ] = await Promise.all( [ getAuditFilterData( inputData ), getAuditImageData( inputData ) ] );
+
+        if ( filterData?.errorCode || auditImageAC?.errorCode ) {
+          const error = filterData?.errorMsg || auditImageAC.errorMsg;
+          const code = filterData?.errorCode || auditImageAC.errorCode;
+          return res.sendError( { error: error }, code );
+        }
+
+        const reauditImg = await getReauditImg( filterData, auditImageAC );
+
+        logger.info( { auditImageAC: auditImageAC, filterData: filterData, reauditImg: reauditImg } );
+        if ( inputData.export==true ) {
+          auditImageDownload= await zipDownloadImage( reauditImg );
+          // Set response headers for the zip file
+          res.set( 'Content-Type', 'application/zip' );
+          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.imageType}.zip` );
+
+          // Send the zip file as the API response
+          return res.send( auditImageDownload );
+        }
+        res.sendSuccess( { result: reauditImg } );
+        break;
+      default:
+        res.sendError( 'No Data Found', 204 );
+        break;
+    }
+
+
+  //  return res.sendSuccess( { result: inputData } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.body, function: 'beforeCountImages' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/routes/audit.routes.js

@@ -1,9 +1,8 @@
 import express from 'express';
 import { isAuditDocumentExist, isAuditInputFolderExist, isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overViewTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/audit.controllers.js';
+import { auditImages, auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overViewTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/audit.controllers.js';
 import { auditStoreValid, clientMetricsValid, clientValid, getDraftedDataValid, getFileValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, reTriggerValid, saveDraftValid, saveValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, workSpaceValid, auditImageValid } from '../dtos/audit.dtos.js';
-import { auditImages } from '../controllers/auditMetrics.controllers.js';
 
 export const auditRouter = express.Router();
 

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.auditInput}`,
+      Bucket: `${bucket.auditOutput}`,
       filePath: `${fileDate}/${storeId}/${data.zoneName}/`,
     };
     const folderPath = await listFileWithoutLimit( fetchData );

package/src/controllers/auditMetrics.controllers.js

@@ -1,71 +0,0 @@
-import { logger } from 'tango-app-api-middleware';
-import { getAuditFilterData, getAuditImageData, zipDownloadImage } from '../validation/audit.validation.js';
-import { getReauditImg } from './audit.controllers.js';
-// import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
-
-
-export async function auditImages( req, res ) {
-  try {
-    const inputData = req.query;
-    let auditImageDownload = '';
-    switch ( inputData.imageType ) {
-      case 'BC':
-        const auditImageBC = await getAuditImageData( inputData );
-        if ( auditImageBC?.errorCode ) {
-          const error = auditImageBC?.errorMsg;
-          const code = auditImageBC?.errorCode;
-          return res.sendError( { error: error }, code );
-        }
-
-        if ( inputData.export==true ) {
-          auditImageDownload= await zipDownloadImage( auditImageBC );
-          // Set response headers for the zip file
-          res.set( 'Content-Type', 'application/zip' );
-          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.imageType}.zip` );
-
-          // Send the zip file as the API response
-          return res.send( auditImageDownload );
-        }
-        res.sendSuccess( { result: auditImageBC } );
-
-        break;
-
-      case 'AC':
-
-        const [ filterData, auditImageAC ] = await Promise.all( [ getAuditFilterData( inputData ), getAuditImageData( inputData ) ] );
-
-        if ( filterData?.errorCode || auditImageAC?.errorCode ) {
-          const error = filterData?.errorMsg || auditImageAC.errorMsg;
-          const code = filterData?.errorCode || auditImageAC.errorCode;
-          return res.sendError( { error: error }, code );
-        }
-
-        const reauditImg = await getReauditImg( filterData, auditImageAC );
-
-        logger.info( { filterData: filterData } );
-        logger.info( { auditImageAC: auditImageAC } );
-        logger.info( { reauditImg: reauditImg } );
-        if ( inputData.export==true ) {
-          auditImageDownload= await zipDownloadImage( reauditImg );
-          // Set response headers for the zip file
-          res.set( 'Content-Type', 'application/zip' );
-          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.imageType}.zip` );
-
-          // Send the zip file as the API response
-          return res.send( auditImageDownload );
-        }
-        res.sendSuccess( { result: reauditImg } );
-        break;
-      default:
-        res.sendError( 'No Data Found', 204 );
-        break;
-    }
-
-
-  //  return res.sendSuccess( { result: inputData } );
-  } catch ( error ) {
-    const err = error.message || 'Internal Server Error';
-    logger.info( { error: error, message: req.body, function: 'beforeCountImages' } );
-    return res.sendError( err, 500 );
-  }
-}