tango-app-api-audit 1.0.57 → 1.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.57",
+    "version": "1.0.58",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.0.152",
-        "tango-app-api-middleware": "^3.1.28",
+        "tango-app-api-middleware": "^3.1.30",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/audit.controllers.js

@@ -533,7 +533,6 @@ export async function getAuditFile( req, res ) {
           queueName: inputData.queueName,
           beforeCount: msg.total_count || files.length,
           auditStatus: 'inprogress',
-          moduleType: 'traffic',
           fileDateISO: start,
           timeSpent: 0,
           startTime: new Date(),
@@ -1208,8 +1207,22 @@ export async function save( req, res ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
     const sqs = JSON.parse( process.env.SQS );
-
     const inputData = req.body;
+    let storeAuditData = await findOneStoreAudit( {
+      storeId: inputData.storeId,
+      fileDate: inputData.fileDate,
+      moduleType: inputData.moduleType,
+      zoneName: inputData.zoneName,
+      auditType: inputData.auditType,
+    } );
+    logger.info( { storeAuditData: storeAuditData } );
+    if ( storeAuditData==null ) {
+      logger.error( {
+        error: `No data found: ${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
+        type: 'DATABASE_RECORD_NOTFOUND',
+      } );
+      return res.sendError( storeAuditData, 204 );
+    }
     const params = {
       Key: `${inputData.storeId}/${inputData.zoneName}/${inputData.fileDate}/${bucket.masterJsonFile}`,
     };
@@ -1301,13 +1314,6 @@ export async function save( req, res ) {
           clientId: 1,
         },
     );
-    let storeAuditData = await findOneStoreAudit( {
-      storeId: inputData.storeId,
-      fileDate: inputData.fileDate,
-      moduleType: inputData.moduleType,
-      zoneName: inputData.zoneName,
-      auditType: inputData.auditType,
-    } );
 
     let clientData = await findClient( { clientId: storeConfig.clientId } );
 

package/src/docs/audit.docs.js

@@ -1,4 +1,4 @@
-import { auditStoreSchema, clientMetricsSchema, clientSchema, getDraftedDataSchema, getFileSchema, overAllAuditSummarySchema, overViewCardSchema, overViewTableSchema, reTriggerValidSchema, saveDraftSchema, saveSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema, userSchema, workSpaceSchema } from '../dtos/audit.dtos.js';
+import { auditStoreSchema, clientMetricsSchema, clientSchema, getDraftedDataSchema, getFileSchema, overAllAuditSummarySchema, overViewCardSchema, overViewTableSchema, reTriggerValidSchema, saveDraftSchema, saveSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema, userSchema, workSpaceSchema, auditImageValidSchema } from '../dtos/audit.dtos.js';
 import j2s from 'joi-to-swagger';
 
 export const auditDocs = {
@@ -466,4 +466,58 @@ export const auditDocs = {
       },
     },
   },
+
+  '/v3/audit/audit-images': {
+    get: {
+      tags: [ 'Audit Metrics' ],
+      description: `View and Download audit images`,
+      operationId: 'audit-images',
+      parameters: [
+        {
+          in: 'query',
+          name: 'fileDate',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'storeId',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'imageType',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'export',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'moduleType',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'zoneName',
+          scema: j2s( auditImageValidSchema ).swagger,
+          require: true,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+
+    },
+  },
 };

package/src/dtos/audit.dtos.js

@@ -302,3 +302,19 @@ export const summarySplitSchema = joi.object(
 export const summarySplitValid = {
   body: summarySplitSchema,
 };
+
+
+export const auditImageValidSchema = joi.object(
+    {
+      fileDate: joi.string().required(),
+      storeId: joi.string().required(),
+      imageType: joi.string().required(),
+      export: joi.boolean().required(),
+      moduleType: joi.string().required(),
+      zoneName: joi.string().required(),
+    },
+);
+
+export const auditImageValid = {
+  query: auditImageValidSchema,
+};

package/src/routes/audit.routes.js

@@ -2,7 +2,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 } from '../dtos/audit.dtos.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();
 
@@ -27,6 +28,7 @@ auditRouter.post( '/metrics/user-metrics', isAllowedSessionHandler, validate( us
 auditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overViewTableValid ), overViewTable );
 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

package/src/validation/audit.validation.js

@@ -213,7 +213,7 @@ export async function getAuditImageData( data ) {
     const files = [];
     const fetchData = {
       Bucket: `${bucket.auditInput}`,
-      filePath: `${fileDate}/${storeId}/`,
+      filePath: `${fileDate}/${storeId}/${data.zoneName}/`,
     };
     const folderPath = await listFileWithoutLimit( fetchData );
     if ( folderPath.statusCode == 404 ) {
@@ -225,7 +225,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,
@@ -303,7 +303,7 @@ export async function getAuditFilterData( data ) {
     const fileDate = data.fileDate;
     const params = {
       Bucket: `${bucket.auditOutput}`,
-      Key: `${storeId}/${fileDate}/${bucket.masterJsonFile}`,
+      Key: `${storeId}/${data.zoneName}/${fileDate}/${bucket.masterJsonFile}`,
     };
     const mappingFile = await getJsonFileData( params );
     if ( mappingFile.statusCode ) {