tango-app-api-audit 3.4.3-alpha.14 → 3.4.3-alpha.16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.3-alpha.14",
+    "version": "3.4.3-alpha.16",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,7 +24,7 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.1.25",
+        "tango-api-schema": "^2.1.28",
         "tango-app-api-middleware": "^3.1.33",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"

package/src/controllers/audit.controllers.js

@@ -1218,6 +1218,7 @@ export async function getDraftedData( req, res ) {
       userId: userId,
       moduleType: inputData.moduleType,
       zoneName: inputData.zoneName,
+      auditId: inputData.auditId,
     };
     const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 
@@ -4429,24 +4430,25 @@ export async function auditViewLogs( req, res ) {
   try {
     const inputData = req.query;
     const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
-    let downTimeQuery = {
+    const logData =[];
+    let logsQuery = {
       'size': 100,
       'query': {
         'bool': {
           'must': [
             {
               'term': {
-                'doc.logData.fileDate.keyword': dayjs( inputData.fileDate ).format( 'DD-MM-YYYY' ),
+                'logData.fileDate.keyword': inputData.fileDate,
               },
             },
             {
               'term': {
-                'doc.logData.storeId.keyword': inputData.storeId,
+                'logData.storeId.keyword': inputData.storeId,
               },
             },
             {
               'term': {
-                'doc.logData.moduleType.keyword': inputData.moduleType,
+                'logData.moduleType.keyword': inputData.moduleType,
               },
             },
           ],
@@ -4454,10 +4456,17 @@ export async function auditViewLogs( req, res ) {
         },
       },
     };
-    const downtime = await getOpenSearchData( parsedOpenSearch.auditLog, downTimeQuery );
-    return res.sendSuccess( downtime );
-  } catch ( err ) {
-
+    const logs = await getOpenSearchData( parsedOpenSearch.auditLog, logsQuery );
+    if ( logs.body.hits.hits.length > 0 ) {
+      logData.push( logs.body.hits.hits[0]._source );
+      return res.sendSuccess( logData );
+    } else {
+      return res.sendError( 'No Record Inserted', 500 );
+    }
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.body, function: 'auditViewLogs' } );
+    return res.sendError( err, 500 );
   }
 }
 

package/src/controllers/traxAudit.controllers.js

