tango-app-api-audit 1.0.39 → 1.0.40

package/package.json

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

package/src/controllers/auditMetrics.controllers.js

@@ -22,7 +22,6 @@ export async function userAuditHistory( req, res ) {
     let filter = [
 
       { userId: { $eq: userId } },
-      { moduleType: 'traffic' },
 
     ];
     if ( inputData.fileType == 'fileDate' ) {
@@ -37,6 +36,12 @@ 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 },
@@ -57,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( {
@@ -110,6 +105,8 @@ export async function userAuditHistory( req, res ) {
         userId: 1,
         storeName: '$store.storeName',
         auditType: 1,
+        zoneName: 1,
+        moduleType: 1,
         beforeCount: 1,
         afterCount: 1,
         accuracy: { $round: [
@@ -128,6 +125,21 @@ 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 );
@@ -139,17 +151,19 @@ export async function userAuditHistory( req, res ) {
         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,
+            '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,
 
           } );
         } );

package/src/docs/zoneAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema, userZoneAuditHistorySchema, workSpaceSchema } from '../dtos/zoneAudit.dtos.js';
+import { getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema, workSpaceSchema } from '../dtos/zoneAudit.dtos.js';
 
 export const zoneAuditDocs = {
   '/v3/zone-audit/get-file': {
@@ -155,27 +155,4 @@ export const zoneAuditDocs = {
     },
   },
 
-  // metrics
-  '/v3/zone-audit/metrics/user-zone-audit-history': {
-    post: {
-      tags: [ 'Zone Audit Metrics' ],
-      description: `get zone audit work history of a user`,
-      operationId: '/metrics/user-zone-audit-history',
-      parameters: {},
-      requestBody: {
-        content: {
-          'application/json': {
-            schema: j2s( userZoneAuditHistorySchema ).swagger,
-          },
-        },
-      },
-      responses: {
-        200: { description: 'The Audited file has been submited successfully ' },
-        401: { description: 'Unauthorized User' },
-        422: { description: 'Field Error' },
-        500: { description: 'Server Error' },
-        204: { description: 'Not Found' },
-      },
-    },
-  },
 };

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

@@ -87,26 +87,3 @@ export const workSpaceValid = {
   query: workSpaceSchema,
 };
 
-export const userZoneAuditHistorySchema = joi.object(
-    {
-      userId: joi.string().optional(),
-      fromDate: joi.string().required(),
-      toDate: joi.string().required(),
-      fileType: joi.string().required(),
-      filterByStoreId: joi.array().required(),
-      filterByType: joi.array().optional(),
-      filterByAuditType: joi.array().optional(),
-      filterByStatus: joi.array().optional(),
-      searchValue: joi.string().optional().allow( '' ),
-      limit: joi.number().optional(),
-      offset: joi.number().optional(),
-      sortColumnName: joi.string().optional(),
-      sortBy: joi.number().optional(),
-      isExport: joi.boolean().optional(),
-
-    },
-);
-
-export const userZoneAuditHistoryValid = {
-  body: userZoneAuditHistorySchema,
-};

package/src/routes/zone.routes.js

@@ -1,8 +1,8 @@
 import { Router } from 'express';
-import { getDraftedDataValid, getFileValid, saveDraftValid, saveValid, userZoneAuditHistoryValid, workSpaceValid } from '../dtos/zoneAudit.dtos.js';
+import { getDraftedDataValid, getFileValid, saveDraftValid, saveValid, workSpaceValid } from '../dtos/zoneAudit.dtos.js';
 import { isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { getDraftedData, getZoneAuditFile, save, saveDraft, userZoneAuditHistory, workSpace } from '../controllers/zoneAudit.controller.js';
+import { getDraftedData, getZoneAuditFile, save, saveDraft, workSpace } from '../controllers/zoneAudit.controller.js';
 
 export const zoneAuditRouter=Router();
 
@@ -12,6 +12,3 @@ zoneAuditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraf
 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 );
-
-// metrics
-zoneAuditRouter.post( '/metrics/user-zone-audit-history', isAllowedSessionHandler, validate( userZoneAuditHistoryValid ), userZoneAuditHistory );