tango-app-api-audit 3.3.0-alpha.1 → 3.3.0-alpha.10

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-alpha.1",
+    "version": "3.3.0-alpha.10",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -24,8 +24,8 @@
         "mongodb": "^6.7.0",
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
-        "tango-api-schema": "^2.0.152",
-        "tango-app-api-middleware": "^3.1.30",
+        "tango-api-schema": "^2.0.154",
+        "tango-app-api-middleware": "^3.3.0-alpha.0",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/audit.controllers.js

@@ -42,16 +42,19 @@ import {
 } from '../service/auditLog.service.js';
 import { aggregateStore, countDocumentsStore, findOneStore } from '../service/store.service.js';
 import {
+  getAuditFilterData,
+  getAuditImageData,
   mapCustomer,
   mapEmployee,
   mapJunk,
   splitB20000,
   splitE0,
   splitG20000,
+  zipDownloadImage,
 } from '../validation/audit.validation.js';
 import mongoose from 'mongoose';
 import {
-  aggregateAuditStoreDataSchema,
+  aggregateAuditStoreData,
   findOneStoreData,
 } from '../service/auditStoreData.service.js';
 
@@ -334,7 +337,7 @@ export async function getAuditFile( req, res ) {
             logType: 'audit',
             logSubType: 'auditStart',
             logData: {
-              file_date: userDetails[0].fileDate,
+              fileDate: userDetails[0].fileDate,
               auditType: userDetails[0].auditType,
               storeId: userDetails[0].storeId,
               clientName: log.queueName,
@@ -342,9 +345,10 @@ export async function getAuditFile( req, res ) {
               moduleType: userDetails[0].moduleType,
               zoneName: userDetails[0].zoneName,
             },
+            createdAt: new Date(),
           };
           logger.info( { logData: logData } );
-          await insertOpenSearchData( openSearch.activityLog, logData );
+          await insertOpenSearchData( openSearch.auditLog, logData );
         }
         const storeQuery = {
           storeId: userDetails[0].storeId,
@@ -443,8 +447,9 @@ export async function getAuditFile( req, res ) {
             zoneName: msg.zone_id,
             moduleType: inputData.moduleType,
           },
+          createdAt: new Date(),
         };
-        await insertOpenSearchData( openSearch.activityLog, logData );
+        await insertOpenSearchData( openSearch.auditLog, logData );
       }
 
       const storeQuery = {
@@ -595,8 +600,9 @@ export async function getAuditFile( req, res ) {
           zoneName: msg.zone_id,
           moduleType: inputData.moduleType,
         },
+        createdAt: new Date(),
       };
