DHFPROD-7104: Fix calculated match activity recursion

Author: ryanjdew

marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/mastering/calculateMatchingActivityLib.sjs

@@ -251,7 +251,7 @@ function rulesetsCombosAboveScoreRecursion(
   } else {
     let results = [];
     remainingRulesets.forEach((ruleset, i) => {
-      let subCombo = rulesetsCombosAtAndAboveScoreRecursion(
+      let subCombo = rulesetsCombosAboveScoreRecursion(
           remainingRulesets.slice(i + 1),
           combinedWeight + ruleset.weight,
           score,

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/mastering/calculateMatchingActivity.sjs

@@ -382,6 +382,103 @@ const expected1 =
     }
 ;
 
+const step2 = {
+  "matchRulesets": [
+    {
+      "name": "customerId - Exact",
+      "weight": 12,
+      "matchRules": [
+        {
+          "entityPropertyPath": "customerId",
+          "matchType": "exact",
+          "options": {
+          }
+        }
+      ]
+    }
+    ,
+    {
+      "name": "name - Exact",
+      "weight": 16,
+      "matchRules": [
+        {
+          "entityPropertyPath": "name",
+          "matchType": "exact",
+          "options": {
+          }
+        }
+      ]
+    }
+    ,
+    {
+      "name": "birthDate - Reduce",
+      "weight": 4,
+      "reduce": true,
+      "matchRules": [
+        {
+          "entityPropertyPath": "birthDate",
+          "matchType": "exact",
+          "options": {
+          }
+        }
+      ]
+    }
+  ]
+  ,
+  "thresholds": [
+    {
+      "thresholdName": "Definitive Match",
+      "action": "merge",
+      "score": 11
+    }
+  ]
+};
+
+const expected2 = {
+  "scale":
+      {
+        "max": 11,
+        "min": 11
+      },
+  "thresholdActions": [
+    {
+      "name": "Definitive Match",
+      "action": "merge",
+      "minimumMatchContributions": [
+        [
+          {
+            "rulesetName": "name - Exact",
+            "weight": 16,
+            "matchRules": [
+              {
+                "entityPropertyPath": "name",
+                "matchAlgorithm": "exact"
+              }]
+          }],
+        [
+          {
+            "rulesetName": "customerId - Exact",
+            "weight": 12,
+            "matchRules": [
+              {
+                "entityPropertyPath": "customerId",
+                "matchAlgorithm": "exact"
+              }]
+          },
+          {
+            "rulesetName": "NOT birthDate - Reduce",
+            "weight": 4,
+            "matchRules": [
+              {
+                "entityPropertyPath": "birthDate",
+                "matchAlgorithm": "exact"
+              }]
+          }]
+      ]
+    }]
+};
+
 [
-  test.assertEqualJson(expected1, cma.calculateMatchingActivity(step1), "most cases")
+  test.assertEqualJson(expected1, cma.calculateMatchingActivity(step1), "most cases"),
+  test.assertEqualJson(expected2, cma.calculateMatchingActivity(step2), "use case that hits reduce recursion code")
 ];