tango-app-api-audit 3.4.8 → 3.4.10

package/package.json

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

package/src/controllers/audit.controllers.js

@@ -2345,12 +2345,21 @@ export async function userMetrics( req, res ) {
           beforeCount: 1,
           afterCount: 1,
           mappingPerc: {
-            $round: [
+            $cond: [
+              { $and: [
+                { $gt: [ '$beforeCount', 0 ] },
+                { $gt: [ '$afterCount', 0 ] },
+              ] },
               {
-                $multiply: [
-                  { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
+                $round: [
+                  {
+                    $multiply: [
+                      { $divide: [ '$afterCount', '$beforeCount' ] }, 100,
+                    ],
+                  }, 2,
                 ],
-              }, 2,
+              },
+              0,
             ],
           },
           checkIntime: 1,
@@ -2535,7 +2544,7 @@ export async function userMetrics( req, res ) {
               'Check Intime': '$checkIntime',
               'Check OutTime': '$checkOutTime',
               'Working Hours': '$workingHours',
-              'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
+              'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
             },
           },
       );
@@ -4733,6 +4742,7 @@ export async function auditViewLogs( req, res ) {
           return res.sendError( 'Please give valid modueType', 400 );
       }
     }
+    logger.info( { query: logsQuery, message: 'unattended' } );
     const logs = await getOpenSearchData( parsedOpenSearch.auditLog, logsQuery );
     logger.info( { logs: logs.body.hits, inputData: inputData, auditLog: parsedOpenSearch.auditLog } );
     if ( logs.body.hits.hits.length > 0 ) {
@@ -4763,36 +4773,32 @@ export async function auditViewLogs( req, res ) {
   }
 }
 
-export async function convertTimestampToDateTime( timestamp ) {
-  // Check if the timestamp is too large (nanoseconds), then convert it to milliseconds
-  if ( timestamp > 9999999999999 ) {
-    timestamp = Math.floor( timestamp / 1000 ); // Convert to milliseconds if needed
-  }
-
-  // Add 5 hours and 30 minutes in milliseconds
-  const timeOffset = ( 5 * 60 * 60 * 1000 ) + ( 30 * 60 * 1000 );
 
-  // Ensure the timestamp is valid by adding the offset correctly
-  const adjustedTimestamp = timestamp + timeOffset;
-
-  // Create a new Date object using the adjusted timestamp
-  const date = new Date( adjustedTimestamp );
-
-  // Ensure the date is valid (timestamp may be invalid)
-  if ( isNaN( date.getTime() ) ) {
-    throw new Error( 'Invalid timestamp provided' );
+export async function convertTimestampToDateTime( timestamp ) {
+  let date;
+  if ( typeof timestamp === 'string' ) {
+    date = new Date( timestamp );
+    if ( isNaN( date.getTime() ) ) {
+      throw new Error( 'Invalid ISO string timestamp provided' );
+    }
+  } else if ( typeof timestamp === 'number' ) { // Handle Unix timestamp input (e.g., 1727785440597)
+    if ( timestamp.toString().length <= 10 ) {
+      timestamp *= 1000; // Convert seconds to milliseconds
+    }
+    date = new Date( timestamp );
+  } else { // Handle invalid input type
+    throw new Error( 'Invalid input: Timestamp must be a valid ISO string or number' );
   }
-
-  // Format the date and time components
-  const year = date.getFullYear();
-  const month = ( '0' + ( date.getMonth() + 1 ) ).slice( -2 ); // Months are zero-based
-  const day = ( '0' + date.getDate() ).slice( -2 );
-
-  const hours = ( '0' + date.getHours() ).slice( -2 );
-  const minutes = ( '0' + date.getMinutes() ).slice( -2 );
-  const seconds = ( '0' + date.getSeconds() ).slice( -2 );
-
-  // Return formatted date and time string
+  const timeOffset = ( 5 * 60 * 60 * 1000 ) + ( 30 * 60 * 1000 ); // 5 hours and 30 minutes in milliseconds
+  const adjustedTimestamp = date.getTime() + timeOffset;
+  const adjustedDate = new Date( adjustedTimestamp );
+  const year = adjustedDate.getFullYear();
+  const month = ( '0' + ( adjustedDate.getMonth() + 1 ) ).slice( -2 ); // Months are zero-based
+  const day = ( '0' + adjustedDate.getDate() ).slice( -2 );
+
+  const hours = ( '0' + adjustedDate.getHours() ).slice( -2 );
+  const minutes = ( '0' + adjustedDate.getMinutes() ).slice( -2 );
+  const seconds = ( '0' + adjustedDate.getSeconds() ).slice( -2 );
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 }
 

package/src/controllers/traxAudit.controllers.js

@@ -3077,7 +3077,7 @@ export async function userMetrics( req, res ) {
         'Check Intime': '$checkIntime',
         'Check OutTime': '$checkOutTime',
         'Working Hours': '$workingHours',
-        'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
+        'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
         // 'Mapping Percentage': '$mappingPerc',
       };
       const YesNo = {
@@ -3089,7 +3089,7 @@ export async function userMetrics( req, res ) {
         'Check Intime': '$checkIntime',
         'Check OutTime': '$checkOutTime',
         'Working Hours': '$workingHours',
-        'Audited Date': { $dateToString: { format: '%Y,%b %d', date: '$createdAt' } },
+        'Audited Date': { $dateToString: { format: '%Y-%m-%d', date: '$createdAt' } },
         // 'Mapping Percentage': '$mappingPerc',
       };
       [ 'uniform-detection', 'mobile-detection' ].includes( inputData.moduleType )?