tango-app-api-analysis-traffic 3.8.7-vms.24 → 3.8.7-vms.25

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tango-app-api-analysis-traffic",
-    "version": "3.8.7-vms.24",
+    "version": "3.8.7-vms.25",
     "description": "Traffic Analysis",
     "main": "index.js",
     "type": "module",

package/src/validations/revop.validation.js

@@ -9,24 +9,45 @@ export async function getTaggingConfig( req, res, next ) {
     const configQuery = [
       {
         $match: {
-          clientId: clientId,
+          clientId,
         },
       },
 
-      // Filter limitations based on effectiveFrom <= date
+      // Convert all effectiveFrom to proper Date
+      {
+        $addFields: {
+          taggingLimitationWithDate: {
+            $map: {
+              input: '$footfallDirectoryConfigs.taggingLimitation',
+              as: 'item',
+              in: {
+                effectiveFrom: { $toDate: '$$item.effectiveFrom' },
+                values: '$$item.values',
+              },
+            },
+          },
+        },
+      },
+
+      // Filter items <= input date
       {
         $addFields: {
           matchedLimitation: {
             $filter: {
-              input: '$footfallDirectoryConfigs.taggingLimitation',
+              input: '$taggingLimitationWithDate',
               as: 'item',
-              cond: { $lte: [ '$$item.effectiveFrom', inputData.dateString ] },
+              cond: {
+                $lte: [
+                  '$$item.effectiveFrom',
+                  { $toDate: inputData.dateString },
+                ],
+              },
             },
           },
         },
       },
 
-      // Pick latest effective record
+      // Sort DESC and pick ONLY top 1 -> latest effective record
       {
         $addFields: {
           effectiveLimitation: {
@@ -48,24 +69,10 @@ export async function getTaggingConfig( req, res, next ) {
         },
       },
 
-      // Remove originals before final merge
-      {
-        $project: {
-          'config.taggingLimitation': 0,
-          'matchedLimitation': 0,
-        },
-      },
-
-      // Attach effective limitation INSIDE config
-      {
-        $addFields: {
-          'config.effectiveLimitation': '$effectiveLimitation',
-        },
-      },
-
-      // Remove temporary field
       {
         $project: {
+          config: 1,
+          effectiveLimitation: 1,
           footfallDirectoryConfigs: 1,
         },
       },
@@ -73,9 +80,10 @@ export async function getTaggingConfig( req, res, next ) {
 
 
     const getData = await aggregate( configQuery );
+    logger.info( { getData } );
     // Convert "taggingLimitation" array (if present) to "config" object with expected key-value pairs
     let config = {};
-    if ( getData && getData?.length > 0 && Array.isArray( getData?.[0]?.footfallDirectoryConfigs?.taggingLimitation ) ) {
+    if ( getData && getData?.length > 0 && Array.isArray( getData?.[0]?.effectiveLimitation?.values ) ) {
       for ( const item of getData?.[0]?.footfallDirectoryConfigs?.taggingLimitation?.[0]?.values ) {
         if ( item && item.type && typeof item.value !== 'undefined' && item.unit ) {
           config[item.type] = `${item.value}${item.unit}`;
@@ -85,7 +93,7 @@ export async function getTaggingConfig( req, res, next ) {
     // getData[0].footfallDirectoryConfigs.taggingLimitation = [];
     getData[0].footfallDirectoryConfigs.config = config;
 
-    getData[0].footfallDirectoryConfigs.taggingLimitation = getData[0].footfallDirectoryConfigs.taggingLimitation?.[0]?.values;
+    getData[0].footfallDirectoryConfigs.taggingLimitation = getData?.[0]?.effectiveLimitation?.values;
     req.store = getData[0];
     next();
   } catch ( error ) {