tango-app-api-audit 1.0.42 → 1.0.43

package/package.json

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

package/src/controllers/auditMetrics.controllers.js

@@ -10,12 +10,13 @@ import { countDocumentsStore } from '../service/store.service.js';
 import { findOneClient } from '../service/client.service.js';
 import { getAuditFilterData, getAuditImageData, zipDownloadImage } from '../validation/audit.validation.js';
 import { getReauditImg } from './audit.controllers.js';
+import { aggregateStoreZoneAudit } from '../service/storeZoneAudit.service.js';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
 export async function userAuditHistory( req, res ) {
   try {
     const inputData = req.body;
-    const userId = inputData.userId || req.user._id;
+    const userId = inputData.userId? new mongoose.Types.ObjectId( inputData.userId ) : req.user._id;
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
     const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
@@ -1174,12 +1175,15 @@ export async function overViewTable( req, res ) {
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
       { auditStatus: { $in: inputData.filterByStatus } },
-      { auditType: { $in: inputData.filterByAuditType } },
+      { auditType: { $in: inputData.filterByType } },
 
     ];
     if ( inputData.clientId.length > 0 ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
+    if ( inputData.filterByAuditType.length > 0 ) {
+      filters.push( { moduleType: { $in: inputData.filterByAuditType } } );
+    }
 
     const query =[
       {
@@ -1198,8 +1202,6 @@ export async function overViewTable( req, res ) {
           auditType: 1,
           auditStatus: 1,
           userId: 1,
-
-
         },
       },
       {
@@ -1237,8 +1239,8 @@ export async function overViewTable( req, res ) {
           startTime: 1,
           auditType: 1,
           auditStatus: 1,
-          userName: '$users.userName',
-          userEmail: '$users.userEmail',
+          userName: '$user.userName',
+          userEmail: '$user.userEmail',
 
         },
       },
@@ -1247,8 +1249,12 @@ export async function overViewTable( req, res ) {
       query.push( {
         $match: {
           $or: [
-            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
-            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
+            { storeId: { $regex: inputData.searchValue, $options: 'i' } },
+            { fileDate: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditType: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
+            { userName: { $regex: inputData.searchValue, $options: 'i' } },
+            { userEmail: { $regex: inputData.searchValue, $options: 'i' } },
           ],
 
         },
@@ -1284,12 +1290,13 @@ export async function overViewTable( req, res ) {
         exportdata.push( {
           'Store Id': element.storeId,
           'File Date': element.fileDtae,
-          'Audit Type': element.audittype,
+          'Type': element.audittype,
           'Before Count': element.beforeCount,
           'Start Time': element.startTime,
           'User Name': element.userName,
           'User Email': element.userEmail,
           'Status': element.auditStatus,
+          'Audit Type': element.moduleType,
         } );
       } );
       await download( exportdata, res );
@@ -1398,7 +1405,7 @@ export async function overAllAuditSummary( req, res ) {
         },
       },
     ];
-    const storeAudit = await aggregateStoreAudit( storeAuditQuery );
+    const storeAudit = inputData.moduleType == 'zone'?await aggregateStoreZoneAudit( storeAuditQuery ) : await aggregateStoreAudit( storeAuditQuery );
     if ( storeAudit.length > 0 ) {
       temp.inprogreseStores= storeAudit[0].inprogreseStores;
       temp.completedStores = storeAudit[0].completedStores;
@@ -1440,7 +1447,7 @@ export async function reTrigger( req, res ) {
         const msg = {
           store_id: inputData.storeId,
           curr_date: inputData.fileDate,
-          audit_type: inputData.auditType,
+          audit_type: inputData.type,
           total_count: inputData.totalCount,
         };
 
@@ -1482,7 +1489,7 @@ export async function reTrigger( req, res ) {
               beforeCount: inputData.totalCount,
               afterCount: '',
               fileDate: inputData.fileDate,
-              auditType: inputData.auditType,
+              auditType: inputData.type,
               storeId: inputData.storeId,
               queueName: queueName,
               message: inputData.comments,
@@ -1500,8 +1507,9 @@ export async function reTrigger( req, res ) {
           storeId: inputData.storeId,
           clientId: req.audit.clientId,
           fileDate: inputData.fileDate,
+          moduleType: 'traffic',
           fileDateISO: dayjs( inputData.fileDate, 'DD-MM-YYYY' ).format(),
-          auditType: inputData.auditType,
+          auditType: inputData.type,
           fileCount: inputData.beforeCount,
           queueName: queueName,
           userId: inputData.userId,
@@ -1537,7 +1545,7 @@ export async function reTrigger( req, res ) {
             beforeCount: inputData.totalCount,
             afterCount: '',
             fileDate: inputData.fileDate,
-            auditType: inputData.auditType,
+            auditType: inputData.type,
             storeId: inputData.storeId,
             queueName: queueName,
             message: inputData.comments,

package/src/controllers/zoneAudit.controller.js

@@ -7,10 +7,10 @@ import { findOneUser } from '../service/user.service.js';
 import { findOneStore } from '../service/store.service.js';
 import dayjs from 'dayjs';
 import { aggregateUserAudit, findOneUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
-import { aggregateAssignAudit } from '../service/assignAudit.service.js';
+import { aggregateAssignAudit, createAssignAudit } from '../service/assignAudit.service.js';
 import { createAuditLog, findOneAuditLog } from '../service/auditLog.service.js';
 import { mapCustomer, mapEmployee, mapJunk, splitB20000, splitE0, splitG20000 } from '../validation/audit.validation.js';
-import { aggregateClient, findClient } from '../service/client.service.js';
+import { aggregateClient, findClient, findOneClient } from '../service/client.service.js';
 import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import _ from 'lodash';
 import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
@@ -1338,3 +1338,148 @@ export async function clientMetrics( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function reTrigger( req, res ) {
+  try {
+    const openSearch = JSON.parse( process.env.OPENSEARCH );
+    const inputData = req.body;
+    const sqs = JSON.parse( process.env.SQS );
+    const query ={
+      storeId: inputData.storeId,
+      fileDate: inputData.fileDate,
+    };
+    const getQueueName = await findOneClient( { clientId: req.audit.clientId }, { 'auditConfigs.zoneQueueName': 1 } );
+
+    if ( !getQueueName || getQueueName?.auditConfigs?.zoneQueueName == '' ) {
+      return res.sendError( 'queueName does not create', 400 );
+    }
+    const queueName = getQueueName?.auditConfigs?.zoneQueueName;
+    logger.info( { queueName: queueName } );
+    switch ( inputData.triggerType ) {
+      case 'queue':
+        const msg = {
+          store_id: inputData.storeId,
+          curr_date: inputData.fileDate,
+          audit_type: inputData.type,
+          total_count: inputData.totalCount,
+          zone_id: inputData.zoneName,
+        };
+
+        const sqsProduceQueue = {
+          QueueUrl: `${sqs.url}${queueName}`,
+          MessageBody: JSON.stringify( msg ),
+        };
+        const sqsQueue = await sendMessageToQueue( sqsProduceQueue.QueueUrl, sqsProduceQueue.MessageBody );
+        if ( sqsQueue?.errorCode ) {
+          const error = sqsQueue?.errorMsg;
+          const code = sqsQueue?.errorCode;
+          return res.sendError( error, code );
+        } else {
+          if ( req.audit.status !== 'completed' ) {
+            const userRecord ={
+              auditStatus: 'skipped',
+              isDraft: false,
+            };
+            const query ={
+              storeId: inputData.storeId,
+              fileDate: inputData.fileDate,
+              zoneName: inputData.zoneName,
+              auditStatus: req.audit.status,
+
+            };
+            await updateOneUserAudit( query, userRecord );
+          }
+
+          const storeRecord ={
+            status: req.audit.status !== 'completed' ? 'skipped': 'not_assign',
+          };
+
+          await updateOneStoreZoneAudit( query, storeRecord );
+          const logData = {
+            userId: req.user._id,
+            userName: req.user.userName,
+            logType: 'zoneAudit',
+            logSubType: 'reTrigger',
+            logData: {
+              beforeCount: inputData.totalCount,
+              afterCount: '',
+              fileDate: inputData.fileDate,
+              auditType: inputData.type,
+              storeId: inputData.storeId,
+              zoneName: inputData.zoneName,
+              queueName: queueName,
+              message: inputData.comments,
+              triggerBy: req.user.userName,
+              triggerId: req.user._id,
+              triggerType: inputData.triggerType,
+            },
+          };
+          await insertOpenSearchData( openSearch.activityLog, logData );
+        }
+        break;
+      case 'user':
+        const assignUser = await findOneUser( { _id: new mongoose.Types.ObjectId( inputData.userId ) } );
+        const assignUserRecord = {
+          storeId: inputData.storeId,
+          clientId: req.audit.clientId,
+          fileDate: inputData.fileDate,
+          zoneName: inputData.zoneName,
+          fileDateISO: dayjs( inputData.fileDate, 'DD-MM-YYYY' ).format(),
+          auditType: inputData.type,
+          moduleType: 'zone',
+          fileCount: inputData.beforeCount,
+          queueName: queueName,
+          userId: inputData.userId,
+          userName: assignUser.userName,
+        };
+        await createAssignAudit( assignUserRecord );
+
+        if ( req.audit.status !== 'completed' ) {
+          const userRecord ={
+            auditStatus: 'skipped',
+            isDraft: false,
+          };
+          const query ={
+            storeId: inputData.storeId,
+            fileDate: inputData.fileDate,
+            zoneName: inputData.zoneName,
+            auditStatus: req.audit.status,
+
+          };
+          await updateOneUserAudit( query, userRecord );
+        }
+
+        const storeRecord ={
+          status: req.audit.status !== 'completed' ? 'skipped': 'assigned',
+        };
+
+        await updateOneStoreZoneAudit( query, storeRecord );
+        const logData = {
+          userId: req.user._id,
+          userName: req.user.userName,
+          logType: 'zoneAudit',
+          logSubType: 'reTrigger',
+          logData: {
+            beforeCount: inputData.totalCount,
+            afterCount: '',
+            fileDate: inputData.fileDate,
+            auditType: inputData.type,
+            storeId: inputData.storeId,
+            zoneName: inputData.zoneName,
+            queueName: queueName,
+            message: inputData.comments,
+            triggerBy: req.user.userName,
+            triggerId: req.user._id,
+            triggerType: inputData.triggerType,
+          },
+        };
+        await insertOpenSearchData( openSearch.activityLog, logData );
+    }
+
+    return res.sendSuccess( { result: 'The File has been Re Trigger Succesfully' } );
+  } catch ( error ) {
+    const err = error.message;
+    logger.error( { error: error, message: req.body } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/docs/zoneAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { clientMetricsSchema, getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema, storeMetricsSchema, workSpaceSchema } from '../dtos/zoneAudit.dtos.js';
+import { clientMetricsSchema, getDraftedDataSchema, getFileSchema, reTriggerValidSchema, saveDraftSchema, saveSchema, storeMetricsSchema, workSpaceSchema } from '../dtos/zoneAudit.dtos.js';
 
 export const zoneAuditDocs = {
   '/v3/zone-audit/get-file': {
@@ -202,4 +202,27 @@ export const zoneAuditDocs = {
     },
   },
 
+  '/v3/zone-audit/metrics/re-trigger': {
+    post: {
+      tags: [ 'Zone Audit Metrics' ],
+      description: `Manual re trigger a file`,
+      operationId: 'metrics/re-trigger',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( reTriggerValidSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
 };

package/src/dtos/auditMetrics.dtos.js

@@ -129,8 +129,9 @@ export const overViewTableSchema = joi.object(
       clientId: joi.array().optional(),
       limit: joi.number().optional(),
       offset: joi.number().optional(),
-      searchValue: joi.number().optional().allow( '' ),
+      searchValue: joi.string().optional().allow( '' ),
       filterByStatus: joi.array().required(),
+      filterByType: joi.array().optional(),
       filterByAuditType: joi.array().required(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
@@ -159,7 +160,7 @@ export const reTriggerValidSchema = joi.object(
     {
       fileDate: joi.string().required(),
       storeId: joi.string().required(),
-      auditType: joi.string().optional(),
+      type: joi.string().optional(),
       triggerType: joi.string().optional(),
       totalCount: joi.number().required(),
       userId: joi.string().optional(),

package/src/dtos/zoneAudit.dtos.js

@@ -127,3 +127,20 @@ export const clientMetricsValid = {
   body: clientMetricsSchema,
 };
 
+export const reTriggerValidSchema = joi.object(
+    {
+      fileDate: joi.string().required(),
+      storeId: joi.string().required(),
+      zoneName: joi.string().required(),
+      type: joi.string().optional(),
+      triggerType: joi.string().optional(),
+      totalCount: joi.number().required(),
+      userId: joi.string().optional(),
+      comments: joi.string().optional().allow( '' ),
+    },
+);
+
+export const reTriggerValid = {
+  body: reTriggerValidSchema,
+};
+

package/src/routes/zone.routes.js

@@ -1,8 +1,9 @@
 import { Router } from 'express';
-import { clientMetricsValid, getDraftedDataValid, getFileValid, saveDraftValid, saveValid, storeMetricsValid, workSpaceValid } from '../dtos/zoneAudit.dtos.js';
+import { clientMetricsValid, getDraftedDataValid, getFileValid, reTriggerValid, saveDraftValid, saveValid, storeMetricsValid, workSpaceValid } from '../dtos/zoneAudit.dtos.js';
 import { isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { clientMetrics, getDraftedData, getZoneAuditFile, save, saveDraft, storeMetrics, workSpace } from '../controllers/zoneAudit.controller.js';
+import { clientMetrics, getDraftedData, getZoneAuditFile, reTrigger, save, saveDraft, storeMetrics, workSpace } from '../controllers/zoneAudit.controller.js';
+import { isAuditDocumentExist, isAuditInputFolderExist } from '../validation/zoneAudit.validation.js';
 
 export const zoneAuditRouter=Router();
 
@@ -17,3 +18,4 @@ zoneAuditRouter.get( '/work-space', isAllowedSessionHandler, validate( workSpace
 
 zoneAuditRouter.post( '/metrics/store-metrics', isAllowedSessionHandler, validate( storeMetricsValid ), storeMetrics );
 zoneAuditRouter.post( '/metrics/client-metrics', isAllowedSessionHandler, validate( clientMetricsValid ), clientMetrics );
+zoneAuditRouter.post( '/metrics/re-trigger', isAllowedSessionHandler, validate( reTriggerValid ), isAuditDocumentExist, isAuditInputFolderExist, reTrigger );

package/src/validation/zoneAudit.validation.js

@@ -0,0 +1,45 @@
+import { checkFileExist } from 'tango-app-api-middleware';
+import { findOneStoreZoneAudit } from '../service/storeZoneAudit.service.js';
+
+export async function isAuditDocumentExist( req, res, next ) {
+  try {
+    const inputData = req.body;
+    const query={
+      storeId: inputData.storeId,
+      fileDate: inputData.fileDate,
+      zoneName: inputData.zoneName,
+    };
+    const auditInfo = await findOneStoreZoneAudit( query );
+    if ( auditInfo ) {
+      req.audit = auditInfo;
+      return next();
+    } else {
+      return res.sendError( 'No audited Record', 400 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.body, function: 'isAuditFileExist' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+export async function isAuditInputFolderExist( req, res, next ) {
+  try {
+    const bucket = JSON.parse( process.env.BUCKET );
+    const inputData = req.method === 'POST' ? req.body : req.query;
+    const params={
+      Bucket: bucket.auditInput,
+      Key: `${inputData.fileDate}/${inputData.storeId}/${inputData.zoneName}`,
+    };
+    const isExist = await checkFileExist( params );
+    if ( isExist ) {
+      next();
+    } else {
+      return res.sendError( `Audit Input folder not available : ${inputData.fileDate}/${inputData.storeId}/${inputData.zoneName}`, 400 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.query, function: 'isAuidtInputFolderExist' } );
+    return res.sendError( err, 500 );
+  }
+}