tango-app-api-audit 3.6.43 → 3.6.45

package/package.json

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

package/src/controllers/eyeTestAudit.controllers.js

@@ -25,17 +25,32 @@ export async function getList( req, res ) {
 
     const sortBy = inputData?.sortBy ? [ 'coveredStepsAI', 'trustScore', 'date' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
-    let filter= [
-      {
-        'range': {
-          'date': {
-            'gte': new Date( inputData.fromDate ),
-            'lte': new Date( inputData.toDate ),
+    let filter;
+    if ( dateType === 'auditedDate' ) {
+      filter= [
+        {
+          'range': {
+            'updatedAt': {
+              'gte': new Date( inputData.fromDate ),
+              'lte': new Date( inputData.toDate ),
+            },
           },
         },
-      },
 
-    ];
+      ];
+    } else {
+      filter= [
+        {
+          'range': {
+            'date': {
+              'gte': new Date( inputData.fromDate ),
+              'lte': new Date( inputData.toDate ),
+            },
+          },
+        },
+
+      ];
+    }
 
 
     if ( inputData.demographics && inputData.demographics.length > 0 ) {
@@ -298,49 +313,7 @@ export async function getList( req, res ) {
   }
 }
 
-// export async function fetchAllDocuments( index, data ) {
-//   try {
-//     const pageSize = 1000; // safer chunk size
-//     let allHits = [];
-//     let searchAfter = null;
-//     let hasMore = true;
-//     let i =0;
-
-//     while ( hasMore ) {
-//       const body={
-//         size: pageSize,
-//         query: {
-//           bool: data,
-//         },
-//         sort: [
-//           { 'storeName.keyword': 'desc' },
-//           { '_id': 'asc' }, // Required for stable search_after
-//         ],
-//       };
-
-//       if ( searchAfter ) {
-//         body.search_after = searchAfter;
-//       }
-
-//       const response = await getOpenSearchData( index, body );
-//       const hits = response.body.hits.hits;
-//       i = i+hits.length;
-//       logger.info( { index: i, length: hits.length, msg: '........index' } );
-//       allHits.push( ...hits );
-//       if ( allHits.length >= 50000 ) {
-//         hasMore = false;
-//       } else {
-//         searchAfter = hits[hits.length - 1].sort;
-//       }
-//     }
-
-//     logger.info( `Fetched ${allHits.length} documents` );
-//     return allHits;
-//   } catch ( error ) {
-//     const err = error.message || 'Internal Server Error';
-//     return res.sendError( err, 500 );
-//   };
-// };
+
 export async function fetchDeepPage( index, data, limit, offset, sortBy, order, searchAfter1 ) {
   try {
     logger.info( { index: index, data: data, limit: limit, offset: offset } );
@@ -365,27 +338,6 @@ export async function fetchDeepPage( index, data, limit, offset, sortBy, order,
     );
 
     const hits = response?.body?.hits?.hits;
-    // while ( currentCount < offset + limit ) {
-    //   const response = await getOpenSearchData(
-    //       index,
-    //       body,
-    //   );
-
-    //   const hits = response?.body?.hits?.hits;
-    //   logger.info( { response: response } );
-    //   if ( !hits.length || offset + limit <= i ) break;
-    //   i = i+hits.length;
-    //   logger.info( { hits: hits, function: '.........hits' } );
-    //   currentCount += hits.length;
-    //   searchAfter = hits[hits.length - 1].sort;
-    //   logger.info( { searchAfter: searchAfter } );
-    //   // Only keep the target range
-    //   const startIndex = Math.max( 0, hits.length - ( currentCount - offset ) );
-    //   const sliced = hits.slice( startIndex, startIndex + limit );
-    //   if ( currentCount >= offset ) {
-    //     finalResults.push( ...sliced );
-    //   }
-    // }
     return hits;
   } catch ( error ) {
     const err = error.message || 'Internal Server Error';
@@ -1460,21 +1412,36 @@ export async function summaryList( req, res ) {
     const limit = inputData.limit || 10;
     const offset = inputData.offset ? ( inputData.offset - 1 ) * limit : 0;
 
-    const sortBy = inputData?.sortBy ? [ 'coveredStepsAI', 'trustScore', 'date', 'ComplianceScore', 'auditedSteps' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
+    const sortBy = inputData?.sortBy ? inputData?.sortBy === 'auditedDate'? 'updatedAt': [ 'coveredStepsAI', 'trustScore', 'date', 'ComplianceScore', 'auditedSteps' ].includes( inputData.sortBy ) ? inputData.sortBy :`${inputData.sortBy}.keyword` : 'storeName.keyword';
     const order = inputData?.sortOrder || -1;
 
     // declare filter and assign range values from inputData
-    let filter= [
-      {
-        'range': {
-          'date': {
-            'gte': new Date( inputData.fromDate ),
-            'lte': new Date( inputData.toDate ),
+    let filter;
+    if ( inputData?.dateType === 'auditedDate' ) {
+      filter= [
+        {
+          'range': {
+            'updatedAt': {
+              'gte': new Date( inputData.fromDate ),
+              'lte': new Date( inputData.toDate ),
+            },
           },
         },
-      },
 
-    ];
+      ];
+    } else {
+      filter= [
+        {
+          'range': {
+            'date': {
+              'gte': new Date( inputData.fromDate ),
+              'lte': new Date( inputData.toDate ),
+            },
+          },
+        },
+
+      ];
+    }
 
     // filter by Audit Status if key has minimum one element
     if ( inputData?.auditStatus && inputData?.auditStatus?.length > 0 ) {
@@ -2388,15 +2355,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,
@@ -2408,6 +2369,33 @@ export async function summaryCard( req, res ) {
         },
       },
     ];
+
+    if ( inputData?.dateType === 'auditedDate' ) {
+      filter.push(
+          {
+            'range': {
+              'updatedAt': {
+                'gte': new Date( inputData.fromDate ),
+                'lte': new Date( inputData.toDate ),
+              },
+            },
+          },
+
+      );
+    } 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: {

package/src/dtos/eyeTestAudit.dtos.js

@@ -3,6 +3,7 @@ import dayjs from 'dayjs';
 
 export const getListSchema = joi.object(
     {
+      dateType: joi.string().optional().valid( 'fileDate', 'auditedDate' ),
       fromDate: joi.string().required().messages( {
         'any.required': 'From Date is required',
         'string.empty': 'From Date cannot be empty',
@@ -101,6 +102,7 @@ export const userAuditedDataValid = {
 };
 
 export const summaryListSchema = joi.object( {
+  dateType: joi.string().optional().valid( 'fileDate', 'auditedDate' ),
   keyType: joi.string()
       .valid( 'rm', 'cluster', 'store' )
       .required()
@@ -174,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()