tango-app-api-audit 3.4.0-alpha.9 → 3.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.4.0-alpha.9",
+    "version": "3.4.1",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -38,3 +38,4 @@
         "eslint-plugin-promise": "^6.2.0"
     }
 }
+

package/src/controllers/audit.controllers.js

@@ -58,6 +58,9 @@ import {
   aggregateAuditStoreData,
   findOneStoreData,
 } from '../service/auditStoreData.service.js';
+import { aggregateStoreEmpDetection } from '../service/storeEmpDetection.service.js';
+import { aggregateBinaryAudit } from '../service/binaryAudit.service.js';
+import { aggregateTraxAuditData, findOneTraxAuditData } from '../service/traxAuditData.service.js';
 
 /*           < -- *** Configuration ***   -->      */
 
@@ -195,8 +198,9 @@ export async function getAuditFile( req, res ) {
     const bucket = JSON.parse( process.env.BUCKET );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    const data = await getDate( new Date(), new Date() );
-    logger.info( { data: data, function: 'data', newDate: new Date() } );
+    const previousDate = dayjs( dateRange.start ).subtract( 1, 'days' );
+    const data = await getDate( new Date( dayjs( previousDate ).format( 'YYYY-MM-DD' ) ), new Date() );
+    logger.info( { data: data, previousDate: previousDate, function: 'data', newDate: new Date() } );
     logger.info( { userId: req.user._id, queueName: inputData.queueName, moduleType: inputData.moduleType } );
     const start = data.start;
     const end = data.end;
@@ -750,10 +754,9 @@ export async function workSpace( req, res ) {
     const filter =[
       { status: { $in: [ 'active', 'hold' ] } },
       { 'auditConfigs.audit': { $eq: true } },
+      { clientId: { $in: inputData.clientId } },
     ];
-    if ( inputData?.clientId?.length > 0 ) {
-      filter.push( { clientId: { $in: inputData.clientId } } );
-    }
+
     const temp = [];
     const clientQuery = [
       {
@@ -805,7 +808,7 @@ export async function workSpace( req, res ) {
 
     const clientDetails = await aggregateClient( clientQuery );
     const clientList = clientDetails.map( ( i ) => i.clientId );
-    const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' );
+    const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' ); // dayjs( dateRange.start );
     const getStoreData = await findOneStoreData(
         {},
         { fileDate: 1 },
@@ -924,6 +927,7 @@ export async function workSpace( req, res ) {
         },
       },
     ];
+    logger.info( { daterange: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ) } );
     const userIncompleteFiles = [
       {
         $match: {
@@ -931,7 +935,7 @@ export async function workSpace( req, res ) {
             { clientId: { $in: clientList } },
             { userId: { $eq: req.user._id } },
             { moduleType: { $eq: inputData.moduleType } },
-            { createdAt: { $gte: dateRange.start } },
+            { createdAt: { $gte: new Date( dayjs( fileDate ).format( 'YYYY-MM-DD' ) ) } },
             { createdAt: { $lte: dateRange.end } },
           ],
         },
@@ -1453,6 +1457,7 @@ export async function userAuditHistory( req, res ) {
       {
         moduleType: { $eq: inputData.moduleType },
       },
+      { clientId: { $in: inputData.clientId } },
     ];
 
     if ( inputData.dateType == 'fileDate' ) {
@@ -1484,9 +1489,6 @@ export async function userAuditHistory( req, res ) {
         auditStatus: { $in: inputData.filterByStatus },
       } );
     }
-    if ( inputData?.clientId?.length > 0 ) {
-      filter.push( { clientId: { $in: inputData.clientId } } );
-    }
     const query = [
       {
         $match: {
@@ -1923,11 +1925,9 @@ export async function storeMetrics( req, res ) {
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
       { moduleType: { $eq: inputData.moduleType } },
+      { clientId: { $in: inputData.filterByClientId } },
 
     ];
-    if ( inputData.filterByClientId && inputData.filterByClientId?.length > 0 ) {
-      filter.push( { clientId: { $in: inputData.filterByClientId } } );
-    }
 
     if ( inputData.filterByStoreId && inputData.filterByStoreId?.length > 0 ) {
       filter.push( { storeId: { $in: inputData.filterByStoreId } } );
@@ -2479,13 +2479,10 @@ export async function pendingSummaryTable( req, res ) {
       { fileDateISO: { $lte: dateRange.end } },
       { auditStatus: { $ne: 'completed' } },
       { moduleType: { $eq: inputData.moduleType } },
+      { clientId: { $in: inputData.clientId } },
 
     ];
 
-    if ( inputData.clientId.length > 0 ) {
-      filters.push( { clientId: { $in: inputData.clientId } } );
-    }
-
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
@@ -2666,12 +2663,10 @@ export async function overAllAuditSummary( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
-      { moduleType: { $eq: inputData.moduleType },
-      },
+      { moduleType: { $eq: inputData.moduleType } },
+      { clientId: { $in: inputData.clientId } },
     ];
-    if ( inputData.clientId.length > 0 ) {
-      filters.push( { clientId: { $in: inputData.clientId } } );
-    }
+
     const storeQuery = inputData.clientId.length? { 'edge.firstFile': true, 'clientId': { $in: inputData. clientId } } : { 'edge.firstFile': true };
     temp.installedStores = await countDocumentsStore( storeQuery );
     const auditClientDataQuery =[
@@ -2931,10 +2926,9 @@ export async function overViewCard( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { clientId: { $in: inputData.clientId } },
     ];
-    if ( inputData.clientId.length > 0 ) {
-      filters.push( { clientId: { $in: inputData.clientId } } );
-    }
+
     const query =[
       {
         $match: {
@@ -2989,15 +2983,87 @@ export async function overViewCard( req, res ) {
         },
       },
     ];
+
+    const binaryQuery =[
+      {
+        $match: {
+          $and: filters,
+        },
+
+      },
+      {
+        $project: {
+          auditFileCount: {
+            $cond: [
+              { $eq: [ '$auditType', 'Audit' ] }, 1, 0,
+            ],
+          },
+          ReAuditFileCount: {
+            $cond: [
+              { $eq: [ '$auditType', 'ReAudit' ] }, 1, 0,
+            ],
+          },
+          inprogressCount: {
+            $cond: [
+              { $ne: [ '$auditStatus', 'completed' ] }, 1, 0,
+            ],
+          },
+          completedCount: {
+            $cond: [
+              { $eq: [ '$auditStatus', 'completed' ] }, 1, 0,
+            ],
+          },
+        },
+      },
+      {
+        $group: {
+          _id: { fileDate: '$fileDate', clientId: '$clientId' },
+          totalCount: { $sum: 1 },
+          auditFileCount: { $sum: '$auditFileCount' },
+          ReAuditFileCount: { $sum: '$ReAuditFileCount' },
+          inprogressCount: { $sum: '$inprogressCount' },
+          completedCount: { $sum: '$completedCount' },
+
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          totalCount: 1,
+          auditFileCount: 1,
+          ReAuditFileCount: 1,
+          inprogressCount: 1,
+          completedCount: 1,
+          notAssigned: { $subtract: [ '$totalCount', { $add: [ '$inprogressCount', '$completedCount' ] } ] },
+        },
+      },
+    ];
     const result = await aggregateStoreAudit( query );
-    logger.info( { result: result } );
-    return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
+    const empDetection = await aggregateStoreEmpDetection( query );
+    const binaryAudit = await aggregateBinaryAudit( binaryQuery );
+
+    // Combine all arrays into one
+    const combinedArray = [ ...result, ...empDetection, ...binaryAudit ];
+
+    // Function to merge objects by summing their values
+    const mergedResult = mergeAndSum( combinedArray );
+
+    return res.sendSuccess( { result: Object.keys( mergedResult ).length > 0?mergedResult: temp } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.error( { error: error, message: req.body, function: 'overViewCard' } );
     return res.sendError( err, 500 );
   }
 }
+export const mergeAndSum = ( arr ) => {
+  return arr.reduce( ( acc, obj ) => {
+    for ( const [ key, value ] of Object.entries( obj ) ) {
+      // Add the value to the existing key or initialize it if it doesn't exist
+      acc[key] = ( acc[key] || 0 ) + value;
+    }
+    return acc;
+  }, {} );
+};
 
 export async function summarySplit( req, res ) {
   try {
@@ -3017,10 +3083,9 @@ export async function summarySplit( req, res ) {
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
       { moduleType: { $eq: inputData.moduleType } },
+      { clientId: { $in: inputData.clientId } },
     ];
-    if ( inputData.clientId.length > 0 ) {
-      filters.push( { clientId: { $in: inputData.clientId } } );
-    }
+
     const query =[
       {
         $match: {
@@ -3131,13 +3196,10 @@ export async function overviewTable( req, res ) {
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
       { moduleType: { $eq: inputData.moduleType } },
+      { clientId: { $in: inputData.clientId } },
 
     ];
 
-    if ( inputData.clientId.length > 0 ) {
-      filters.push( { clientId: { $in: inputData.clientId } } );
-    }
-
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
@@ -3312,6 +3374,15 @@ export async function totalNotAssignedCount( req, res ) {
         { createdAt: -1 },
     );
     const latestDate = getStoreData?.fileDate || dayjs( fileDate ).format( 'DD-MM-YYYY' );
+
+    const geTraxData = await findOneTraxAuditData(
+        {},
+        { fileDate: 1 },
+        { createdAt: -1 },
+    );
+    const latestTraxDate = geTraxData?.fileDate || dayjs( fileDate ).format( 'DD-MM-YYYY' );
+    logger.info( { geTraxData: geTraxData } );
+
     const query = [
       {
         $match: {
@@ -3347,6 +3418,52 @@ export async function totalNotAssignedCount( req, res ) {
         },
       },
     ];
+    const traxQuery = [
+      {
+        $match: {
+          fileDate: { $eq: latestTraxDate },
+        },
+      },
+      {
+        $project: {
+          totalUnattendedCustomerCount: { $cond: [
+            { $eq: [ '$moduleType', 'unattended-customer' ] }, 1, 0,
+          ] },
+          totalLeftInMiddleCount: { $cond: [
+            { $eq: [ '$moduleType', 'left-in-middle' ] }, 1, 0,
+          ] },
+          totalUniformDetectionCount: { $cond: [
+            { $eq: [ '$moduleType', 'uniform-detection' ] }, 1, 0,
+          ] },
+          totalMobileDetectionCount: { $cond: [
+            { $eq: [ '$moduleType', 'mobile-detection' ] }, 1, 0,
+          ] },
+
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          totalTraxAuditCount: { $sum: 1 },
+          totalUnattendedCustomerCount: { $sum: '$totalUnattendedCustomerCount' },
+          totalLeftInMiddleCount: { $sum: '$totalLeftInMiddleCount' },
+          totalUniformDetectionCount: { $sum: '$totalUniformDetectionCount' },
+          totalMobileDetectionCount: { $sum: '$totalMobileDetectionCount' },
+
+
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          totalTraxAuditCount: 1,
+          totalUnattendedCustomerCount: 1,
+          totalLeftInMiddleCount: 1,
+          totalUniformDetectionCount: 1,
+          totalMobileDetectionCount: 1,
+        },
+      },
+    ];
     const inprogressCount=[
       {
         $match: {
@@ -3387,22 +3504,140 @@ export async function totalNotAssignedCount( req, res ) {
         },
       },
     ];
-    const getTotalcount = await aggregateAuditStoreData( query );
+    const binaryInprogressCount = [
+      {
+        $match: {
+          fileDate: { $eq: latestTraxDate },
+        },
+      },
+      {
+        $project: {
+          inprogressTraxCount: {
+            $cond: [
+              { $in: [ '$auditStatus', [ 'completed' ] ] }, 1, 0,
+            ],
+          },
+        },
+      },
+      {
+        $group: {
+          _id: null,
+          inprogressTraxCount: { $sum: '$inprogressTraxCount' },
+
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          inprogressTraxCount: { $ifNull: [ '$inprogressTraxCount', 0 ] },
 
+        },
+      },
+    ];
+    // const binaryInprogressCount=[
+    //   {
+    //     $match: {
+    //       fileDate: { $eq: latestDate },
+    //     },
+    //   },
+    //   {
+    //     $project: {
+    //       inprogressAuditCount: {
+    //         $cond: [
+    //           { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] }, 1, 0,
+    //         ],
+    //       },
+    //       inprogressZoneCount: { $cond: [
+    //         { $and: [ { $eq: [ '$moduleType', 'zone' ] }, { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] } ] }, 1, 0,
+    //       ] },
+    //       inprogressTrafficCount: { $cond: [
+    //         { $and: [ { $eq: [ '$moduleType', 'traffic' ] }, { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] } ] }, 1, 0,
+    //       ] },
+
+    //     },
+    //   },
+    //   {
+    //     $group: {
+    //       _id: null,
+    //       inprogressAuditCount: { $sum: '$inprogressAuditCount' },
+    //       inprogressZoneCount: { $sum: '$inprogressZoneCount' },
+    //       inprogressTrafficCount: { $sum: '$inprogressTrafficCount' },
+
+    //     },
+    //   },
+    //   {
+    //     $project: {
+    //       _id: 0,
+    //       inprogressAuditCount: { $ifNull: [ '$inprogressAuditCount', 0 ] },
+    //       inprogressZoneCount: { $ifNull: [ '$inprogressZoneCount', 0 ] },
+    //       inprogressTrafficCount: { $ifNull: [ '$inprogressTrafficCount', 0 ] },
+    //     },
+    //   },
+    // ];
+    // const mappingInprogressCount=[
+    //   {
+    //     $match: {
+    //       fileDate: { $eq: latestDate },
+    //     },
+    //   },
+    //   {
+    //     $project: {
+    //       inprogressAuditCount: {
+    //         $cond: [
+    //           { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] }, 1, 0,
+    //         ],
+    //       },
+    //       inprogressZoneCount: { $cond: [
+    //         { $and: [ { $eq: [ '$moduleType', 'zone' ] }, { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] } ] }, 1, 0,
+    //       ] },
+    //       inprogressTrafficCount: { $cond: [
+    //         { $and: [ { $eq: [ '$moduleType', 'traffic' ] }, { $in: [ '$status', [ 'completed', 'not_assign', 'skipped' ] ] } ] }, 1, 0,
+    //       ] },
+
+    //     },
+    //   },
+    //   {
+    //     $group: {
+    //       _id: null,
+    //       inprogressAuditCount: { $sum: '$inprogressAuditCount' },
+    //       inprogressZoneCount: { $sum: '$inprogressZoneCount' },
+    //       inprogressTrafficCount: { $sum: '$inprogressTrafficCount' },
+
+    //     },
+    //   },
+    //   {
+    //     $project: {
+    //       _id: 0,
+    //       inprogressAuditCount: { $ifNull: [ '$inprogressAuditCount', 0 ] },
+    //       inprogressZoneCount: { $ifNull: [ '$inprogressZoneCount', 0 ] },
+    //       inprogressTrafficCount: { $ifNull: [ '$inprogressTrafficCount', 0 ] },
+    //     },
+    //   },
+    // ];
+    const getTotalcount = await aggregateAuditStoreData( query );
+    const getTotalTraxAudit = await aggregateTraxAuditData( traxQuery );
     const getInprogressCount = await aggregateStoreAudit( inprogressCount );
-    if ( getTotalcount.length == 0 ) {
+    const getBinaryInprogressCount = await aggregateBinaryAudit( binaryInprogressCount );
+    // const getMappingInprogressCount = await aggregateStoreEmpDetection( mappingInprogressCount );
+    if ( getTotalcount.length == 0 && getTotalTraxAudit.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
-
+    logger.info( { getTotalTraxAudit: getTotalTraxAudit } );
     if ( getInprogressCount.length >0 ) {
-      notAssignedCount.totalAuditCount = getTotalcount[0].totalAuditCount - getInprogressCount[0]?.inprogressAuditCount;
-      notAssignedCount.totalZoneCount = getTotalcount[0].totalZoneCount - getInprogressCount[0]?.inprogressZoneCount;
-      notAssignedCount.totalTrafficCount = getTotalcount[0].totalTrafficCount - getInprogressCount[0]?.inprogressTrafficCount;
+      notAssignedCount.totalAuditCount =getTotalcount[0].totalAuditCount > getInprogressCount[0]?.inprogressAuditCount? getTotalcount[0].totalAuditCount - getInprogressCount[0]?.inprogressAuditCount : 0;
+      notAssignedCount.totalZoneCount = getTotalcount[0].totalZoneCount > getInprogressCount[0]?.inprogressZoneCount? getTotalcount[0].totalZoneCount - getInprogressCount[0]?.inprogressZoneCount: 0;
+      notAssignedCount.totalTrafficCount = getTotalcount[0].totalTrafficCount > getInprogressCount[0]?.inprogressTrafficCount? getTotalcount[0].totalTrafficCount - getInprogressCount[0]?.inprogressTrafficCount: 0;
     } else {
       notAssignedCount.totalAuditCount = getTotalcount[0].totalAuditCount;
       notAssignedCount.totalZoneCount = getTotalcount[0].totalZoneCount;
       notAssignedCount.totalTrafficCount= getTotalcount[0].totalTrafficCount;
     }
+
+    if ( getBinaryInprogressCount.length > 0 ) {
+      notAssignedCount.totalTraxAuditCount = getTotalTraxAudit[0].totalTraxAuditCount > getBinaryInprogressCount[0].inprogressTraxCount? getTotalTraxAudit[0].totalTraxAuditCount - getBinaryInprogressCount[0].inprogressTraxCount: 0;
+    } else {
+      notAssignedCount.totalTraxAuditCount = getTotalTraxAudit[0]?.totalTraxAuditCount;
+    }
     return res.sendSuccess( { result: notAssignedCount } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';