tango-app-api-audit 3.3.0-alpha.24 → 3.3.0-alpha.25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.3.0-alpha.24",
+    "version": "3.3.0-alpha.25",
     "description": "audit & audit metrics apis",
     "main": "index.js",
     "type": "module",
@@ -25,7 +25,7 @@
         "nodemon": "^3.1.3",
         "swagger-ui-express": "^5.0.1",
         "tango-api-schema": "^2.0.159",
-        "tango-app-api-middleware": "^3.1.32",
+        "tango-app-api-middleware": "^3.1.33",
         "winston": "^3.13.0",
         "winston-daily-rotate-file": "^5.0.0"
     },

package/src/controllers/audit.controllers.js

@@ -3,11 +3,11 @@ import {
   download,
   fileUpload,
   getJsonFileData,
-  getUTC,
   insertOpenSearchData,
   listFileByPath,
   listFileWithoutLimit,
   signedUrl,
+  getDate, getDateWithCustomizeTime,
 } from 'tango-app-api-middleware';
 import {
   aggregateUserAudit,
@@ -194,7 +194,7 @@ export async function getAuditFile( req, res ) {
     const bucket = JSON.parse( process.env.BUCKET );
     const openSearch = JSON.parse( process.env.OPENSEARCH );
     const inputData = req.query;
-    const data = await getUTC( new Date(), new Date() );
+    const data = await getDate( new Date(), new Date() );
     const start = data.start;
     const end = data.end;
     const fetchData = {};
@@ -742,7 +742,7 @@ export async function workSpace( req, res ) {
     const offset = inputData.offset ?
       ( inputData.offset - 1 ) * limit :
       0;
-    const dateRange = await getUTC( new Date(), new Date() );
+    const dateRange = await getDate( new Date(), new Date() );
     const filter =[
       { status: { $in: [ 'active', 'hold' ] } },
       { 'auditConfigs.audit': { $eq: true } },
@@ -1442,8 +1442,8 @@ export async function userAuditHistory( req, res ) {
     const userId = inputData.userId? new mongoose.Types.ObjectId( 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 ) );
-
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
+    const dateRangeCreatedAt = await getDateWithCustomizeTime( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [
       { userId: { $eq: userId } },
     ];
@@ -1455,8 +1455,8 @@ export async function userAuditHistory( req, res ) {
       );
     } else {
       filter.push(
-          { createdAt: { $gte: dateRange.start } },
-          { createdAt: { $lte: dateRange.end } },
+          { createdAt: { $gte: dateRangeCreatedAt.start } },
+          { createdAt: { $lte: dateRangeCreatedAt.end } },
       );
     }
 
@@ -1697,7 +1697,7 @@ export async function clientMetrics( req, res ) {
     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 ) );
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
@@ -1922,7 +1922,7 @@ export async function storeMetrics( req, res ) {
     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 ) );
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
@@ -2208,12 +2208,13 @@ export async function userMetrics( req, res ) {
     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 ) );
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
+    const dateRangeUpdatedAt = await getDateWithCustomizeTime( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filter = [];
     if ( inputData.dateType == 'auditedDate' ) {
       filter.push(
-          { updatedAt: { $gte: dateRange.start } },
-          { updatedAt: { $lte: dateRange.end } },
+          { updatedAt: { $gte: dateRangeUpdatedAt.start } },
+          { updatedAt: { $lte: dateRangeUpdatedAt.end } },
 
       );
     } else {
@@ -2479,7 +2480,7 @@ export async function pendingSummaryTable( req, res ) {
     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 ) );
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
@@ -2671,7 +2672,7 @@ export async function overAllAuditSummary( req, res ) {
       reAuditCompleted: 0,
 
     };
-    const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
@@ -2936,7 +2937,7 @@ export async function overViewCard( req, res ) {
       pendingCount: 0,
     };
 
-    const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
@@ -3021,7 +3022,7 @@ export async function summarySplit( req, res ) {
       reAuditCompleted: 0,
     };
 
-    const dateRange = await getUTC( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },
@@ -3137,7 +3138,7 @@ export async function overviewTable( req, res ) {
     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 ) );
+    const dateRange = await getDate( new Date( inputData.fromDate ), new Date( inputData.toDate ) );
     let filters =[
       { fileDateISO: { $gte: dateRange.start } },
       { fileDateISO: { $lte: dateRange.end } },