tango-app-api-audit 3.4.3-alpha.1 → 3.4.3-alpha.2

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -4302,3 +4302,32 @@ export async function getUserAuditCountMTD( req, res ) {
   }
 }
 
+export async function auditViewLogs( req, res ) {
+  try {
+    const parsedOpenSearch = JSON.parse( process.env.OPENSEARCH );
+    let downTimeQuery = {
+      'size': 100,
+      'query': {
+        'bool': {
+          'must': [
+            {
+              'term': {
+                'doc.date.keyword': dayjs( inputQuery.filedate ).format( 'DD-MM-YYYY' ),
+              },
+            },
+            {
+              'term': {
+                'doc.store_id.keyword': inputQuery.storeId,
+              },
+            },
+          ],
+
+        },
+      },
+    };
+    const downtime = await getOpenSearchData( parsedOpenSearch.activityLog, downTimeQuery );
+    return res.sendSuccess( downtime );
+  } catch ( err ) {
+
+  }
+}

package/src/controllers/traxAudit.controllers.js

@@ -7,12 +7,15 @@ import { aggregateTraxAuditData, findOneTraxAuditData } from '../service/traxAud
 import { aggregateClient } from '../service/client.service.js';
 import dayjs from 'dayjs';
 import { aggregateAssignAudit } from '../service/assignAudit.service.js';
-import { aggregateStoreEmpDetection, updateManyStoreEmpDetection } from '../service/storeEmpDetection.service.js';
+import { aggregateStoreEmpDetection, updateManyStoreEmpDetection, updateOneStoreEmpDetection } from '../service/storeEmpDetection.service.js';
 import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 import _ from 'lodash';
 import mongoose from 'mongoose';
-import { findOneAuditLog } from '../service/auditLog.service.js';
-
+import { findOneAuditLog, createAuditLog,
+} from '../service/auditLog.service.js';
+import {
+  findOneUserEmpDetection,
+} from '../service/userEmpDetection.service.js';
 
 // export async function getDetectionAuditFile( req, res ) {
 //   try {
@@ -742,7 +745,7 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    logger.info( { moduleType: inputData.moduleType, key: inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] ), dateStart: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ), end: dateRange.end, user: req.user._id, client: clientList } );
+    logger.info( { moduleType: inputData.moduleType, key: [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType ), dateStart: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ), end: dateRange.end, user: req.user._id, client: clientList } );
 
     const userAsignAudit = [
       {
@@ -796,11 +799,11 @@ export async function workSpace( req, res ) {
       },
     ];
 
-    const auditUserCount = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
-    const userIncompleteFilesCount = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
+    const auditUserCount = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( auditFiles ) : await aggregateBinaryAudit( auditFiles );
+    const userIncompleteFilesCount = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( userIncompleteFiles ) : await aggregateBinaryAudit( userIncompleteFiles );
     logger.info( { moduleType: inputData.moduleType, userIncompleteFiles: userIncompleteFilesCount } );
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
-    const completedStoresCount = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
+    const completedStoresCount = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( completedStores ) : await aggregateBinaryAudit( binarCompletedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
     const auditStoreData = await aggregateTraxAuditData(
         auditStoreDataQuery,
@@ -1697,7 +1700,7 @@ export async function userAuditHistory( req, res ) {
       },
       );
     }
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1767,7 +1770,7 @@ export async function userAuditHistory( req, res ) {
     {
       $limit: limit,
     } );
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
 
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
@@ -2426,7 +2429,7 @@ export async function storeMetrics( req, res ) {
       },
       );
     }
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( binaryQuery );
 
     if ( count.length == 0 ) {
       return res.sendError( 'No data Found', 204 );
@@ -2441,7 +2444,7 @@ export async function storeMetrics( req, res ) {
     } else {
       query.push( { $limit: 10000 } );
     }
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -2744,7 +2747,7 @@ export async function userMetrics( req, res ) {
       );
     }
 
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2778,7 +2781,7 @@ export async function userMetrics( req, res ) {
         'Product Type': '$value',
         // 'Mapping Percentage': '$mappingPerc',
       };
-      inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?
+      [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?
       query.push(
           {
             $project: detection,
@@ -2792,7 +2795,7 @@ export async function userMetrics( req, res ) {
     }
 
 
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       await download( result, res );
       return;
@@ -2936,7 +2939,7 @@ export async function pendingSummaryTable( req, res ) {
       },
       );
     }
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2952,7 +2955,7 @@ export async function pendingSummaryTable( req, res ) {
       } );
     }
 
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3146,7 +3149,7 @@ export async function overAllAuditSummary( req, res ) {
       },
     ];
 
-    const storeAudit = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
+    const storeAudit = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?await aggregateStoreEmpDetection( storeAuditQuery ) : await aggregateBinaryAudit( binaryAuditQuery );
     if ( storeAudit.length > 0 ) {
       temp.inprogressStores= storeAudit[0].inprogressStores;
       temp.completedStores = storeAudit[0].completedStores;
@@ -3277,7 +3280,7 @@ export async function summarySplit( req, res ) {
         },
       },
     ];
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateUserEmpDetection( query ) : await aggregateBinaryAudit( query );
     const totalCount = await aggregateTraxAuditData( totalQuery );
     result[0].totalCount = totalCount[0]?.total;
     return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