-      await insertOpenSearchData( openSearch.activityLog, logData );
+      await insertOpenSearchData( openSearch.auditLog, logData );
     }
     logger.info( { storeInfo: storeInfo } );
     return res.sendSuccess( {
@@ -632,7 +638,7 @@ export async function getFilterData( msg ) {
   try {
     const bucket = JSON.parse( process.env.BUCKET );
     const params = {
-      Bucket: `${bucket.auditOutput}`,
+      Bucket: `${bucket.auditUploadBucket}`,
       Key: `${msg.store_id}/${msg.zone_id}/${msg.curr_date}/${bucket.masterJsonFile}`,
     };
     const mappingFile = await getJsonFileData( params );
@@ -711,8 +717,6 @@ export async function getAuditImage( msg ) {
 
 export const getReauditImg = async ( filter, image ) => {
   const chunkedMappingData = await chunkArray( image, 10 );
-  logger.info( { chunkedMappingData: chunkedMappingData, level: 5 } );
-
   const promises = chunkedMappingData.map( async ( chunk ) => {
     return mapFunction( chunk, filter );
   } );
@@ -1008,7 +1012,7 @@ export async function workSpace( req, res ) {
     const userAsignAuditCount = await aggregateAssignAudit( userAsignAudit );
     const completedStoresCount = await aggregateStoreAudit( completedStores );
     const clientAssignedCount = await aggregateAssignAudit( clientAssign );
-    const auditStoreData = await aggregateAuditStoreDataSchema(
+    const auditStoreData = await aggregateAuditStoreData(
         auditStoreDataQuery,
     );
 
@@ -1157,6 +1161,7 @@ export async function saveDraft( req, res ) {
         logType: 'audit',
         logSubType: 'auditDraft',
         logData: {
+          fileDate: inputData.fileDate,
           auditType: inputData.auditType,
           storeId: inputData.storeId,
           clientName: inputData.queueName,
@@ -1166,8 +1171,9 @@ export async function saveDraft( req, res ) {
           moduleType: inputData.moduleType,
           zoneName: inputData.zoneName,
         },
+        createdAt: new Date(),
       };
-      await insertOpenSearchData( openSearch.activityLog, logData );
+      await insertOpenSearchData( openSearch.auditLog, logData );
     }
     await createAuditLog( inputData );
     await updateOneUserAudit( userQuery, userRecord );
@@ -1195,8 +1201,8 @@ export async function getDraftedData( req, res ) {
     };
     const result = await findOneAuditLog( query, {}, { createdAt: -1 }, 1 );
 
-    if ( result.length == 0 ) {
-      return res.sendError( 'No Data Found', 500 );
+    if ( !result ) {
+      return res.sendError( 'No Data Found', 204 );
     }
     return res.sendSuccess( { result: result } );
   } catch ( error ) {
@@ -1632,9 +1638,9 @@ export async function userAuditHistory( req, res ) {
         chunk.forEach( ( element ) => {
           exportData.push( {
 
-            'Client Id': element.clientId,
+            'Client ID': element.clientId,
             'Client Name': element.clientName,
-            'Store Id': element.storeId,
+            'Store ID': element.storeId,
             'Store Name': element.storeName,
             'Zone Name': element.zoneName,
             'Audit Type': element.auditType,
@@ -1851,7 +1857,7 @@ export async function clientMetrics( req, res ) {
       );
     }
 
-    const count = await aggregateAuditStoreDataSchema( query );
+    const count = await aggregateAuditStoreData( query );
     if ( count.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -1883,7 +1889,7 @@ export async function clientMetrics( req, res ) {
     }
 
     logger.info( { query: query } );
-    const result = await aggregateAuditStoreDataSchema( query );
+    const result = await aggregateAuditStoreData( query );
     if ( result.length == 0 ) {
       return res.sendError( 'No Data Found', 204 );
     }
@@ -2145,7 +2151,7 @@ export async function storeMetrics( req, res ) {
       result.forEach( ( element ) => {
         exportdata.push( {
           'File Date': element.fileDate,
-          'Store Id': element.storeId,
+          'Store ID': element.storeId,
           'Store Name': element.storeName,
           'Client Id': element.clientId,
           'Client Name': element.clientName,
@@ -2435,7 +2441,7 @@ export async function userMetrics( req, res ) {
   }
 }
 
-export async function overViewTable( req, res ) {
+export async function pendingSummaryTable( req, res ) {
   try {
     const inputData = req.body;
     const limit = inputData.limit || 10;
@@ -2474,7 +2480,13 @@ export async function overViewTable( req, res ) {
           fileDate: 1,
           moduleType: 1,
           beforeCount: 1,
-          startTime: 1,
+          startTime: { $dateToString: {
+            format: '%Y-%m-%d %H:%M:%S',
+            date: '$startTime',
+            timezone: 'Asia/Kolkata',
+          },
+
+          },
           auditType: 1,
           auditStatus: 1,
           userId: 1,
@@ -2515,6 +2527,7 @@ export async function overViewTable( req, res ) {
           moduleType: 1,
           beforeCount: 1,
           startTime: 1,
+          endTime: 1,
           auditType: 1,
           auditStatus: 1,
           userName: '$user.userName',
@@ -2566,7 +2579,7 @@ export async function overViewTable( req, res ) {
       const exportdata = [];
       result.forEach( ( element ) => {
         exportdata.push( {
-          'Store Id': element.storeId,
+          'Store ID': element.storeId,
           'zoneName': element.zoneName,
           'File Date': element.fileDate,
           'Module Type': element.moduleType,
@@ -2584,7 +2597,7 @@ export async function overViewTable( req, res ) {
     return res.sendSuccess( { result: result, count: count.length } );
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
-    logger.error( { error: error, message: req.body, function: 'summarySplit' } );
+    logger.error( { error: error, message: req.body, function: 'pendingSummaryTable' } );
     return res.sendError( err, 500 );
   }
 }
@@ -2638,7 +2651,7 @@ export async function overAllAuditSummary( req, res ) {
         },
       },
     ];
-    const auditClientData = await aggregateAuditStoreDataSchema( auditClientDataQuery );
+    const auditClientData = await aggregateAuditStoreData( auditClientDataQuery );
     if ( auditClientData.length >0 ) {
       temp.auditStores = auditClientData[0].totalFilesCount;
     }
@@ -2786,8 +2799,9 @@ export async function reTrigger( req, res ) {
               triggerId: req.user._id,
               triggerType: inputData.triggerType,
             },
+            createdAt: new Date(),
           };
-          await insertOpenSearchData( openSearch.activityLog, logData );
+          await insertOpenSearchData( openSearch.auditLog, logData );
         }
         break;
       case 'user':
@@ -2800,7 +2814,7 @@ export async function reTrigger( req, res ) {
           moduleType: inputData.moduleType,
           fileDateISO: dayjs( new Date( ( inputData.fileDate ).split( '-' ).reverse().join( '-' ) ) ).format(),
           auditType: inputData.auditType,
-          fileCount: inputData.beforeCount,
+          fileCount: inputData.totalCount,
           queueName: queueName,
           userId: inputData.userId,
           userName: assignUser.userName,
@@ -2846,8 +2860,9 @@ export async function reTrigger( req, res ) {
             triggerId: req.user._id,
             triggerType: inputData.triggerType,
           },
+          createdAt: new Date(),
         };
-        await insertOpenSearchData( openSearch.activityLog, logData );
+        await insertOpenSearchData( openSearch.auditLog, logData );
     }
 
     return res.sendSuccess( { result: 'The File has been Re Trigger Succesfully' } );
@@ -2867,6 +2882,7 @@ export async function overViewCard( req, res ) {
       ReAuditFileCount: 0,
       inprogressCount: 0,
       completedCount: 0,
+      pendingCount: 0,
     };
 
     const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
@@ -2927,6 +2943,7 @@ export async function overViewCard( req, res ) {
           ReAuditFileCount: 1,
           inprogressCount: 1,
           completedCount: 1,
+          notAssigned: { $subtract: [ '$totalCount', { $add: [ '$inprogressCount', '$completedCount' ] } ] },
         },
       },
     ];
@@ -2944,14 +2961,13 @@ export async function summarySplit( req, res ) {
   try {
     const inputData = req.body;
     const temp = {
-      totalInprogress: 0,
+      total: 0,
       auditInprogress: 0,
       reAuditInprogress: 0,
       draft: 0,
       assigned: 0,
       auditCompleted: 0,
       reAuditCompleted: 0,
-      completedCount: 0,
     };
 
     const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
@@ -2962,6 +2978,9 @@ export async function summarySplit( req, res ) {
     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: {
@@ -2991,11 +3010,7 @@ export async function summarySplit( req, res ) {
               { $ne: [ '$status', 'assigned' ] }, 1, 0,
             ],
           },
-          completedCount: {
-            $cond: [
-              { $eq: [ '$status', 'completed' ] }, 1, 0,
-            ],
-          },
+
           reAuditCompleted: {
             $cond: [
               { $and: [ { $eq: [ '$auditType', 'ReAudit' ] }, { $eq: [ '$status', 'completed' ] } ] }, 1, 0,
@@ -3011,15 +3026,12 @@ export async function summarySplit( req, res ) {
       {
         $group: {
           _id: { fileDate: '$fileDate', clientId: '$clientId' },
-          totalInprogress: { $sum: 1 },
           auditInprogress: { $sum: '$auditInprogress' },
           reAuditInprogress: { $sum: '$reAuditInprogress' },
           draft: { $sum: '$draft' },
           assigned: { $sum: 'assigned' },
-          completedCount: { $sum: '$completedCount' },
           reAuditCompleted: { $sum: '$reAuditCompleted' },
           auditCompleted: { $sum: '$auditCompleted' },
-          completedCount: { $sum: '$completedCount' },
 
         },
       },
@@ -3031,14 +3043,36 @@ export async function summarySplit( req, res ) {
           reAuditInprogress: 1,
           draft: 1,
           assigned: 1,
-          completedCount: 1,
           reAuditCompleted: 1,
           auditCompleted: 1,
+          totalCount: { $ifNull: [ 0, 0 ] },
+
+        },
+      },
+    ];
+    const totalQuery = [
+      {
+        $match: {
+          $and: filters,
+        },
 
+      },
+      {
+        $group: {
+          _id: null,
+          total: { $sum: 1 },
+        },
+      },
+      {
+        $project: {
+          _id: 0,
+          total: 1,
         },
       },
     ];
     const result = await aggregateStoreAudit( query );
+    const totalCount = await aggregateAuditStoreData( totalQuery );
+    result[0].totalCount = totalCount[0]?.total? totalCount[0].total : delete result[0].totalCount;
     logger.info( { result: result } );
     return res.sendSuccess( { result: result.length> 0? result[0]: temp } );
   } catch ( error ) {
@@ -3047,3 +3081,241 @@ export async function summarySplit( req, res ) {
     return res.sendError( err, 500 );
   }
 }
+
+export async function overviewTable( req, res ) {
+  try {
+    const inputData = req.body;
+    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 filters =[
+      { fileDateISO: { $gte: dateRange.start } },
+      { fileDateISO: { $lte: dateRange.end } },
+
+    ];
+
+    if ( inputData.clientId.length > 0 ) {
+      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 } } );
+    }
+
+    if ( inputData.filterByStatus.length > 0 ) {
+      filters.push( { status: { $in: inputData.filterByStatus } } );
+    }
+
+    const query =[
+      {
+        $match: {
+          $and: filters,
+        },
+
+      },
+      {
+        $project: {
+          _id: 0,
+          storeId: 1,
+          clientId: 1,
+          zoneName: 1,
+          fileDate: 1,
+          moduleType: 1,
+          beforeCount: 1,
+          afterCount: 1,
+          auditType: 1,
+          status: 1,
+          // userId: 1,
+        },
+      },
+      // {
+      //   $lookup: {
+      //     from: 'users',
+      //     let: { userId: '$userId' },
+      //     pipeline: [
+      //       {
+      //         $match: {
+      //           $expr: {
+      //             $eq: [ '$_id', '$$userId' ],
+      //           },
+      //         },
+      //       },
+      //       {
+      //         $project: {
+      //           userName: 1,
+      //           userEmail: '$email',
+      //         },
+      //       },
+      //     ], as: 'user',
+      //   },
+      // },
+      // {
+      //   $unwind: {
+      //     path: '$user',
+      //     preserveNullAndEmptyArrays: true,
+      //   },
+      // },
+      {
+        $project: {
+          storeId: 1,
+          clientId: 1,
+          zoneName: 1,
+          fileDate: 1,
+          moduleType: 1,
+          beforeCount: 1,
+          afterCount: 1,
+          auditType: 1,
+          status: 1,
+          // userName: '$user.userName',
+          // userEmail: '$user.userEmail',
+
+        },
+      },
+    ];
+    if ( inputData.searchValue && inputData.searchValue!== '' ) {
+      query.push( {
+        $match: {
+          $or: [
+            { storeId: { $regex: inputData.searchValue, $options: 'i' } },
+            { clientId: { $regex: inputData.searchValue, $options: 'i' } },
+            { fileDate: { $regex: inputData.searchValue, $options: 'i' } },
+            { auditType: { $regex: inputData.searchValue, $options: 'i' } },
+            { status: { $regex: inputData.searchValue, $options: 'i' } },
+            { moduleType: { $regex: inputData.searchValue, $options: 'i' } },
+            { zoneName: { $regex: inputData.searchValue, $options: 'i' } },
+            // { userName: { $regex: inputData.searchValue, $options: 'i' } },
+            // { userEmail: { $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 ) {
+      return res.sendError( 'No Data Found', 204 );
+    }
+
+    if ( inputData.isExport ) {
+      query.push( { $limit: 10000 } );
+    } else {
+      query.push( {
+        $skip: offset,
+      },
+      {
+        $limit: limit,
+      } );
+    }
+
+    const result = await aggregateStoreAudit( query );
+    if ( inputData.isExport ) {
+      const exportdata = [];
+      result.forEach( ( element ) => {
+        exportdata.push( {
+          'Store ID': element.storeId,
+          'Client ID': element.clientId,
+          'zoneName': element.zoneName,
+          'File Date': element.fileDate,
+          'Module Type': element.moduleType,
+          'Audit Type': element.auditType,
+          'Before Count': element.beforeCount,
+          'After Count': element.afterCount,
+          'Start Time': element.startTime,
+          'End Time': element.endTime,
+          // 'User Name': element.userName,
+          // 'User Email': element.userEmail,
+          'Status': element.auditStatus,
+        } );
+      } );
+      await download( exportdata, res );
+      return;
+    }
+    return res.sendSuccess( { result: result, count: count.length } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.error( { error: error, message: req.body, function: 'overviewTable' } );
+    return res.sendError( err, 500 );
+  }
+}
+
+
+export async function auditImages( req, res ) {
+  try {
+    const inputData = req.query;
+    let auditImageDownload = '';
+    switch ( inputData.imageType ) {
+      case 'BC':
+        const auditImageBC = await getAuditImageData( inputData );
+        if ( auditImageBC?.errorCode ) {
+          const error = auditImageBC?.error || 'Internal Server Error- get BC from Bucket';
+          const code = auditImageBC?.errorCode;
+          return res.sendError( { error: error }, code );
+        }
+        if ( auditImageBC?.length == 0 ) {
+          return res.sendError( 'No Data Found', 204 );
+        }
+
+        if ( inputData.export==true ) {
+          auditImageDownload= await zipDownloadImage( auditImageBC );
+          // Set response headers for the zip file
+          res.set( 'Content-Type', 'application/zip' );
+          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.imageType}.zip` );
+
+          // Send the zip file as the API response
+          return res.send( auditImageDownload );
+        }
+        res.sendSuccess( { result: auditImageBC } );
+
+        break;
+
+      case 'AC':
+
+        const [ filterData, auditImageAC ] = await Promise.all( [ getAuditFilterData( inputData ), getAuditImageData( inputData ) ] );
+
+        if ( filterData?.errorCode || auditImageAC?.errorCode ) {
+          const error = ( filterData?.error || auditImageAC.error ) || 'Internal Server Error- get AC from Bucket';
+          const code = filterData?.errorCode || auditImageAC.errorCode;
+          return res.sendError( { error: error }, code );
+        }
+
+        const reauditImg = await getReauditImg( filterData, auditImageAC );
+        logger.info( { reauditImg: reauditImg } );
+        if ( reauditImg?.length == 0 ) {
+          return res.sendError( 'No Data Found', 204 );
+        }
+
+        logger.info( { auditImageAC: auditImageAC, filterData: filterData, reauditImg: reauditImg } );
+        if ( inputData.export==true ) {
+          auditImageDownload= await zipDownloadImage( reauditImg );
+          // Set response headers for the zip file
+          res.set( 'Content-Type', 'application/zip' );
+          res.set( 'Content-Disposition', `attachment; filename=${inputData.storeId}_${inputData.fileDate}_${inputData.imageType}.zip` );
+
+          // Send the zip file as the API response
+          return res.send( auditImageDownload );
+        }
+        res.sendSuccess( { result: reauditImg } );
+        break;
+      default:
+        res.sendError( 'No Data Found', 204 );
+        break;
+    }
+
+
+  //  return res.sendSuccess( { result: inputData } );
+  } catch ( error ) {
+    const err = error.message || 'Internal Server Error';
+    logger.info( { error: error, message: req.body, function: 'beforeCountImages' } );
+    return res.sendError( err, 500 );
+  }
+}

package/src/docs/audit.docs.js

@@ -1,4 +1,4 @@
-import { auditStoreSchema, clientMetricsSchema, clientSchema, getDraftedDataSchema, getFileSchema, overAllAuditSummarySchema, overViewCardSchema, overViewTableSchema, reTriggerValidSchema, saveDraftSchema, saveSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema, userSchema, workSpaceSchema, auditImageValidSchema } from '../dtos/audit.dtos.js';
+import { auditStoreSchema, clientMetricsSchema, clientSchema, getDraftedDataSchema, getFileSchema, overAllAuditSummarySchema, overViewCardSchema, reTriggerValidSchema, saveDraftSchema, saveSchema, storeMetricsSchema, summarySplitSchema, userAuditHistorySchema, userMetricsSchema, userSchema, workSpaceSchema, auditImageValidSchema, pendingSummaryTableSchema, overviewTableSchema } from '../dtos/audit.dtos.js';
 import j2s from 'joi-to-swagger';
 
 export const auditDocs = {
@@ -170,6 +170,24 @@ export const auditDocs = {
           in: 'query',
           name: 'storeId',
           scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'moduleType',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'zoneName',
+          scema: j2s( getDraftedDataSchema ).swagger,
+          require: true,
+        },
+        {
+          in: 'query',
+          name: 'userId',
+          scema: j2s( getDraftedDataSchema ).swagger,
           require: false,
         },
       ],
@@ -353,6 +371,29 @@ export const auditDocs = {
       },
     },
   },
+  '/v3/audit/metrics/pending-summary-table': {
+    post: {
+      tags: [ 'Audit Metrics' ],
+      description: `Get overall user taken data with some filters `,
+      operationId: 'metrics/pending-summary-table',
+      parameters: {},
+      requestBody: {
+        content: {
+          'application/json': {
+            schema: j2s( pendingSummaryTableSchema ).swagger,
+          },
+        },
+      },
+      responses: {
+        200: { description: 'Successful' },
+        401: { description: 'Unauthorized User' },
+        422: { description: 'Field Error' },
+        500: { description: 'Server Error' },
+        204: { description: 'Not Found' },
+      },
+    },
+  },
+
   '/v3/audit/metrics/overview-table': {
     post: {
       tags: [ 'Audit Metrics' ],
@@ -362,7 +403,7 @@ export const auditDocs = {
       requestBody: {
         content: {
           'application/json': {
-            schema: j2s( overViewTableSchema ).swagger,
+            schema: j2s( overviewTableSchema ).swagger,
           },
         },
       },