tango-app-api-audit 3.6.45 → 3.6.47

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-audit",
-    "version": "3.6.45",
+    "version": "3.6.47",
     "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;
@@ -2133,7 +2165,7 @@ export async function summaryList( req, res ) {
           if ( element?._source?.type == 'physical' ) {
             exportData.push( {
               'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
-              'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs( element?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA',
+              'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs.utc( element?._source?.updatedAt ).add( 5, 'hour' ).add( 30, 'minute' ).format( 'D MMM, YYYY' ): 'NA',
               ...( req?.user?.role === 'superadmin' && { 'RM Name': RMName } ),
               ...( req?.user?.role !== 'user' && { 'Cluster Name': clusterName } ),
               'Store Name': element?._source?.storeName,
@@ -2159,7 +2191,7 @@ export async function summaryList( req, res ) {
           } else {
             exportData.push( {
               'Date': dayjs( element?._source?.date ).format( 'D MMM, YYYY' ),
-              'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs( element?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA',
+              'Audited Date': [ 'Re-Audited', 'Audited' ].includes( element?._source?.auditStatus )?dayjs.utc( element?._source?.updatedAt ).add( 5, 'hour' ).add( 30, 'minute' ).format( 'D MMM, YYYY' ): 'NA',
               ...( req?.user?.role === 'superadmin' && { 'RM Name': RMName } ),
               ...( req?.user?.role !== 'user' && { 'Cluster Name': clusterName } ),
               'Store Name': element?._source?.storeName,
@@ -2200,39 +2232,6 @@ export async function summaryList( req, res ) {
         let RMEmail = '';
         let clusterName='';
         if ( item?._source?.storeId&&item?._source?.storeId!='' ) {
-          // const rmListQuery =[
-          //   {
-          //     $match: {
-          //       $and: [
-          //         {
-          //           clientId: { $eq: inputData?.clientId },
-          //         },
-          //         {
-          //           configureType: { $eq: 'user' },
-          //         },
-          //       ],
-          //     },
-          //   },
-          //   {
-          //     $unwind: {
-          //       path: '$userList', preserveNullAndEmptyArrays: true,
-          //     },
-          //   },
-          //   {
-          //     $group: {
-          //       _id: null,
-          //       list: { $addToSet: '$userList.email' },
-          //     },
-          //   },
-          //   {
-          //     $project: {
-          //       _id: 0,
-          //       list: 1,
-          //     },
-          //   },
-          // ];
-          // const getRMList = await aggregateEyeTestConfig( rmListQuery );
-
           const getRMList = [
             {
               list: [ 'marellapudi.ajay@lenskart.com',
@@ -2326,18 +2325,28 @@ export async function summaryList( req, res ) {
         const testDuration = item?._source?.testDuration;
         const minutes = Math.floor( testDuration / 60 );
         const seconds = testDuration % 60;
-        temp[i].complianceScore = `${item?._source?.totalSteps>0 ? Math.round( ( item?._source?.coveredStepsAI/ item?._source?.totalSteps )*100 ): 0} %`;
-        temp[i].humanComplianceScore = [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus )?`${item?._source?.totalSteps>0 ? Math.round( ( item?._source?.auditedSteps/ item?._source?.totalSteps )*100 ): 0} %`:'NA';
+        temp[i].complianceScore = `${item?._source?.totalSteps > 0 ? Math.round( ( item?._source?.coveredStepsAI / item?._source?.totalSteps ) * 100 ) : 0} %`;
+        temp[i].humanComplianceScore = [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus ) ? `${item?._source?.totalSteps > 0 ? Math.round( ( item?._source?.auditedSteps / item?._source?.totalSteps ) * 100 ) : 0} %` : 'NA';
         temp[i].min = minutes;
         temp[i].sec = seconds;
         temp[i].auditedBy = userName?.userName || '';
         temp[i].date = dayjs( item?._source?.date ).format( 'D MMM, YYYY' );
-        temp[i].auditedDate = [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus )?dayjs( item?._source?.updatedAt ).format( 'D MMM, YYYY' ): 'NA';
+
+        // auditedDate date conversion from UTC to IST (Indian Standard Time)
+        if ( [ 'Re-Audited', 'Audited' ].includes( item?._source?.auditStatus ) ) {
+          const auditedDate = item?._source?.updatedAt;
+          // Convert auditedDate from UTC to IST
+          const auditedDateIST = dayjs.utc( auditedDate ).add( 5, 'hour' ).add( 30, 'minute' ).format( 'D MMM, YYYY' );
+          temp[i].auditedDate = auditedDateIST;
+        } else {
+          temp[i].auditedDate = 'NA';
+        }
+
         temp[i].RMName = RMName;
-        temp[i].clusterName =clusterName;
-        temp[i].RMEmail =RMEmail;
+        temp[i].clusterName = clusterName;
+        temp[i].RMEmail = RMEmail;
         const trustScore = temp[i].trustScore;
-        temp[i].trustScore = ( trustScore == null || trustScore == undefined ) ? 'NA' :`${trustScore + ' %'}`;
+        temp[i].trustScore = ( trustScore == null || trustScore == undefined ) ? 'NA' : `${trustScore + ' %'}`;
         temp[i]._id = item?._id;
       }
     }
@@ -2371,12 +2380,29 @@ 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( inputData.fromDate ),
-                'lte': new Date( inputData.toDate ),
+                'gte': new Date( fromDateIST ),
+                'lte': new Date( toDateIST ),
               },
             },
           },
@@ -2636,6 +2662,7 @@ export async function summaryCard( req, res ) {
 
 
     const getOutput = await getOpenSearchData( openSearch?.EyeTestInput, getQuery );
+
     const initialValue = {
       totalFiles: 0,
       completedFiles: 0,