tango-app-api-audit 3.3.0-alpha.1 → 3.3.0-alpha.11

package/src/dtos/audit.dtos.js

@@ -227,7 +227,7 @@ export const userMetricsValid = {
   body: userMetricsSchema,
 };
 
-export const overViewTableSchema = joi.object(
+export const pendingSummaryTableSchema = joi.object(
     {
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
@@ -244,8 +244,29 @@ export const overViewTableSchema = joi.object(
     },
 );
 
-export const overViewTableValid = {
-  body: overViewTableSchema,
+export const pendingSummaryTableValid = {
+  body: pendingSummaryTableSchema,
+};
+
+export const overviewTableSchema = joi.object(
+    {
+      fromDate: joi.string().required(),
+      toDate: joi.string().required(),
+      clientId: joi.array().optional(),
+      limit: joi.number().optional(),
+      offset: joi.number().optional(),
+      searchValue: joi.string().optional().allow( '' ),
+      filterByStatus: joi.array().optional(),
+      filterByModuleType: joi.array().optional(),
+      filterByAuditType: joi.array().optional(),
+      sortColumnName: joi.string().optional(),
+      sortBy: joi.number().optional(),
+      isExport: joi.boolean().optional(),
+    },
+);
+
+export const overviewTableValid= {
+  body: overviewTableSchema,
 };
 
 export const overAllAuditSummarySchema = joi.object(
@@ -296,6 +317,7 @@ export const summarySplitSchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       clientId: joi.array().optional(),
+      moduleType: joi.array().optional(),
     },
 );
 

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 { 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';
+import { auditImages, auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overviewTable, pendingSummaryTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/audit.controllers.js';
+import { auditStoreValid, clientMetricsValid, clientValid, getDraftedDataValid, getFileValid, overAllAuditSummaryValid, overViewCardValid, pendingSummaryTableValid, reTriggerValid, saveDraftValid, saveValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, workSpaceValid, auditImageValid, overviewTableValid } from '../dtos/audit.dtos.js';
 
 export const auditRouter = express.Router();
 
@@ -25,14 +24,13 @@ auditRouter.post( '/metrics/user-audit-history', isAllowedSessionHandler, valida
 auditRouter.post( '/metrics/client-metrics', isAllowedSessionHandler, validate( clientMetricsValid ), clientMetrics );
 auditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, validate( storeMetricsValid ), storeMetrics );
 auditRouter.post( '/metrics/user-metrics', isAllowedSessionHandler, validate( userMetricsValid ), userMetrics );
-auditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overViewTableValid ), overViewTable );
+auditRouter.post( '/metrics/pending-summary-table', isAllowedSessionHandler, validate( pendingSummaryTableValid ), pendingSummaryTable );
 auditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, validate( overAllAuditSummaryValid ), overAllAuditSummary );
 auditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler, validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );
 auditRouter.get( '/audit-images', isAllowedSessionHandler, validate( auditImageValid ), isAuditInputFolderExist, auditImages );
-
-
-// hold
+// summary
 auditRouter.post( '/metrics/overview-card', isAllowedSessionHandler, validate( overViewCardValid ), overViewCard );
 auditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, validate( summarySplitValid ), summarySplit );
+auditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overviewTableValid ), overviewTable );
 
 export default auditRouter;

package/src/service/auditStoreData.service.js

@@ -1,7 +1,7 @@
 import auditStoreDataModel from 'tango-api-schema/schema/auditStoreData.model.js';
 
 
-export function aggregateAuditStoreDataSchema( query ) {
+export function aggregateAuditStoreData( query ) {
   return auditStoreDataModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }
 

package/src/validation/audit.validation.js

@@ -215,6 +215,7 @@ export async function getAuditImageData( data ) {
       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;
@@ -246,7 +246,7 @@ export async function getAuditImageData( data ) {
       if ( auditImages && auditImages?.length > 0 ) {
         for ( let i = 0; i < auditImages.length; i++ ) {
           const img = auditImages[i].Key.split( '/' );
-          const image = img[2].split( '.' );
+          const image = img[3].split( '.' );
           const indexes = image[0].split( '_' );
           const params = {
             file_path: auditImages[i].Key,
@@ -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 );
       }
@@ -302,7 +303,7 @@ export async function getAuditFilterData( data ) {
     const storeId = data.storeId;
     const fileDate = data.fileDate;
     const params = {
-      Bucket: `${bucket.auditOutput}`,
+      Bucket: `${bucket.auditUploadBucket}`,
       Key: `${storeId}/${data.zoneName}/${fileDate}/${bucket.masterJsonFile}`,
     };
     const mappingFile = await getJsonFileData( params );

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 );
-  }
-}