tango-app-api-audit 3.4.0-alpha.5 → 3.4.0-alpha.6

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -1450,6 +1450,9 @@ export async function userAuditHistory( req, res ) {
     const dateRangeCreatedAt = await getDateWithCustomizeTime( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [
       { userId: { $eq: userId } },
+      {
+        moduleType: { $eq: inputData.moduleType },
+      },
     ];
 
     if ( inputData.dateType == 'fileDate' ) {
@@ -1464,12 +1467,6 @@ export async function userAuditHistory( req, res ) {
       );
     }
 
-    if ( inputData.filterByModuleType?.length > 0 ) {
-      filter.push( {
-        moduleType: { $in: inputData.filterByModuleType },
-      } );
-    }
-
     if ( inputData.filterByAuditType?.length > 0 ) {
       filter.push( {
         auditType: { $in: inputData.filterByAuditType },
@@ -1705,23 +1702,18 @@ export async function clientMetrics( req, res ) {
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
     ];
 
     let storeAuditFilter = [
       { $eq: [ '$clientId', '$$clientId' ] },
       { $eq: [ '$fileDate', '$$fileDate' ] },
+      {
+        $eq: [ '$moduleType', inputData.moduleType ],
+      },
 
     ];
 
-    if ( inputData?.filterByModuleType?.length> 0 ) {
-      filter.push(
-          { moduleType: { $in: inputData.filterByModuleType } },
-      );
-      storeAuditFilter.push( {
-        $in: [ '$moduleType', inputData.filterByModuleType ],
-      } );
-    }
-
     if ( inputData?.filterByClient?.length> 0 ) {
       filter.push(
           { clientId: { $in: inputData.filterByClient } },
@@ -1930,6 +1922,7 @@ export async function storeMetrics( req, res ) {
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
     if ( inputData.filterByClientId && inputData.filterByClientId?.length > 0 ) {
@@ -1948,11 +1941,6 @@ export async function storeMetrics( req, res ) {
       filter.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
 
-    if ( inputData.filterByModuleType && inputData.filterByModuleType?.length > 0 ) {
-      filter.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
-
     const query = [
       {
         $match: {
@@ -2219,20 +2207,17 @@ export async function userMetrics( req, res ) {
       filter.push(
           { updatedAt: { $gte: dateRangeUpdatedAt.start } },
           { updatedAt: { $lte: dateRangeUpdatedAt.end } },
+          { moduleType: { $eq: inputData.moduleType } },
 
       );
     } else {
       filter.push(
           { fileDateISO: { $gte: dateRange.start } },
           { fileDateISO: { $lte: dateRange.end } },
+          { moduleType: { $eq: inputData.moduleType } },
 
       );
     }
-    if ( inputData?.filterByModuleType?.length> 0 ) {
-      filter.push(
-          { moduleType: { $in: inputData.filterByModuleType } },
-      );
-    }
     if ( inputData?.filterByStatus?.length> 0 ) {
       filter.push(
           { auditStatus: { $in: inputData.filterByStatus } },
@@ -2489,6 +2474,7 @@ export async function pendingSummaryTable( req, res ) {
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
       { auditStatus: { $ne: 'completed' } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
 
@@ -2496,10 +2482,6 @@ export async function pendingSummaryTable( req, res ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
 
-    if ( inputData.filterByModuleType.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }
@@ -2680,7 +2662,7 @@ export async function overAllAuditSummary( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
-      { moduleType: { $in: inputData.moduleType },
+      { moduleType: { $eq: inputData.moduleType },
       },
     ];
     if ( inputData.clientId.length > 0 ) {
@@ -3030,13 +3012,11 @@ export async function summarySplit( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
     ];
     if ( inputData.clientId.length > 0 ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
-    if ( inputData?.moduleType?.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.moduleType } } );
-    }
     const query =[
       {
         $match: {
@@ -3146,6 +3126,7 @@ export async function overviewTable( req, res ) {
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
+      { moduleType: { $eq: inputData.moduleType } },
 
     ];
 
@@ -3153,10 +3134,6 @@ export async function overviewTable( req, res ) {
       filters.push( { clientId: { $in: inputData.clientId } } );
     }
 
-    if ( inputData.filterByModuleType.length > 0 ) {
-      filters.push( { moduleType: { $in: inputData.filterByModuleType } } );
-    }
-
     if ( inputData.filterByAuditType.length > 0 ) {
       filters.push( { auditType: { $in: inputData.filterByAuditType } } );
     }

package/src/controllers/traxAudit.controllers.js

@@ -10,6 +10,7 @@ import { aggregateAssignAudit } from '../service/assignAudit.service.js';
 import { aggregateStoreEmpDetection } from '../service/storeEmpDetection.service.js';
 import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 import _ from 'lodash';
+import mongoose from 'mongoose';
 
 
 export async function getDetectionAuditFile( req, res ) {
@@ -1782,6 +1783,7 @@ export async function storeMetrics( req, res ) {
           // userId: {
           //   $arrayElemAt: [ '$userId', { $subtract: [ { $size: '$userId' }, 1 ] } ],    //need to check if no data
           // },
+          userId: 1,
           auditType: 1,
           beforeCount: 1,
           afterCount: { $ifNull: [ '$afterCount', null ] },
@@ -1793,6 +1795,7 @@ export async function storeMetrics( req, res ) {
           }, null ] },
           timeSpent: 1,
           status: 1,
+          auditStatus: 1,
         },
       },
       {
@@ -1900,6 +1903,7 @@ export async function storeMetrics( req, res ) {
 
           },
           status: 1,
+          auditStatus: 1,
         },
       },
 
@@ -1920,6 +1924,7 @@ export async function storeMetrics( req, res ) {
             { tempId: { $regex: inputData.searchValue, $options: 'i' } },
             { question: { $regex: inputData.searchValue, $options: 'i' } },
             { answer: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
           ],
         },
       } );
@@ -1968,6 +1973,7 @@ export async function storeMetrics( req, res ) {
             'Accuracy': element.accuracy,
             'Time Spent': element.timeSpent,
             'Status': element.status,
+            'Audit Status': element.auditStatus,
           } );
         } else {
           exportdata.push( {
@@ -1985,6 +1991,7 @@ export async function storeMetrics( req, res ) {
             'Accuracy': element.accuracy,
             'Time Spent': element.timeSpent,
             'Status': element.status,
+            'Audit Status': element.auditStatus,
           } );
         }
       } );
@@ -2054,6 +2061,7 @@ export async function userMetrics( req, res ) {
           totalCompletedFiles: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, 1, 0 ] },
           beforeCount: 1,
           afterCount: { $cond: [ { $eq: [ '$auditStatus', 'completed' ] }, '$afterCount', 0 ] },
+          auditStatus: 1,
         },
       },
       {
@@ -2070,6 +2078,7 @@ export async function userMetrics( req, res ) {
           tempId: { $last: '$tempId' },
           question: { $last: '$question' },
           answer: { $last: '$answer' },
+          auditStatus: { $last: '$auditStatus' },
 
         },
       },
@@ -2095,6 +2104,7 @@ export async function userMetrics( req, res ) {
           differenceInSeconds: {
             $divide: [ { $subtract: [ '$checkOutTime', '$checkIntime' ] }, 1000 ],
           },
+          auditStatus: 1,
         },
       },
       {
@@ -2114,6 +2124,7 @@ export async function userMetrics( req, res ) {
           hours: { $floor: { $divide: [ '$differenceInSeconds', 3600 ] } },
           minutes: { $floor: { $divide: [ { $mod: [ '$differenceInSeconds', 3600 ] }, 60 ] } },
           seconds: { $mod: [ '$differenceInSeconds', 60 ] },
+          auditStatus: 1,
         },
       },
       {
@@ -2152,7 +2163,7 @@ export async function userMetrics( req, res ) {
               else: { $toString: { $round: [ '$seconds', 0 ] } },
             },
           },
-
+          auditStatus: 1,
         },
       },
       {
@@ -2174,6 +2185,7 @@ export async function userMetrics( req, res ) {
           workingHours: {
             $concat: [ '$hours', ':', '$minutes', ':', '$seconds' ],
           },
+          auditStatus: 1,
         },
       },
       {
@@ -2231,6 +2243,7 @@ export async function userMetrics( req, res ) {
             },
           },
           workingHours: 1,
+          auditStatus: 1,
         },
       },
     ];
@@ -2281,6 +2294,7 @@ export async function userMetrics( req, res ) {
               'Stream Name': '$streamName',
               'Question': '$question',
               'Answer': '$answer',
+              'Audit Status': '$auditStatus',
             },
           },
       );
@@ -2616,90 +2630,6 @@ export async function overAllAuditSummary( req, res ) {
   }
 }
 
-export async function overViewCard( req, res ) {
-  try {
-    const inputData = req.body;
-    const temp = {
-      totalCount: 0,
-      auditFileCount: 0,
-      ReAuditFileCount: 0,
-      inprogressCount: 0,
-      completedCount: 0,
-      pendingCount: 0,
-    };
-
-    const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
-    let filters =[
-      { fileDateISO: { $gte: dateRange.start } },
-      { fileDateISO: { $lte: dateRange.end } },
-    ];
-    if ( inputData.clientId.length > 0 ) {
-      filters.push( { clientId: { $in: inputData.clientId } } );
-    }
-    const query =[
-      {
-        $match: {
-          $and: filters,
-        },
-
-      },
-      {
-        $project: {
-          auditFileCount: {
-            $cond: [
-              { $eq: [ '$auditType', 'Audit' ] }, 1, 0,
-            ],
-          },
-          ReAuditFileCount: {
-            $cond: [
-              { $eq: [ '$auditType', 'ReAudit' ] }, 1, 0,
-            ],
-          },
-          inprogressCount: {
-            $cond: [
-              { $ne: [ '$status', 'completed' ] }, 1, 0,
-            ],
-          },
-          completedCount: {
-            $cond: [
-              { $eq: [ '$status', '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 = inputData.moduleType.includes( [ 'uniform-detection', 'mobile-detection' ] )? await aggregateStoreEmpDetection( query ) : await aggregateBinaryAudit( query );
-    logger.info( { result: result } );
-    return res.sendSuccess( { result: result.length> 0? result[0]: 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 async function summarySplit( req, res ) {
   try {
     const inputData = req.body;
@@ -2870,6 +2800,7 @@ export async function overviewTable( req, res ) {
           afterCount: 1,
           auditType: 1,
           status: 1,
+          auditStatus: 1,
           // userId: 1,
         },
       },
@@ -2915,6 +2846,7 @@ export async function overviewTable( req, res ) {
           afterCount: 1,
           auditType: 1,
           status: 1,
+          auditStatus: 1,
           // userName: '$user.userName',
           // userEmail: '$user.userEmail',
 
@@ -2930,6 +2862,7 @@ export async function overviewTable( req, res ) {
             { fileDate: { $regex: inputData.searchValue, $options: 'i' } },
             { auditType: { $regex: inputData.searchValue, $options: 'i' } },
             { status: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditStatus: { $regex: inputData.searchValue, $options: 'i' } },
             { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
             { streamName: { $regex: inputData.searchValue, $options: 'i' } },
             { tempId: { $regex: inputData.searchValue, $options: 'i' } },
@@ -2987,6 +2920,7 @@ export async function overviewTable( req, res ) {
             // 'User Name': element.userName,
             // 'User Email': element.userEmail,
             'Status': element.status,
+            'Audit Status': element.status,
           } );
         } else {
           exportdata.push( {
@@ -3005,6 +2939,7 @@ export async function overviewTable( req, res ) {
             // 'User Name': element.userName,
             // 'User Email': element.userEmail,
             'Status': element.status,
+            'Audit Status': element.status,
           } );
         }
       } );

package/src/docs/traxAudit.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { getFileSchema, userAuditHistorySchema, workSpaceSchema, saveSchema, clientMetricsSchema, storeMetricsSchema, userMetricsSchema, pendingSummaryTableSchema, overAllAuditSummarySchema, overviewTableSchema, summarySplitSchema, overViewCardSchema } from '../dtos/traxAudit.dtos.js';
+import { getFileSchema, userAuditHistorySchema, workSpaceSchema, saveSchema, clientMetricsSchema, storeMetricsSchema, userMetricsSchema, pendingSummaryTableSchema, overAllAuditSummarySchema, overviewTableSchema, summarySplitSchema } from '../dtos/traxAudit.dtos.js';
 
 export const traxAuditDocs = {
 
@@ -222,28 +222,6 @@ export const traxAuditDocs = {
       },
     },
   },
-  '/v3/trax-audit/metrics/overview-card': {
-    post: {
-      tags: [ 'Trax Audit' ],
-      description: `Get overall high level audited files count`,
-      operationId: 'metrics/overview-card',
-      parameters: {},
-      requestBody: {
-        content: {
-          'application/json': {
-            schema: j2s( overViewCardSchema ).swagger,
-          },
-        },
-      },
-      responses: {
-        200: { description: 'Successful' },
-        401: { description: 'Unauthorized User' },
-        422: { description: 'Field Error' },
-        500: { description: 'Server Error' },
-        204: { description: 'Not Found' },
-      },
-    },
-  },
 
   '/v3/trax-audit/metrics/summary-split-up': {
     post: {

package/src/dtos/audit.dtos.js

@@ -148,7 +148,7 @@ export const userAuditHistorySchema = joi.object(
       dateType: joi.string().required(),
       clientId: joi.array().optional(),
       filterByStoreId: joi.array().required(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByAuditType: joi.array().optional(),
       filterByStatus: joi.array().optional(),
       searchValue: joi.string().optional().allow( '' ),
@@ -170,7 +170,7 @@ export const clientMetricsSchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       searchValue: joi.string().optional().allow( '' ),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByClient: joi.array().required(),
       filterByStatus: joi.array().optional(),
       sortColumnName: joi.string().optional(),
@@ -195,7 +195,7 @@ export const storeMetricsSchema = joi.object(
       filterByStoreId: joi.array().optional(),
       filterByStatus: joi.array().optional(),
       filterByAuditType: joi.array().optional(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
       limit: joi.number().optional(),
@@ -215,7 +215,7 @@ export const userMetricsSchema = joi.object(
       dateType: joi.string().required(),
       searchValue: joi.string().optional().allow( '' ),
       filterByUser: joi.array().optional(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByStatus: joi.array().optional(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
@@ -238,7 +238,7 @@ export const pendingSummaryTableSchema = joi.object(
       offset: joi.number().optional(),
       searchValue: joi.string().optional().allow( '' ),
       filterByStatus: joi.array().required(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByAuditType: joi.array().optional(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
@@ -259,7 +259,7 @@ export const overviewTableSchema = joi.object(
       offset: joi.number().optional(),
       searchValue: joi.string().optional().allow( '' ),
       filterByStatus: joi.array().optional(),
-      filterByModuleType: joi.array().optional(),
+      moduleType: joi.string().required(),
       filterByAuditType: joi.array().optional(),
       sortColumnName: joi.string().optional(),
       sortBy: joi.number().optional(),
@@ -276,7 +276,7 @@ export const overAllAuditSummarySchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       clientId: joi.array().optional(),
-      moduleType: joi.array().required(),
+      moduleType: joi.string().required(),
     },
 );
 
@@ -319,7 +319,7 @@ export const summarySplitSchema = joi.object(
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
       clientId: joi.array().optional(),
-      moduleType: joi.array().optional(),
+      moduleType: joi.string().required(),
     },
 );
 

package/src/dtos/traxAudit.dtos.js

@@ -219,20 +219,6 @@ export const overAllAuditSummaryValid = {
   body: overAllAuditSummarySchema,
 };
 
-
-export const overViewCardSchema = joi.object(
-    {
-      fromDate: joi.string().required(),
-      toDate: joi.string().required(),
-      clientId: joi.array().optional(),
-      moduleType: joi.string().required(),
-    },
-);
-
-export const overViewCardValid = {
-  body: overViewCardSchema,
-};
-
 export const summarySplitSchema = joi.object(
     {
       fromDate: joi.string().required(),

package/src/routes/traxAudit.routes.js

@@ -1,8 +1,8 @@
 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, overViewCardValid } from '../dtos/traxAudit.dtos.js';
+import { getDetectionFileValid, getFileValid, userAuditHistoryValid, workSpaceValid, saveValid, clientMetricsValid, storeMetricsValid, userMetricsValid, pendingSummaryTableValid, overAllAuditSummaryValid, summarySplitValid, overviewTableValid } from '../dtos/traxAudit.dtos.js';
 import { isExistsQueue } from '../validation/audit.validation.js';
-import { clientMetrics, getAuditFile, getDetectionAuditFile, overAllAuditSummary, overViewCard, overviewTable, pendingSummaryTable, saveBinary, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/traxAudit.controllers.js';
+import { clientMetrics, getAuditFile, getDetectionAuditFile, overAllAuditSummary, overviewTable, pendingSummaryTable, saveBinary, storeMetrics, summarySplit, userAuditHistory, userMetrics, workSpace } from '../controllers/traxAudit.controllers.js';
 import { validateBinaryAudit } from '../validation/traxAuditValidation.js';
 
 export const traxAuditRouter = Router();
@@ -30,7 +30,6 @@ traxAuditRouter.post( '/metrics/overall-audit-summary', isAllowedSessionHandler,
 
 // summary
 
-traxAuditRouter.post( '/metrics/overview-card', isAllowedSessionHandler, validate( overViewCardValid ), overViewCard );
 traxAuditRouter.post( '/metrics/summary-split-up', isAllowedSessionHandler, validate( summarySplitValid ), summarySplit );
 traxAuditRouter.post( '/metrics/overview-table', isAllowedSessionHandler, validate( overviewTableValid ), overviewTable );