@@ -3424,7 +3427,7 @@ export async function overviewTable( req, res ) {
       },
       );
     }
-    const count = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const count = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3439,7 +3442,7 @@ export async function overviewTable( req, res ) {
         $limit: limit,
       } );
     }
-    const result = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
+    const result = [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
     if ( inputData.isExport ) {
       const exportdata = [];
       result.forEach( ( element ) => {
@@ -3945,7 +3948,7 @@ export async function saveDraft( req, res ) {
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.body;
     inputData.userId = req.user._id;
-    const getUserAuditData = await findOneUserAudit( { _id: inputData.auditId } );
+    const getUserAuditData = await findOneUserEmpDetection( { _id: inputData.auditId } );
     if ( !getUserAuditData ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -3963,7 +3966,6 @@ export async function saveDraft( req, res ) {
     const storeQuery = {
       storeId: inputData.storeId,
       fileDate: inputData.fileDate,
-      zoneName: inputData.zoneName,
     };
 
     let storeRecord = {
@@ -4004,7 +4006,7 @@ export async function saveDraft( req, res ) {
     }
     await createAuditLog( inputData );
     await updateOneUserEmpDetection( userQuery, userRecord );
-    await updateOneStoreEmp( storeQuery, storeRecord );
+    await updateOneStoreEmpDetection( storeQuery, storeRecord );
     return res.sendSuccess( {
       result: 'The file has been drafted successfully',
     } );

package/src/docs/traxAudit.docs.js

@@ -363,7 +363,7 @@ export const traxAuditDocs = {
     },
   },
 
-  '/v3/reax-audit/get-drafted-data': {
+  '/v3/trax-audit/get-drafted-data': {
     get: {
       tags: [ 'Trax Audit' ],
       description: 'Get a saved file via DB',

package/src/dtos/traxAudit.dtos.js

@@ -45,7 +45,7 @@ export const saveDraftSchema = joi.object(
       storeId: joi.string().required(),
       auditId: joi.string().required(),
       moduleType: joi.string().required(),
-      zoneName: joi.string().required(),
+      // zoneName: joi.string().required(),
       auditType: joi.string().required(),
       fileDate: joi.string().required(),
       queueName: joi.string().required(),

package/src/routes/audit.routes.js

@@ -1,7 +1,7 @@
 import express from 'express';
 import { isAuditDocumentExist, isAuditInputFolderExist, isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { auditImages, auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overviewTable, pendingSummaryTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, totalNotAssignedCount, userAuditHistory, userMetrics, workSpace, getUserAuditCount, getUserAuditCountMTD } from '../controllers/audit.controllers.js';
+import { auditImages, auditStoreList, auditUserList, clientMetrics, clients, getAuditFile, getDraftedData, overAllAuditSummary, overViewCard, overviewTable, pendingSummaryTable, reTrigger, save, saveDraft, storeMetrics, summarySplit, totalNotAssignedCount, userAuditHistory, userMetrics, workSpace, getUserAuditCount, getUserAuditCountMTD, auditViewLogs } from '../controllers/audit.controllers.js';
 import { auditStoreValid, clientMetricsValid, clientValid, getDraftedDataValid, getFileValid, overAllAuditSummaryValid, overViewCardValid, pendingSummaryTableValid, reTriggerValid, saveDraftValid, saveValid, storeMetricsValid, summarySplitValid, userAuditHistoryValid, userMetricsValid, workSpaceValid, auditImageValid, overviewTableValid } from '../dtos/audit.dtos.js';
 
 export const auditRouter = express.Router();
@@ -39,4 +39,7 @@ auditRouter.get( '/total-not-assigned-count', isAllowedSessionHandler, totalNotA
 // audit user wallet
 auditRouter.get( '/get-user-audit-count', isAllowedSessionHandler, getUserAuditCount );
 auditRouter.get( '/get-user-audit-count-mtd', isAllowedSessionHandler, getUserAuditCountMTD );
+
+// audit log
+auditRouter.get( '/audit-viewLogs', auditViewLogs );
 export default auditRouter;

package/src/routes/traxAudit.routes.js

@@ -1,10 +1,9 @@
 import { Router } from 'express';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid, getUpdatedFileValid, saveBinaryValid, getDraftedDataValid } from '../dtos/traxAudit.dtos.js';
+import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid, getUpdatedFileValid, saveBinaryValid, getDraftedDataValid, saveDraftValid } 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 } from '../controllers/traxAudit.controllers.js';
 import { isTraxAuditDocumentExist, validateBinaryAudit } from '../validation/traxAuditValidation.js';
-import { saveDraftValid } from '../dtos/audit.dtos.js';
 
 export const traxAuditRouter = Router();