@@ -2,7 +2,7 @@ import { checkFileExist, chunkArray, download, getDate, getDateWithCustomizeTime
 import { aggregateBinaryAudit, createBinaryAudit, updateOneBinaryAuditModel } from '../service/binaryAudit.service.js';
 import { countDocumentsStore, findOneStore } from '../service/store.service.js';
 import { findOneUser } from '../service/user.service.js';
-import { aggregateUserEmpDetection, createUserEmpDetection, updateOneUserEmpDetection } from '../service/userEmpDetection.service.js';
+import { aggregateUserEmpDetection, countDocumentsUserEmpDetection, createUserEmpDetection, updateOneUserEmpDetection } from '../service/userEmpDetection.service.js';
 import { aggregateTraxAuditData, findOneTraxAuditData } from '../service/traxAuditData.service.js';
 import { aggregateClient, findOneClient } from '../service/client.service.js';
 import dayjs from 'dayjs';
@@ -4212,6 +4212,7 @@ export async function getDraftedData( req, res ) {
       storeId: inputData.storeId,
       userId: userId,
       moduleType: inputData.moduleType,
+      auditId: inputData.auditId,
     };
     const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 
@@ -4233,13 +4234,29 @@ export async function getDraftedData( req, res ) {
 export async function save( req, res ) {
   try {
     const inputData = req.body;
+    const isoDate = req.userAudit?.startTime;
+    const currentTime = dayjs();
+    const isoDateTime = dayjs( isoDate );
+    const timeDifferenceInMinutes = currentTime.diff( isoDateTime, 'seconds' );
     const getUserAuditData = await findOneUserEmpDetection( { _id: inputData.auditId } );
     inputData.clientId = getUserAuditData.clientId;
     const query ={ storeId: inputData.storeId, moduleType: inputData.moduleType, fileDate: inputData.fileDate };
     const data = await updateOneEmpDetectionOutput( query, { $set: inputData }, { upsert: true } );
     if ( data ) {
-      await updateOneUserEmpDetection( { _id: inputData.auditId }, { auditStatus: 'completed', afterCount: inputData.employeeCount } );
-      await updateOneStoreEmpDetection( query, { status: 'completed', afterCount: inputData.employeeCount } );
+      const userUpdated ={
+        auditStatus: 'completed',
+        afterCount: inputData.employeeCount,
+        endTime: Date.now(),
+        isDraft: false,
+        timeSpent: timeDifferenceInMinutes,
+      };
+      const storeUpdated ={
+        status: 'completed',
+        afterCount: inputData.employeeCount,
+        timeSpent: timeDifferenceInMinutes,
+      };
+      await updateOneUserEmpDetection( { _id: inputData.auditId }, userUpdated );
+      await updateOneStoreEmpDetection( query, storeUpdated );
       return res.sendSuccess( { result: 'Updated Successfully' } );
     } else {
       return res.sendError( 'something went wrong', 403 );
@@ -4266,6 +4283,9 @@ export async function reTrigger( req, res ) {
     if ( !getQueueName || queueName == '' ) {
       return res.sendError( 'queueName does not create', 400 );
     }
+    const getRecord = await countDocumentsUserEmpDetection( { storeId: message.storeId,
+      fileDate: message.fileDate,
+      moduleType: message.moduleType, auditStatus: 'completed' } );
     const msg = {
       storeId: message.storeId,
       fileDate: message.fileDate,
@@ -4275,6 +4295,7 @@ export async function reTrigger( req, res ) {
       question: message.question,
       folderPath: message.folderPath,
       fileCount: message.fileCount,
+      auditType: getRecord > 0? 'ReAudit':'Audit',
     };
     const sqsProduceQueue = {
       QueueUrl: `${sqs.url}${queueName}`,

package/src/docs/audit.docs.js

@@ -184,6 +184,12 @@ export const auditDocs = {
           scema: j2s( getDraftedDataSchema ).swagger,
           require: true,
         },
+        {
+          in: 'query',
+          name: 'auditId',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
         {
           in: 'query',
           name: 'userId',

package/src/docs/traxAudit.docs.js

@@ -387,6 +387,12 @@ export const traxAuditDocs = {
           scema: j2s( getDraftedDataSchema ).swagger,
           require: true,
         },
+        {
+          in: 'query',
+          name: 'auditId',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
         {
           in: 'query',
           name: 'userId',

package/src/dtos/audit.dtos.js

@@ -76,6 +76,7 @@ export const getDraftedDataSchema = joi.object( {
   userId: joi.string().optional(),
   moduleType: joi.string().required(),
   zoneName: joi.string().required(),
+  auditId: joi.string().required(),
 } );
 
 export const getDraftedDataValid = {

package/src/dtos/traxAudit.dtos.js

@@ -68,6 +68,7 @@ export const getDraftedDataSchema = joi.object(
       fileDate: joi.string().required(),
       userId: joi.string().optional(),
       moduleType: joi.string().required(),
+      auditId: joi.string().required(),
     },
 );
 

package/src/service/userEmpDetection.service.js

@@ -1,9 +1,7 @@
 import userEmpDetectionModel from 'tango-api-schema/schema/userEmpDetection.model.js';
-import { logger } from 'tango-app-api-middleware';
 
 
 export function aggregateUserEmpDetection( query ) {
-  logger.info( { seelevt: 'yryruteretwyyyyyyyyyyyyyyyyyyyyyyyyyyyyewe' } );
   return userEmpDetectionModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
 }
 
@@ -15,6 +13,10 @@ export function findOneUserEmpDetection( query, fields ) {
   return userEmpDetectionModel.findOne( query, fields );
 }
 
+export function countDocumentsUserEmpDetection( query, fields ) {
+  return userEmpDetectionModel.countDocuments( query, fields );
+}
+
 export function updateOneUserEmpDetection( query, record ) {
   return userEmpDetectionModel.updateOne( query, { $set: record } );
 }