tango-app-api-audit 1.0.41 → 1.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.41",
+    "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 ) );
@@ -63,14 +64,6 @@ export async function userAuditHistory( req, res ) {
     ];
 
 
-    if ( inputData.sortColumnName ) {
-      const sortBy = inputData.sortBy || -1;
-      query.push( {
-        $sort: { [inputData.sortColumName]: sortBy },
-      },
-      );
-    }
-
     query.push( {
       $lookup: {
         from: 'stores',
@@ -93,17 +86,50 @@ export async function userAuditHistory( req, res ) {
 
     } );
 
+
     query.push( {
       $unwind: {
         path: '$store', preserveNullAndEmptyArrays: true,
       },
     } );
 
+    query.push( {
+      $lookup: {
+        from: 'clients',
+        let: { clientId: '$clientId' },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $eq: [ '$clientId', '$$clientId' ],
+              },
+            },
+          },
+          {
+            $project: {
+              clientName: 1,
+            },
+          },
+        ], as: 'client',
+      },
+
+    } );
+
+
+    query.push( {
+      $unwind: {
+        path: '$client', preserveNullAndEmptyArrays: true,
+      },
+    } );
+
     query.push( {
       $project: {
         storeId: 1,
         userId: 1,
         storeName: '$store.storeName',
+        clientId: 1,
+        clientName: 'client.clientName',
+        fileDate: 1,
         auditType: 1,
         zoneName: 1,
         moduleType: 1,
@@ -112,14 +138,51 @@ export async function userAuditHistory( req, res ) {
         accuracy: { $round: [
           {
             $divide: [ { $multiply: [ '$beforeCount', { $ifNull: [ '$afterCount', 0 ] } ] }, 100 ],
-          }, 2,
+          }, 1,
         ],
         },
-        startTime: 1,
-        endTime: 1,
-        timeSpent: { $round: [
-          { $divide: [ '$timeSpent', 60 ] }, 2,
-        ] },
+        startTime: {
+          $dateToString: {
+            format: '%Y-%m-%d %H:%M:%S',
+            date: '$startTime',
+            timezone: 'Asia/Kolkata',
+          },
+        },
+        endTime: {
+          $dateToString: {
+            format: '%Y-%m-%d %H:%M:%S',
+            date: '$endTime',
+            timezone: 'Asia/Kolkata',
+          },
+        },
+        // timeSpent: { $round: [
+        //   { $divide: [ '$timeSpent', 60 ] }, 2,
+        // ] },
+        timeSpent: {
+
+          $cond: [
+            { $lt: [ '$timeSpent', 60 ] }, // Case 1: If less than 60 seconds
+            { $concat: [ { $toString: '$timeSpent' }, ' sec' ] },
+            {
+              $cond: [
+                { $lt: [ '$timeSpent', 3600 ] }, // Case 2: If less than 60 minutes (3600 seconds)
+                {
+                  $concat: [
+                    { $toString: { $round: [ { $divide: [ '$timeSpent', 60 ] }, 1 ] } }, // Convert to minutes
+                    ' min',
+                  ],
+                },
+                {
+                  $concat: [
+                    { $toString: { $round: [ { $divide: [ '$timeSpent', 3600 ] }, 1 ] } }, // Convert to hours
+                    ' hr',
+                  ],
+                },
+              ],
+            },
+          ],
+
+        },
         auditStatus: 1,
         createdAt: 1,
       },
@@ -129,17 +192,26 @@ export async function userAuditHistory( req, res ) {
       query.push( {
         $match: {
           $or: [
+            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
+            { clientType: { $regex: inputData.searchValue, $options: 'i' } },
             { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
-            { storeId: { $regex: inputData.storeId, $options: 'i' } },
-            { storeName: { $regex: inputData.storeName, $options: 'i' } },
-            { moduleType: { $regex: inputData.moduleType, $options: 'i' } },
-            { auditStatus: { $regex: inputData.auditStatus, $options: 'i' } },
+            { storeId: { $regex: inputData.searchValue, $options: 'i' } },
+            { storeName: { $regex: inputData.searchValue, $options: 'i' } },
+            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
           ],
 
         },
       } );
     }
 
+    if ( inputData.sortColumnName ) {
+      const sortBy = inputData.sortBy || -1;
+      query.push( {
+        $sort: { [inputData.sortColumName]: sortBy },
+      },
+      );
+    }
     const count = await aggregateUserAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
@@ -151,6 +223,8 @@ export async function userAuditHistory( req, res ) {
         const exportData = [];
         chunk.forEach( ( element ) => {
           exportData.push( {
+            'Client Id': element.clientId,
+            'Client Name': element.clientName,
             'Store Id': element.storeId,
             'Store Name': element.storeName,
             'Type': element.auditType,
@@ -163,7 +237,7 @@ export async function userAuditHistory( req, res ) {
             'End Time': element.endTime,
             'Time Spent': element.timeSpent,
             'Audit Status': element.auditStatus,
-            'CreatedAt': element.createdAt,
+            'CreatedAt': dayjs( element.createdAt ).format( 'YYYY,MMM D' ),
 
           } );
         } );
@@ -184,7 +258,7 @@ export async function userAuditHistory( req, res ) {
     } );
     const result = await aggregateUserAudit( query );
 
-    return res.sendSuccess( { result: result } );
+    return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
     logger.info( { error: error, message: req.body, function: 'userAuditHistory' } );
@@ -214,6 +288,10 @@ export async function storeMetrics( req, res ) {
       filter.push( { status: { $in: inputData.filterByStatus } } );
     }
 
+    if ( inputData.filterByType && inputData.filterByType?.length > 0 ) {
+      filter.push( { auditType: { $in: inputData.filterByType } } );
+    }
+
 
     const query = [
       {
@@ -221,16 +299,45 @@ export async function storeMetrics( req, res ) {
           $and: filter,
         },
       },
+
+      {
+        $lookup: {
+          from: 'stores',
+          let: { storeId: '$storeId' },
+          pipeline: [
+            {
+              $match: {
+                $expr: {
+                  $eq: [ '$storeId', '$$storeId' ],
+                },
+              },
+            },
+            {
+              $project: {
+                _id: 0,
+                storeName: 1,
+              },
+            },
+          ], as: 'stores',
+        },
+      },
+      {
+        $unwind: {
+          path: '$stores',
+          preserveNullAndEmptyArrays: true,
+        },
+      },
       {
         $project: {
           _id: 0,
           fileDate: 1,
           storeId: 1,
-          storeName: '$storeId',
+          storeName: '$store.storeName',
+          clientName: '',
+          clientId: 1,
           userId: {
             $arrayElemAt: [ '$userId', { $subtract: [ { $size: '$userId' }, 1 ] } ],
           },
-          clientId: 1,
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
@@ -247,56 +354,56 @@ export async function storeMetrics( req, res ) {
       },
       {
         $lookup: {
-          from: 'stores',
-          let: { storeId: '$storeId' },
+          from: 'users',
+          let: { userId: '$userId' },
           pipeline: [
             {
               $match: {
                 $expr: {
-                  $eq: [ '$storeId', '$$storeId' ],
+                  $eq: [ '$_id', '$$userId' ],
                 },
               },
             },
             {
               $project: {
                 _id: 0,
-                storeName: 1,
+                userName: 1,
+                userEmail: '$email',
               },
             },
-          ], as: 'stores',
+          ], as: 'users',
         },
       },
       {
         $unwind: {
-          path: '$stores',
+          path: '$users',
           preserveNullAndEmptyArrays: true,
         },
       },
       {
         $lookup: {
-          from: 'users',
-          let: { userId: '$userId' },
+          from: 'clients',
+          let: { clientId: '$clientId' },
           pipeline: [
             {
               $match: {
                 $expr: {
-                  $eq: [ '$_id', '$$userId' ],
+                  $eq: [ '$clientId', '$$clientId' ],
                 },
               },
             },
             {
               $project: {
                 _id: 0,
-                userName: 1,
-                userEmail: '$email',
+                clientName: 1,
               },
             },
-          ], as: 'users',
+          ], as: 'client',
         },
       },
       {
         $unwind: {
-          path: '$users',
+          path: '$client',
           preserveNullAndEmptyArrays: true,
         },
       },
@@ -308,19 +415,43 @@ export async function storeMetrics( req, res ) {
           storeName: '$stores.storeName',
           userName: '$users.userName',
           userEmail: '$users.userEmail',
-
           clientId: 1,
+          clientName: '$client.clientName',
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
           accuracy: { $round: [
             { $divide: [
               { $multiply: [ { $ifNull: [ '$afterCount', 0 ] }, '$beforeCount' ] }, 100,
-            ] }, 2,
+            ] }, 1,
           ],
 
           },
-          timeSpent: 1,
+          timeSpent: {
+
+            $cond: [
+              { $lt: [ '$timeSpent', 60 ] }, // Case 1: If less than 60 seconds
+              { $concat: [ { $toString: '$timeSpent' }, ' sec' ] },
+              {
+                $cond: [
+                  { $lt: [ '$timeSpent', 3600 ] }, // Case 2: If less than 60 minutes (3600 seconds)
+                  {
+                    $concat: [
+                      { $toString: { $round: [ { $divide: [ '$timeSpent', 60 ] }, 1 ] } }, // Convert to minutes
+                      ' min',
+                    ],
+                  },
+                  {
+                    $concat: [
+                      { $toString: { $round: [ { $divide: [ '$timeSpent', 3600 ] }, 1 ] } }, // Convert to hours
+                      ' hr',
+                    ],
+                  },
+                ],
+              },
+            ],
+
+          },
           status: 1,
         },
       },
@@ -333,10 +464,23 @@ export async function storeMetrics( req, res ) {
           $or: [
             { clientId: { $regex: inputData.searchValue, $options: 'i' } },
             { clientName: { $regex: inputData.searchValue, $options: 'i' } },
+            { storeId: { $regex: inputData.searchValue, $options: 'i' } },
+            { storeName: { $regex: inputData.searchValue, $options: 'i' } },
+            { userName: { $regex: inputData.searchValue, $options: 'i' } },
+            { status: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditType: { $regex: inputData.searchValue, $options: 'i' } },
           ],
         },
       } );
     }
