tango-app-api-audit 1.0.7 → 1.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "1.0.7",
+    "version": "1.0.9",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -19,6 +19,7 @@
         "express": "^4.19.2",
         "handlebars": "^4.7.8",
         "joi-to-swagger": "^6.2.0",
+        "lodash": "^4.17.21",
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",

package/src/controllers/audit.controllers.js

@@ -1,12 +1,14 @@
-import { chunkArray, getJsonFileData, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, listFileWithoutLimit, signedUrl } from 'tango-app-api-middleware';
+import { chunkArray, download, getJsonFileData, getOpenSearchData, getUTC, insertOpenSearchData, listFileByPath, listFileWithoutLimit, signedUrl } from 'tango-app-api-middleware';
 import { aggregateUserAudit, createUserAudit, findOneUserAudit, updateOneUserAudit } from '../service/userAudit.service.js';
 import { aggregateAssignAudit, updateOneAssignAudit } from '../service/assignAudit.service.js';
 import { findOneUser } from '../service/user.service.js';
 import dayjs from 'dayjs';
 import { aggregateClient } from '../service/client.service.js';
 import { logger } from 'tango-app-api-middleware';
-import { sqsReceive } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
-import { createStoreAudit, updateOneStoreAudit } from '../service/storeAudit.service.js';
+import { listQueue, sqsReceive } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
+import { aggregateStoreAudit, createStoreAudit, updateOneStoreAudit } from '../service/storeAudit.service.js';
+import { aggregateAuditClientData } from '../service/auditClientData.service.js';
+import _ from 'lodash';
 
 export async function getAuditFile( req, res ) {
   try {
@@ -448,17 +450,19 @@ export const mapFunction = async ( chunk, filter ) => {
   return temp;
 };
 
-export async function getQueueDetailList( req, res ) {
+export async function workSpace( req, res ) {
   try {
     const inputData = req.query;
-    const data = await getUTC( new Date(), new Date() );
+    const limit = inputData.limit || 10;
+    const offset =inputData.offset? ( inputData.offset - 1 ) * inputData.limit : 0;
+    const dateRange = await getUTC( new Date(), new Date() );
 
     const temp = [];
     const clientQuery = [
       {
         $match: {
           $and: [
-            { active: { $in: [ 'active', 'hold' ] } },
+            { status: { $in: [ 'active', 'hold' ] } },
             { 'auditConfigs.audit': { $eq: true } },
           ],
         },
@@ -471,7 +475,7 @@ export async function getQueueDetailList( req, res ) {
       },
     ];
 
-    if ( inputData.searchValue ) {
+    if ( inputData.searchValue&& inputData.searchValue!== '' ) {
       clientQuery.push( {
         $match: {
           $or: [
@@ -482,16 +486,16 @@ export async function getQueueDetailList( req, res ) {
       } );
     }
     const count = await aggregateClient( clientQuery );
-    if ( inputData.limit && inputData.offset && !inputData.export ) {
-      const skip = ( inputData.offset - 1 ) * inputData.limit;
-      clientQuery.push( { $skip: skip }, { $limit: inputData.limit } );
+    logger.info( { count: count } );
+    if ( count?.length == 0 ) {
+      return res.sendError( 'No Data Found', 204 );
     }
 
-    const clientDetails = await aggregateClient( clientQuery );
-    if ( clientDetails && clientDetails.length === 0 ) {
-      return res.sendError( 'No Data Found', 204 );
+    if ( inputData.limit && !inputData.isExport ) {
+      clientQuery.push( { $skip: offset }, { $limit: limit } );
     }
 
+    const clientDetails = await aggregateClient( clientQuery );
     const clientList = clientDetails.map( ( i ) => i.clientId );
     const query = [
       {
@@ -519,7 +523,7 @@ export async function getQueueDetailList( req, res ) {
       },
     ];
 
-    const fileDate = dayjs( data.start ).subtract( 1, 'days' );
+    const fileDate = dayjs( dateRange.start ).subtract( 1, 'days' );
 
     const completedFiles = [
       {
@@ -534,7 +538,7 @@ export async function getQueueDetailList( req, res ) {
         $project: {
           clientId: 1,
           completed: {
-            $cond: [ { $eq: [ '$storeStatus', 'completed' ] }, 1, 0 ],
+            $cond: [ { $eq: [ '$status', 'completed' ] }, 1, 0 ],
           },
         },
       },
@@ -560,8 +564,8 @@ export async function getQueueDetailList( req, res ) {
         $match: {
           $and: [
             { clientId: { $in: clientList } },
-            { createdAt: { $gte: data.start } },
-            { createdAt: { $lte: data.end } },
+            { createdAt: { $gte: dateRange.start } },
+            { createdAt: { $lte: dateRange.end } },
           ],
         },
       },
@@ -569,7 +573,7 @@ export async function getQueueDetailList( req, res ) {
         $project: {
           clientId: 1,
           pending: {
-            $cond: [ { $or: [ { $in: [ '$auditStatus', [ 'inprogress', 'drafted' ] ] }, { $in: [ '$storeStatus', [ 'skipped' ] ] } ] }, 1, 0 ],
+            $cond: [ { $or: [ { $in: [ '$auditStatus', [ 'inprogress', 'drafted' ] ] } ] }, 1, 0 ],
           },
         },
       },
@@ -599,8 +603,8 @@ export async function getQueueDetailList( req, res ) {
           $and: [
             { clientId: { $in: clientList } },
             { userId: { $eq: inputData.userId } },
-            { createdAt: { $gte: data.start } },
-            { createdAt: { $lte: data.end } },
+            { createdAt: { $gte: dateRange.start } },
+            { createdAt: { $lte: dateRange.end } },
           ],
         },
       },
@@ -686,14 +690,14 @@ export async function getQueueDetailList( req, res ) {
       },
     ];
 
-    const auditDetails = await AuditFilesModel.aggregate( query );
-    const auditCount = await audit.aggregate( auditFiles );
-    const draftedCount = await audit.aggregate( draftedFiles );
-    const CompletedCount = await audit.aggregate( completedFiles );
+    const auditDetails = await aggregateAuditClientData( query );
+    const auditCount = await aggregateUserAudit( auditFiles );
+    const draftedCount = await aggregateUserAudit( draftedFiles );
+    const CompletedCount = await aggregateStoreAudit( completedFiles );
 
-    const clientAssignresult = await auditUserAssignModel.aggregate( clientAssign );
+    const clientAssignresult = await aggregateAssignAudit( clientAssign );
 
-    const userAsignCount = await auditUserAssignModel.aggregate( userAsign );
+    const userAsignCount = await aggregateAssignAudit( userAsign );
     const mergeAll = _.merge( _.keyBy( clientDetails, 'clientId' ), _.keyBy( auditCount, 'clientId' ), _.keyBy( draftedCount, 'clientId' ), _.keyBy( clientAssignresult, 'clientId' ) );
     const finalResult = _.values( mergeAll );
     const merge = _.values( _.merge( _.keyBy( finalResult, 'clientId' ), _.keyBy( auditDetails, 'clientId' ), _.keyBy( userAsignCount, 'clientId' ), _.keyBy( CompletedCount, 'clientId' ) ) );
@@ -705,13 +709,13 @@ export async function getQueueDetailList( req, res ) {
       const pending = await listQueue( merge[i].queueName );
       if ( !pending.statusCode ) {
         temp.push( {
-          client_id: merge[i].clientId,
-          client_name: merge[i].clientName,
+          clientId: merge[i].clientId,
+          clientName: merge[i].clientName,
           completedCount: merge[i].completedCount ? Number( merge[i].completedCount ) : 0,
           pendingByQueue: Number( pending ),
           pendingByUser: ( merge[i].pendingCount >= 0 ) ? Number( merge[i].pendingCount )+( merge[i].ClientAsignedCount ? Number( merge[i].ClientAsignedCount ) : 0 ) : 0,
           totalCount: merge[i].totalFilesCount,
-          queue_name: merge[i].queueName,
+          queueName: merge[i].queueName,
           isDraft: merge[i].isDrafted ? merge[i].isDrafted : false,
           isEnable: Number( pending ) > 0 || merge[i].isDrafted || ( merge[i].asignedCount && merge[i].asignedCount > 0 ) || ( merge[i].inprogressCount && merge[i].inprogressCount > 0 ) ? true : false,
           completedRatio: merge[i].totalFilesCount ? merge[i].completedCount ? Math.round( ( Number( merge[i].completedCount ) / Number( merge[i].totalFilesCount ) ) * 100 ) : 0 : 0,
@@ -721,7 +725,7 @@ export async function getQueueDetailList( req, res ) {
       }
     }
 
-    if ( inputData.export == 'true' ) {
+    if ( inputData.isExport ) {
       const exportdata = [];
       temp.forEach( ( element ) => {
         exportdata.push( {
@@ -741,7 +745,9 @@ export async function getQueueDetailList( req, res ) {
       return res.sendSuccess( { result: temp, count: count.length, totalStores: totalStores } );
     }
   } catch ( error ) {
-    return res.sendError( error );
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.query, function: 'workSpace' } );
+    return res.sendError( err, 500 );
   }
 }
 

package/src/controllers/auditMetrics.controllers.js

@@ -1,5 +1,7 @@
 import { download, getUTC, logger } from 'tango-app-api-middleware';
 import { aggregateAuditClientData } from '../service/auditClientData.service.js';
+import { aggregateUserAudit } from '../service/userAudit.service.js';
+import mongoose from 'mongoose';
 // import { listQueue } from 'tango-app-api-middleware/src/utils/aws/sqs.js';
 
 
@@ -15,13 +17,98 @@ export async function getAuditImageList( req, res ) {
 }
 
 export async function userAuditHistory( req, res ) {
-  // try {
-  //   const inputData = req.body;
-  //   return res.sendSuccess( { result: inputData } );
-  // } catch ( error ) {
-  //   logger.info( { error: error, message: req.body, function: 'userAuditHistory' } );
-  //   return res.sendError( error );
-  // }
+  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: new mongoose.Types.ObjectId( userId ) } },
+
+    ];
+    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 } },
+      );
+    }
+
+    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( {
+      $project: {
+        storeId: 1,
+        storeName: '$storeId',
+        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 );
+    }
+
+    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: 'userAuditHistory' } );
+    return res.sendError( err, 500 );
+  }
 }
 
 export async function storeMetrics( req, res ) {
@@ -347,7 +434,7 @@ export async function clientMetrics( req, res ) {
         },
       },
     ];
-    if ( inputData.searchValue ) {
+    if ( inputData.searchValue && inputData.searchValue!== '' ) {
       query.push( {
         $match: {
           $or: [

package/src/docs/audit.docs.js

@@ -1,4 +1,4 @@
-import { getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema } from '../dtos/audit.dtos.js';
+import { getDraftedDataSchema, getFileSchema, saveDraftSchema, saveSchema, workSpaceSchema } from '../dtos/audit.dtos.js';
 import j2s from 'joi-to-swagger';
 
 export const auditDocs = {
@@ -108,4 +108,45 @@ export const auditDocs = {
       },
     },
   },
+  '/v3/audit/work-space': {
+    get: {
+      tags: [ 'Audit' ],
+      description: 'queue wise info of audit files ',
+      operationId: 'work-space',
+      parameters: [
+        {
+          in: 'query',
+          name: 'searchValue',
+          scema: j2s( workSpaceSchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'offset',
+          scema: j2s( workSpaceSchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'limit',
+          scema: j2s( workSpaceSchema ).swagger,
+          require: false,
+        },
+        {
+          in: 'query',
+          name: 'isExport',
+          scema: j2s( workSpaceSchema ).swagger,
+          require: false,
+        },
+      ],
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
 };

package/src/docs/auditMetrics.docs.js

@@ -1,5 +1,5 @@
 import j2s from 'joi-to-swagger';
-import { clientMetricsSchema, getAuditImagesSchema } from '../dtos/auditMetrics.dtos.js';
+import { clientMetricsSchema, getAuditImagesSchema, userAuditHistorySchema } from '../dtos/auditMetrics.dtos.js';
 
 export const auditMetricsDocs = {
 
@@ -47,4 +47,26 @@ export const auditMetricsDocs = {
       },
     },
   },
+  '/v3/audit-metrics/user-audit-history': {
+    post: {
+      tags: [ 'Audit Metrics' ],
+      description: `Get list of user wise audit user details with date range`,
+      operationId: 'user-audit-history',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( userAuditHistorySchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
 };

package/src/dtos/audit.dtos.js

@@ -4,7 +4,7 @@ import joi from 'joi';
 export const getFileSchema = joi.object(
     {
       queueName: joi.string().required(),
-      nextId: joi.string().optional(),
+      nextId: joi.string().optional().allow( '' ),
       limit: joi.number().optional(),
     },
 );
@@ -15,7 +15,7 @@ export const getFileValid = {
 
 export const saveDraftSchema = joi.object(
     {
-      userCommands: joi.string().optional(),
+      userCommands: joi.string().optional().allow( '' ),
       storeId: joi.string().required(),
       auditId: joi.string().required(),
       auditType: joi.string().required(),
@@ -60,15 +60,15 @@ export const saveValid = {
   body: saveSchema,
 };
 
-export const getQueueDetailListSchema = joi.object(
+export const workSpaceSchema = joi.object(
     {
-      searchValue: joi.string().optional(),
+      searchValue: joi.string().optional().allow( '' ),
       offset: joi.string().optional(),
       limit: joi.number().optional(),
-      export: joi.number().optional(),
+      isExport: joi.boolean().optional(),
     },
 );
 
-export const getQueueDetailListValid = {
-  query: getQueueDetailListSchema,
+export const workSpaceValid = {
+  query: workSpaceSchema,
 };

package/src/dtos/auditMetrics.dtos.js

@@ -15,12 +15,20 @@ export const getAuditImagesValid = {
 
 export const userAuditHistorySchema = joi.object(
     {
-      fromDate: joi.string().required(), // need to clarify  about keys  --userId
+      userId: joi.string().optional(),
+      fromDate: joi.string().required(),
       toDate: joi.string().required(),
-      storeId: joi.string().required(),
-      fileDate: joi.string().required(),
       fileType: joi.string().required(),
-      storeId: joi.string().required(),
+      filterByStoreId: joi.array().required(),
+      filterByType: 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(),
+
     },
 );
 
@@ -45,7 +53,7 @@ export const clientMetricsSchema = joi.object(
     {
       fromDate: joi.string().required(),
       toDate: joi.string().required(),
-      searchValue: joi.string().optional(),
+      searchValue: joi.string().optional().allow( '' ),
       filterByClient: joi.array().required(),
       filterByStatus: joi.array().optional(),
       sortColumnName: joi.string().optional(),

package/src/routes/audit.routes.js

@@ -1,8 +1,8 @@
 import express from 'express';
 import { isExistsQueue, validateUserAudit } from '../validation/audit.validation.js';
 import { isAllowedSessionHandler, validate } from 'tango-app-api-middleware';
-import { getAuditFile, getDraftedData, getQueueDetailList, save, saveDraft } from '../controllers/audit.controllers.js';
-import { getDraftedDataValid, getFileValid, getQueueDetailListValid, saveDraftValid, saveValid } from '../dtos/audit.dtos.js';
+import { getAuditFile, getDraftedData, save, saveDraft, workSpace } from '../controllers/audit.controllers.js';
+import { getDraftedDataValid, getFileValid, saveDraftValid, saveValid, workSpaceValid } from '../dtos/audit.dtos.js';
 
 export const auditRouter = express.Router();
 
@@ -10,6 +10,6 @@ auditRouter.get( '/get-file', isAllowedSessionHandler, validate( getFileValid ),
 auditRouter.post( '/save-draft', isAllowedSessionHandler, validate( saveDraftValid ), saveDraft );
 auditRouter.get( '/get-drafted-data', isAllowedSessionHandler, validate( getDraftedDataValid ), getDraftedData );
 auditRouter.post( '/save', isAllowedSessionHandler, validate( saveValid ), validateUserAudit, save );
-auditRouter.get( '/get-queue-detail-list', isAllowedSessionHandler, validate( getQueueDetailListValid ), getQueueDetailList );
+auditRouter.get( '/work-space', isAllowedSessionHandler, validate( workSpaceValid ), workSpace );
 
 export default auditRouter;

package/src/service/storeAudit.service.js

@@ -7,3 +7,7 @@ export function updateOneStoreAudit( query, record ) {
 export function createStoreAudit( record ) {
   return storeAuditModel.create( record );
 }
+
+export function aggregateStoreAudit( query ) {
+  return storeAuditModel.aggregate( query, { collation: { locale: 'en', strength: 2 } } );
+}