tango-app-api-audit 1.0.26 → 1.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.26",
+    "version": "1.0.27",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",

package/src/controllers/auditMetrics.controllers.js

@@ -1,6 +1,6 @@
 import { download, getUTC, insertOpenSearchData, logger, sendMessageToQueue } from 'tango-app-api-middleware';
 import { aggregateAuditClientData } from '../service/auditClientData.service.js';
-import { aggregateUserAudit, findOneUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
+import { aggregateUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
 import mongoose from 'mongoose';
 import { aggregateStoreAudit, updateOneStoreAudit } from '../service/storeAudit.service.js';
 import { findOneUser } from '../service/user.service.js';
@@ -1164,7 +1164,6 @@ export async function reTrigger( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     const sqs = JSON.parse( process.env.SQS );
-    const userAudit = await findOneUserAudit( { _id: inputData.auditId } );
     const query ={
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
@@ -1195,12 +1194,18 @@ export async function reTrigger( req, res ) {
           const code = sqsQueue?.errorCode;
           return res.sendError( error, code );
         } else {
-          if ( userAudit?.auditStatus !== 'completed' ) {
+          if ( req.audit.status !== 'completed' ) {
             const userRecord ={
               auditStatus: 'skipped',
               isDraft: false,
             };
-            await updateOneUserAudit( { _id: inputData.auditId }, userRecord );
+            const query ={
+              storeId: inputData.storeId,
+              fileDate: inputData.fileDate,
+              auditStatus: req.audit.status,
+
+            };
+            await updateOneUserAudit( query, userRecord );
           }
 
           const storeRecord ={
@@ -1220,7 +1225,6 @@ export async function reTrigger( req, res ) {
               auditType: inputData.auditType,
               storeId: inputData.storeId,
               queueName: queueName,
-              auditId: inputData.auditId,
               message: inputData.comments,
               triggerBy: req.user.userName,
               triggerId: req.user._id,
@@ -1245,12 +1249,18 @@ export async function reTrigger( req, res ) {
         };
         await createAssignAudit( assignUserRecord );
 
-        if ( userAudit?.auditStatus !== 'completed' ) {
+        if ( req.audit.status !== 'completed' ) {
           const userRecord ={
             auditStatus: 'skipped',
             isDraft: false,
           };
-          await updateOneUserAudit( { _id: inputData.auditId }, userRecord );
+          const query ={
+            storeId: inputData.storeId,
+            fileDate: inputData.fileDate,
+            auditStatus: req.audit.status,
+
+          };
+          await updateOneUserAudit( query, userRecord );
         }
 
         const storeRecord ={
@@ -1270,7 +1280,6 @@ export async function reTrigger( req, res ) {
             auditType: inputData.auditType,
             storeId: inputData.storeId,
             queueName: queueName,
-            auditId: inputData.auditId,
             message: inputData.comments,
             triggerBy: req.user.userName,
             triggerId: req.user._id,
@@ -1287,3 +1296,14 @@ export async function reTrigger( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function beforeCountImages( req, res ) {
+  try {
+    const inputData = req.body;
+    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/dtos/auditMetrics.dtos.js

@@ -159,10 +159,26 @@ export const reTriggerValidSchema = joi.object(
       triggerType: joi.string().optional(),
       totalCount: joi.number().required(),
       userId: joi.string().optional(),
-      auditId: joi.string().required(),
+      comments: joi.string().optional().allow( '' ),
     },
 );
 
 export const reTriggerValid = {
   body: reTriggerValidSchema,
 };
+
+export const beforeCountImageSchema = joi.object(
+    {
+      fileDate: joi.string().required(),
+      storeId: joi.string().required(),
+      auditType: joi.string().optional(),
+      triggerType: joi.string().optional(),
+      totalCount: joi.number().required(),
+      userId: joi.string().optional(),
+      auditId: joi.string().required(),
+    },
+);
+
+export const beforeCountImageValid = {
+  body: beforeCountImageSchema,
+};

package/src/routes/auditMetrics.routes.js

@@ -1,8 +1,8 @@
 
 import express from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { clientMetrics, overAllAuditSummary, overViewCard, overViewTable, reTrigger, storeMetrics, summarySplit, userAuditHistory, userMetrics } from '../controllers/auditMetrics.controllers.js';
-import { clientMetricsValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, reTriggerValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid } from '../dtos/auditMetrics.dtos.js';
+import { beforeCountImages, clientMetrics, overAllAuditSummary, overViewCard, overViewTable, reTrigger, storeMetrics, summarySplit, userAuditHistory, userMetrics } from '../controllers/auditMetrics.controllers.js';
+import { beforeCountImageValid, clientMetricsValid, overAllAuditSummaryValid, overViewCardValid, overViewTableValid, reTriggerValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid } from '../dtos/auditMetrics.dtos.js';
 import { isAuditDocumentExist, isAuditInputFolderExist } from '../validation/audit.validation.js';
 
 export const auditMetricsRouter = express.Router();
@@ -16,5 +16,6 @@ auditMetricsRouter.post( '/summary-split-up', isAllowedSessionHandler, validate(
 auditMetricsRouter.post( '/overview-table', isAllowedSessionHandler, validate( overViewTableValid ), overViewTable );
 auditMetricsRouter.post( '/overall-audit-summary', isAllowedSessionHandler, validate( overAllAuditSummaryValid ), overAllAuditSummary );
 auditMetricsRouter.post( '/re-trigger', isAllowedSessionHandler, validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );
+auditMetricsRouter.post( '/before-count-images', isAllowedSessionHandler, validate( beforeCountImageValid ), isAuditInputFolderExist, beforeCountImages );
 
 export default auditMetricsRouter;