+
+    if ( inputData.sortColumnName ) {
+      const sortBy = inputData.sortBy || -1;
+      query.push( {
+        $sort: { [inputData.sortColumName]: sortBy },
+      },
+      );
+    }
     const count = await aggregateStoreAudit( query );
 
     if ( count.length == 0 ) {
@@ -361,6 +505,7 @@ export async function storeMetrics( req, res ) {
           'Store Id': element.storeId,
           'Store Name': element.storeName,
           'Client Id': element.clientId,
+          'Client Name': element.clientName,
           'User Name': element.userName,
           'User Email': element.userEmail,
           'Audit Type': element.auditType,
@@ -389,6 +534,7 @@ export async function clientMetrics( req, res ) {
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: 'traffic' } },
 
     ];
     if ( inputData?.filterByClient?.length> 0 ) {
@@ -396,11 +542,6 @@ export async function clientMetrics( req, res ) {
           { clientId: { $in: inputData.filterByClient } },
       );
     }
-    if ( inputData?.filterByAuditType?.length> 0 ) {
-      filter.push(
-          { clientId: { $in: inputData.filterByAuditType } },
-      );
-    }
     const query = [
       {
         $match: {
@@ -438,6 +579,7 @@ export async function clientMetrics( req, res ) {
             {
               $project: {
                 completedStores: { $cond: [ { $eq: [ '$status', 'completed' ] }, 1, 0 ] },
+                notAssignedStores: { $cond: [ { $eq: [ '$status', 'not_assign' ] }, 1, 0 ] },
                 inprogressStores: { $cond: [ { $in: [ '$status', [ 'inprogress', 'drafted', 'assigned' ] ] }, 1, 0 ] },
               },
             },
@@ -446,6 +588,8 @@ export async function clientMetrics( req, res ) {
                 _id: { clientId: '$clientId', fileDate: '$fileDate' },
                 completedStores: { $sum: '$completedStores' },
                 inprogressStores: { $sum: '$inprogressStores' },
+                notAssignedStores: { $sum: '$notAssignedStores' },
+                fileCount: { $sum: 1 },
               },
             },
             {
@@ -453,6 +597,8 @@ export async function clientMetrics( req, res ) {
                 _id: 0,
                 completedStores: 1,
                 inprogressStores: 1,
+                notAssignedStores: 1,
+                fileCount: 1,
                 completionPercentage: { $ifNull: [
                   {
                     $round: [ {
@@ -487,15 +633,18 @@ export async function clientMetrics( req, res ) {
           clientName: 1,
           totalFilesCount: 1,
           installedStore: 1,
+          notAssignedStores: '$storeAudit.notAssignedStores',
           inprogressStoresCount: '$storeAudit.inprogressStores',
+          fileCount: '$storeAudit.fileCount',
           notAssignedCount: 1,
-          clientStatus: { $cond: [ { $gt: [ '$storeAudit.inprogressStores', 0 ] }, 'not-taken', { $cond: [ { $gt: [ '$notAssignedCount', 0 ] }, 'pending', 'completed' ] } ] },
+          clientStatus: { $cond: [ { $eq: [ '$storeAudit.fileCount', 0 ] }, 'not-taken', { $cond: [ { $or: [ { $gt: [ '$notAssignedCount', 0 ] }, { $gt: [ '$storeAudit.notAssignedStores', 0 ] } ] }, 'pending', 'completed' ] } ] },
           completedStores: '$storeAudit.completedStores',
           completionPercentage: '$storeAudit.completionPercentage',
 
         },
       },
     ];
+
     if ( inputData.searchValue && inputData.searchValue!== '' ) {
       query.push( {
         $match: {
@@ -537,6 +686,7 @@ export async function clientMetrics( req, res ) {
               'Audit Stores': '$totalFilesCount',
               'Inprogress Stores': '$inprogressStoresCount',
               'Not Assigned': '$notAssignedCount',
+              'Not Assigned Stores': '$notAssignedStores',
               'Completed': '$completedStores',
               'Status': '$clientStatus',
             },
@@ -580,7 +730,7 @@ export async function userMetrics( req, res ) {
     }
     if ( inputData?.filterByAuditType?.length> 0 ) {
       filter.push(
-          { clientId: { $in: inputData.filterByAuditType } },
+          { moduleType: { $in: inputData.filterByAuditType } },
       );
     }
     if ( inputData?.filterByStatus?.length> 0 ) {
@@ -609,9 +759,8 @@ export async function userMetrics( req, res ) {
           startTime: 1,
           endTime: 1,
           totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
-          beforeCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$beforeCount', 0 ] },
+          beforeCount: 1,
           afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$afterCount', 0 ] },
-          zoneName: 1,
         },
       },
       {
@@ -624,7 +773,6 @@ export async function userMetrics( req, res ) {
           afterCount: { $sum: '$afterCount' },
           checkIntime: { $first: '$startTime' },
           checkOutTime: { $last: '$endTime' },
-          zoneName: { $last: '$zoneNmae' },
 
         },
       },
@@ -636,7 +784,6 @@ export async function userMetrics( req, res ) {
           totalCompletedFiles: 1,
           beforeCount: 1,
           afterCount: 1,
-          zoneName: 1,
           mappingPerc: { $round: [
             { $multiply: [
               { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
@@ -658,7 +805,6 @@ export async function userMetrics( req, res ) {
           afterCount: 1,
           checkIntime: 1,
           checkOutTime: 1,
-          zoneName: 1,
           mappingPerc: 1,
           hours: { $floor: { $divide: [ '$differenceInSeconds', 3600 ] } },
           minutes: { $floor: { $divide: [ { $mod: [ '$differenceInSeconds', 3600 ] }, 60 ] } },
@@ -675,7 +821,6 @@ export async function userMetrics( req, res ) {
           afterCount: 1,
           checkIntime: 1,
           checkOutTime: 1,
-          zoneName: 1,
           hours: {
             $cond: {
               if: { $lt: [ '$hours', 10 ] },
@@ -748,12 +893,23 @@ export async function userMetrics( req, res ) {
           userName: '$userInfo.userName',
           userId: 1,
           fileDate: 1,
-          zoneName: 1,
           totalCompletedFiles: 1,
           beforeCount: 1,
           afterCount: 1,
-          checkIntime: 1,
-          checkOutTime: 1,
+          checkIntime: {
+            $dateToString: {
+              format: '%Y-%m-%d %H:%M:%S',
+              date: '$checkIntime',
+              timezone: 'Asia/Kolkata',
+            },
+          },
+          checkOutTime: {
+            $dateToString: {
+              format: '%Y-%m-%d %H:%M:%S',
+              date: '$checkOutTime',
+              timezone: 'Asia/Kolkata',
+            },
+          },
           workingHours: 1,
         },
       },
@@ -762,7 +918,7 @@ export async function userMetrics( req, res ) {
       query.push( {
         $match: {
           $or: [
-            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
+            { userName: { $regex: inputData.searchValue, $options: 'i' } },
             { clientName: { $regex: inputData.searchValue, $options: 'i' } },
           ],
 
@@ -794,7 +950,6 @@ export async function userMetrics( req, res ) {
               'File Date': '$fileDate',
               'User Name': '$userName',
               'User Id': '$userId',
-              'Zone Name': '$zoneName',
               'Total Completed Files Count': '$totalCompletedFiles',
               'Total efore Count': '$beforeCount',
               'Total After Count': '$afterCount',
@@ -1020,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 =[
       {
@@ -1044,8 +1202,6 @@ export async function overViewTable( req, res ) {
           auditType: 1,
           auditStatus: 1,
           userId: 1,
-
-
         },
       },
       {
@@ -1083,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',
 
         },
       },
@@ -1093,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' } },
           ],
 
         },
@@ -1130,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 );
@@ -1244,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;
@@ -1286,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,
         };
 
@@ -1328,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,
@@ -1346,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,
@@ -1383,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,