tango-app-api-audit 3.4.20 → 3.4.22

package/src/docs/traxAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { getFileSchema, userAuditHistorySchema, workSpaceSchema, saveSchema, clientMetricsSchema, storeMetricsSchema, userMetricsSchema, pendingSummaryTableSchema, overAllAuditSummarySchema, overviewTableSchema, summarySplitSchema, getUpdatedFileSchema, getDetectionFileValid, saveBinarySchema, saveDraftSchema, getDraftedDataSchema, reTriggerValidSchema } from '../dtos/traxAudit.dtos.js';
+import { getFileSchema, userAuditHistorySchema, workSpaceSchema, saveSchema, clientMetricsSchema, storeMetricsSchema, userMetricsSchema, pendingSummaryTableSchema, overAllAuditSummarySchema, overviewTableSchema, summarySplitSchema, getUpdatedFileSchema, getDetectionFileValid, saveBinarySchema, saveDraftSchema, getDraftedDataSchema, reTriggerSchema } from '../dtos/traxAudit.dtos.js';
 
 export const traxAuditDocs = {
 
@@ -418,7 +418,7 @@ export const traxAuditDocs = {
       requestBody: {
         content: {
           'application/json': {
-            schema: j2s( reTriggerValidSchema ).swagger,
+            schema: j2s( reTriggerSchema ).swagger,
           },
         },
       },

package/src/dtos/traxAudit.dtos.js

@@ -284,13 +284,13 @@ export const saveValid = {
 };
 
 
-export const reTriggerValidSchema = joi.object( {
+export const reTriggerSchema = joi.object( {
   fileDate: joi.string().required(),
   storeId: joi.string().required(),
   moduleType: joi.string().required(),
-
+  zoneName: joi.string().optional(),
 } );
 
 export const reTriggerValid = {
-  body: reTriggerValidSchema,
+  body: reTriggerSchema,
 };

package/src/routes/traxAudit.routes.js

@@ -1,6 +1,6 @@
 import { Router } from 'express';
 import { accessVerification, isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid, getUpdatedFileValid, saveBinaryValid, getDraftedDataValid, saveDraftValid, reTriggerValidSchema } from '../dtos/traxAudit.dtos.js';
+import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid, getUpdatedFileValid, saveBinaryValid, getDraftedDataValid, saveDraftValid, reTriggerValid } from '../dtos/traxAudit.dtos.js';
 import { isExistsQueue } from '../validation/audit.validation.js';
 import { clientMetrics, getAuditFile, getDetectionAuditFile, getUpdatedFile, overAllAuditSummary, overviewTable, pendingSummaryTable, saveBinary, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace, saveDraft, getDraftedData, save, reTrigger } from '../controllers/traxAudit.controllers.js';
 import { isMappingAuditInputFolderExist, isTraxAuditDocumentExist, isuserEmpDocumentExist, validateBinaryAudit, validateUserEmpDetection } from '../validation/traxAuditValidation.js';
@@ -30,7 +30,7 @@ traxAuditRouter.post( '/metrics/pending-summary-table', isAllowedSessionHandler,
 traxAuditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler, accessVerification( { userType: [ 'tango' ] } ), validate( overAllAuditSummaryValid ), overAllAuditSummary );
 traxAuditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler,
     accessVerification( { userType: [ 'tango' ], access: [ { featureName: 'TangoAdmin', name: 'TicketConfiguration', permissions: [ 'isEdit' ] } ] } ),
-    validate( reTriggerValidSchema ), isuserEmpDocumentExist, isMappingAuditInputFolderExist, reTrigger );
+    validate( reTriggerValid ), isuserEmpDocumentExist, isMappingAuditInputFolderExist, reTrigger );
 
 // summary
 

package/src/validation/traxAuditValidation.js

@@ -122,11 +122,15 @@ export async function isTraxAuditDocumentExist( req, res, next ) {
 export async function isuserEmpDocumentExist( req, res, next ) {
   try {
     const inputData = req.body;
-    const query={
+    if ( inputData.moduleType == 'hygiene' && inputData?.zoneName == undefined ) {
+      return res.sendError( 'ZoneName is required', 400 );
+    }
+    let query={
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
       moduleType: inputData.moduleType,
     };
+    inputData.moduleType == 'hygiene'? query.zoneName = inputData?.zoneName : null;
     const auditInfo = await findOneStoreEmpDetection( query );
     if ( auditInfo ) {
       const sqs = await findOneTraxAuditData( query, { sqs: 1 } );
@@ -146,7 +150,6 @@ export async function isuserEmpDocumentExist( req, res, next ) {
 
 export async function isMappingAuditInputFolderExist( req, res, next ) {
   try {
-    // const inputData = req.method === 'POST' ? req.body : req.query;
     const params={
       Bucket: req.sqs.inputBucketName,
       Key: req.sqs.folderPath.replace( /\/$/, '' ),