tango-app-api-audit 1.0.38 → 1.0.40

package/package.json

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

package/src/controllers/auditMetrics.controllers.js

@@ -1,4 +1,4 @@
-import { download, getUTC, insertOpenSearchData, logger, sendMessageToQueue } from 'tango-app-api-middleware';
+import { chunkArray, download, getUTC, insertOpenSearchData, logger, sendMessageToQueue } from 'tango-app-api-middleware';
 import { aggregateAuditClientData } from '../service/auditClientData.service.js';
 import { aggregateUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
 import mongoose from 'mongoose';
@@ -21,7 +21,7 @@ export async function userAuditHistory( req, res ) {
     const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [
 
-      { userId: { $eq: new mongoose.Types.ObjectId( userId ) } },
+      { userId: { $eq: userId } },
 
     ];
     if ( inputData.fileType == 'fileDate' ) {
@@ -36,6 +36,24 @@ export async function userAuditHistory( req, res ) {
       );
     }
 
+    if ( inputData.auditType?.length > 0 ) {
+      filter.push( {
+        moduleType: { $in: inputData.auditType },
+      } );
+    }
+
+    if ( inputData.filterByStoreId?.length > 0 ) {
+      filter.push( {
+        storeId: { $in: inputData.filterByStoreId },
+      } );
+    }
+
+    if ( inputData.filterByStatus?.length > 0 ) {
+      filter.push( {
+        auditStatus: { $in: inputData.filterByStatus },
+      } );
+    }
+
     const query = [
       {
         $match: {
@@ -44,17 +62,7 @@ export async function userAuditHistory( req, res ) {
       },
     ];
 
-    if ( inputData.searchValue && inputData.searchValue!== '' ) {
-      query.push( {
-        $match: {
-          $or: [
-            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
-            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
-          ],
 
-        },
-      } );
-    }
     if ( inputData.sortColumnName ) {
       const sortBy = inputData.sortBy || -1;
       query.push( {
@@ -63,11 +71,42 @@ export async function userAuditHistory( req, res ) {
       );
     }
 
+    query.push( {
+      $lookup: {
+        from: 'stores',
+        let: { storeId: '$storeId' },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $eq: [ '$storeId', '$$storeId' ],
+              },
+            },
+          },
+          {
+            $project: {
+              storeName: 1,
+            },
+          },
+        ], as: 'store',
+      },
+
+    } );
+
+    query.push( {
+      $unwind: {
+        path: '$store', preserveNullAndEmptyArrays: true,
+      },
+    } );
+
     query.push( {
       $project: {
         storeId: 1,
-        storeName: '$storeId',
+        userId: 1,
+        storeName: '$store.storeName',
         auditType: 1,
+        zoneName: 1,
+        moduleType: 1,
         beforeCount: 1,
         afterCount: 1,
         accuracy: { $round: [
@@ -86,11 +125,57 @@ export async function userAuditHistory( req, res ) {
       },
     } );
 
+    if ( inputData.searchValue && inputData.searchValue!== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { 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' } },
+          ],
+
+        },
+      } );
+    }
+
     const count = await aggregateUserAudit( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
 
+    if ( inputData.isExport ) {
+      const chunkedMappingData = await chunkArray( count, 10 );
+      const promises = chunkedMappingData.map( async ( chunk ) => {
+        const exportData = [];
+        chunk.forEach( ( element ) => {
+          exportData.push( {
+            'Store Id': element.storeId,
+            'Store Name': element.storeName,
+            'Type': element.auditType,
+            'Before Count': element.beforeCount,
+            'After Count': element.afterCount,
+            'Accuracy': element.accuracy,
+            'Zone Name': element.zoneName,
+            'Audit Type': element.moduleType,
+            'Start Time': element.startTime,
+            'End Time': element.endTime,
+            'Time Spent': element.timeSpent,
+            'Audit Status': element.auditStatus,
+            'CreatedAt': element.createdAt,
+
+          } );
+        } );
+        return exportData;
+      } );
+      const mappedArrays = await Promise.all( promises );
+      mappedArrays.flat();
+
+      await download( mappedArrays, res );
+      return;
+    }
+
     query.push( {
       $skip: offset,
     },

package/src/controllers/zoneAudit.controller.js

@@ -1,4 +1,4 @@
-import { download, fileUpload, getJsonFileData, getUTC, insertOpenSearchData, listFileByPath, sendMessageToQueue, signedUrl, sqsReceive } from 'tango-app-api-middleware';
+import { chunkArray, download, fileUpload, getJsonFileData, getUTC, insertOpenSearchData, listFileByPath, sendMessageToQueue, signedUrl, sqsReceive } from 'tango-app-api-middleware';
 import { aggregateZoneUserAudit, createZoneUserAudit, findOneZoneUserAudit } from '../service/zoneUserAudit.service.js';
 import { logger } from 'tango-app-api-middleware';
 import { aggregateAssignZoneAudit } from '../service/assignZoneAudit.service.js';
@@ -898,3 +898,172 @@ export async function workSpace( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function userZoneAuditHistory( req, res ) {
+  try {
+    const inputData = req.body;
+    const userId = 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 ) );
+    let filter = [
+
+      { userId: { $eq: userId } },
+      { moduleType: 'zone' },
+
+    ];
+    if ( inputData.fileType == 'fileDate' ) {
+      filter.push(
+          { fileDateISO: { $gte: dateRange.start } },
+          { fileDateISO: { $lte: dateRange.end } },
+      );
+    } else {
+      filter.push(
+          { createdAt: { $gte: dateRange.start } },
+          { createdAt: { $lte: dateRange.end } },
+      );
+    }
+    if ( inputData.filterByStoreId?.length > 0 ) {
+      filter.push( {
+        storeId: { $in: inputData.filterByStoreId },
+      } );
+    }
+
+    if ( inputData.filterByStatus?.length > 0 ) {
+      filter.push( {
+        auditStatus: { $in: inputData.filterByStatus },
+      } );
+    }
+
+    const query = [
+      {
+        $match: {
+          $and: filter,
+        },
+      },
+    ];
+
+    if ( inputData.searchValue && inputData.searchValue!== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
+            { clientName: { $regex: inputData.searchValue, $options: 'i' } },
+          ],
+
+        },
+      } );
+    }
+    if ( inputData.sortColumnName ) {
+      const sortBy = inputData.sortBy || -1;
+      query.push( {
+        $sort: { [inputData.sortColumName]: sortBy },
+      },
+      );
+    }
+
+    query.push( {
+      $lookup: {
+        from: 'stores',
+        let: { storeId: '$storeId' },
+        pipeline: [
+          {
+            $match: {
+              $expr: {
+                $eq: [ '$storeId', '$$storeId' ],
+              },
+            },
+          },
+          {
+            $project: {
+              storeName: 1,
+            },
+          },
+        ], as: 'store',
+      },
+
+    } );
+
+    query.push( {
+      $unwind: {
+        path: '$store', preserveNullAndEmptyArrays: true,
+      },
+    } );
+
+
+    query.push( {
+
+      $project: {
+        storeId: 1,
+        userId: 1,
+        storeName: '$store.storeName',
+        zoneName: 1,
+        auditType: 1,
+        beforeCount: 1,
+        afterCount: 1,
+        accuracy: { $round: [
+          {
+            $divide: [ { $multiply: [ '$beforeCount', { $ifNull: [ '$afterCount', 0 ] } ] }, 100 ],
+          }, 2,
+        ],
+        },
+        startTime: 1,
+        endTime: 1,
+        timeSpent: { $round: [
+          { $divide: [ '$timeSpent', 60 ] }, 2,
+        ] },
+        auditStatus: 1,
+        createdAt: 1,
+      },
+
+    } );
+
+    const count = await aggregateUserAudit( query );
+    if ( count.length == 0 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
+
+    if ( inputData.isExport ) {
+      const chunkedMappingData = await chunkArray( count, 10 );
+      const promises = chunkedMappingData.map( async ( chunk ) => {
+        const exportData = [];
+        chunk.forEach( ( element ) => {
+          exportData.push( {
+            'storeId': element.storeId,
+            'storeName': element.storeName,
+            'auditType': element.auditType,
+            'beforeCount': element.beforeCount,
+            'afterCount': element.afterCount,
+            'accuracy': element.accuracy,
+            'startTime': element.startTime,
+            'endTime': element.endTime,
+            'timeSpent': element.timeSpent,
+            'auditStatus': element.auditStatus,
+            'createdAt': element.createdAt,
+
+          } );
+        } );
+        return exportData;
+      } );
+      const mappedArrays = await Promise.all( promises );
+      mappedArrays.flat();
+
+      await download( mappedArrays, res );
+      return;
+    }
+
+    query.push( {
+      $skip: offset,
+    },
+    {
+      $limit: limit,
+    } );
+    const result = await aggregateUserAudit( query );
+
+    return res.sendSuccess( { result: result } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.body, function: 'userZoneAuditHistory' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/dtos/auditMetrics.dtos.js

@@ -44,6 +44,7 @@ export const storeMetricsSchema = joi.object(
       filterByClientId: joi.array().required(),
       filterByStoreId: joi.array().optional(),
       filterByStatus: joi.array().optional(),
+      filterByAuditType: joi.array().optional(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
       limit: joi.number().optional(),

package/src/dtos/zoneAudit.dtos.js

@@ -86,3 +86,4 @@ export const workSpaceSchema = joi.object(
 export const workSpaceValid = {
   query: workSpaceSchema,
 };
+

package/src/routes/zone.routes.js

@@ -6,10 +6,9 @@ import { getDraftedData, getZoneAuditFile, save, saveDraft, workSpace } from '..
 
 export const zoneAuditRouter=Router();
 
-
+// zone Audit
 zoneAuditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ), isExistsQueue, getZoneAuditFile );
 zoneAuditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraftValid ), saveDraft );
 zoneAuditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraftedDataValid ), getDraftedData );
 zoneAuditRouter.post( '/save', isAllowedSessionHandler, validate( saveValid ), validateUserAudit, save );
 zoneAuditRouter.get( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
-