tango-app-api-audit 3.6.44 → 3.6.46

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -1395,6 +1395,16 @@ export async function userAuditedData( req, res ) {
   }
 }
 
+function getISTDate( dateString ) {
+  // If input is already a Date object, clone it
+  let dateObj = typeof dateString === 'string' ? new Date( dateString ) : new Date( dateString.getTime() );
+  // Get UTC time in milliseconds
+  const utc = dateObj.getTime() + ( dateObj.getTimezoneOffset() * 60000 );
+  // IST offset is +5:30, which is 19800000 ms
+  return new Date( utc + ( 5.5 * 60 * 60 * 1000 ) );
+  // set at first to eod
+}
+
 export async function summaryList( req, res ) {
   try {
     // declare inputData and get request body
@@ -1418,12 +1428,33 @@ export async function summaryList( req, res ) {
     // declare filter and assign range values from inputData
     let filter;
     if ( inputData?.dateType === 'auditedDate' ) {
+      // Ensure toDate includes end of day in the filter (23:59:59.999)
+
+      // Helper to create IST Date object from input date string
+
+      let fromDate = new Date( inputData?.fromDate );
+      let toDate = new Date( inputData?.toDate );
+
+
+      // Set to 23:59:59.999 for EOD
+      toDate.setHours( 23, 59, 59, 999 );
+
+
+      // Set to 23:59:59.999 for EOD
+      fromDate.setHours( 0, 0, 0, 0 );
+
+
+      // If toDate is set to midnight (i.e., no time) OR is an ISO string at 00:00:00, set to end of day
+      const fromDateIST = getISTDate( fromDate );
+      const toDateIST = getISTDate( toDate );
+
+
       filter= [
         {
           'range': {
             'updatedAt': {
-              'gte': new Date( inputData.fromDate ),
-              'lte': new Date( inputData.toDate ),
+              'gte': new Date( fromDateIST ),
+              'lte': new Date( toDateIST ),
             },
           },
         },
@@ -1997,6 +2028,7 @@ export async function summaryList( req, res ) {
     };
 
     const result = await getOpenSearchData( openSearch.EyeTestInput, searchQuery );
+    logger.info( { result, message: '.......result' } );
     const getCount = inputData.isExport==true? null:await getOpenSearchCount( openSearch.EyeTestInput, countQuery );
     const count =inputData.isExport==true?null: getCount?.body?.count;
     const searchValue = result?.body?.hits?.hits;
@@ -2355,15 +2387,9 @@ export async function summaryCard( req, res ) {
     const inputData = req.body;
     const openSearch = JSON.parse( process.env.OPENSEARCH );
 
+
     let filter =[
-      {
-        'range': {
-          'date': {
-            'gte': new Date( inputData.fromDate ),
-            'lte': new Date( inputData.toDate ),
-          },
-        },
-      },
+
       {
         term: {
           'type.keyword': inputData?.type,
@@ -2375,6 +2401,50 @@ export async function summaryCard( req, res ) {
         },
       },
     ];
+
+    if ( inputData?.dateType === 'auditedDate' ) {
+      let fromDate = new Date( inputData?.fromDate );
+      let toDate = new Date( inputData?.toDate );
+
+
+      // Set to 23:59:59.999 for EOD
+      toDate.setHours( 23, 59, 59, 999 );
+
+
+      // Set to 23:59:59.999 for EOD
+      fromDate.setHours( 0, 0, 0, 0 );
+
+
+      // If toDate is set to midnight (i.e., no time) OR is an ISO string at 00:00:00, set to end of day
+      const fromDateIST = getISTDate( fromDate );
+      const toDateIST = getISTDate( toDate );
+
+
+      filter.push(
+          {
+            'range': {
+              'updatedAt': {
+                'gte': new Date( fromDateIST ),
+                'lte': new Date( toDateIST ),
+              },
+            },
+          },
+
+      );
+    } else {
+      filter.push(
+          {
+            'range': {
+              'date': {
+                'gte': new Date( inputData.fromDate ),
+                'lte': new Date( inputData.toDate ),
+              },
+            },
+          },
+
+      );
+    }
+
     if ( inputData?.demographics && inputData?.demographics?.length > 0 ) {
       filter.push( {
         terms: {
@@ -2615,6 +2685,7 @@ export async function summaryCard( req, res ) {
 
 
     const getOutput = await getOpenSearchData( openSearch?.EyeTestInput, getQuery );
+
     const initialValue = {
       totalFiles: 0,
       completedFiles: 0,

package/src/dtos/eyeTestAudit.dtos.js

@@ -176,7 +176,7 @@ export const summaryListValid = {
 
 
 export const summaryCardSchema = joi.object( {
-
+  dateType: joi.string().optional().valid( 'fileDate', 'auditedDate' ),
   fromDate: joi.string()
       .pattern( /^\d{4}-\d{2}-\d{2}$/, 'YYYY-MM-DD format' )
       .required()