DHFPROD-7995: Don't allow null/empty values to count toward matching score

Author: ryanjdew

marklogic-data-hub/src/main/resources/ml-modules/root/com.marklogic.smart-mastering/matcher-impl/matcher-impl.xqy

@@ -43,6 +43,22 @@ function testNamespacedXmlMatches() {
     const results = fn.head(match.main(content, { stepId: 'matchNamespacedCustomers-matching'})).value;
     return verifyResults(content, results);
 }
+
+function verifyNullsDoNotMatch() {
+    const content = hubUtils.queryToContentDescriptorArray(cts.documentQuery('/content/CustNonMatchNull.json'), {}, xdmp.databaseName(xdmp.database()));
+    const results = fn.head(match.main(content, { stepId: 'matchCustomers-matching'})).value;
+    let resultsNode = xdmp.toJSON(results);
+    let mergeAction = resultsNode.xpath('matchSummary/actionDetails/*[action = "merge"]');
+    let customAction = resultsNode.xpath('matchSummary/actionDetails/*[action = "customActions"]');
+    let notifyAction = resultsNode.xpath('matchSummary/actionDetails/*[action = "notify"]');
+    return [
+        test.assertEqual(1, fn.count(results), `A matchSummary should be returned. Results: ${results}`),
+        test.assertEqual(0, fn.count(mergeAction), `Zero merge actions should be in the matchSummary. Results: ${xdmp.toJsonString(results)}`),
+        test.assertEqual(0, fn.count(customAction), `Zero custom actions should be in the matchSummary. Results: ${xdmp.toJsonString(results)}`),
+        test.assertEqual(0, fn.count(notifyAction), `Zero notify actions should be in the matchSummary. Results: ${xdmp.toJsonString(results)}`)
+    ];
+}
 assertions
     .concat(testJsonMatches())
-    .concat(testNamespacedXmlMatches());
+    .concat(testNamespacedXmlMatches())
+    .concat(verifyNullsDoNotMatch());

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/entity-driven/entityDrivenMatches.sjs

@@ -0,0 +1,73 @@
+{
+  "envelope": {
+    "headers": {
+      "sources": [
+        {
+          "name": "source 2"
+        }
+      ],
+      "createdOn": "2020-08-20T05:27:43.360675Z",
+      "createdBy": "admin"
+    },
+    "triples": [],
+    "instance": {
+      "info": {
+        "title": "Customer",
+        "version": "0.0.1",
+        "baseUri": "http://example.org/"
+      },
+      "Customer": {
+        "customerId": 3243,
+        "name": null,
+        "birthDate": "1985-01-01",
+        "shipping": [
+          {
+            "Address": {
+              "street": [
+                "Hanover Place"
+              ],
+              "city": null,
+              "state": "Oklahoma",
+              "zip": {
+                "Zip": {
+                  "fiveDigit": null,
+                  "plusFour": "1001"
+                }
+              }
+            }
+          },
+          {
+            "Address": {
+              "street": [
+                "1800 Tysons Blvd"
+              ],
+              "city": null,
+              "state": "Virginia",
+              "zip": {
+                "Zip": {
+                  "fiveDigit": null,
+                  "plusFour": "2021"
+                }
+              }
+            }
+          }
+        ],
+        "billing": {
+          "Address": {
+            "street": [
+              "Sunnyside Avenue"
+            ],
+            "city": null,
+            "state": "Wisconsin",
+            "zip": {
+              "Zip": {
+                "fiveDigit": null,
+                "plusFour": "8854"
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/entity-driven/test-data/content/CustNonMatchNull.json

@@ -26,6 +26,10 @@
         {
           "entityPropertyPath": "billing.state",
           "matchType": "exact"
+        },
+        {
+          "entityPropertyPath": "billing.zip.fiveDigit",
+          "matchType": "exact"
         }
       ]
     }

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/entity-driven/test-data/steps/matching/matchCustomerBillingCityState.step.json

@@ -26,6 +26,10 @@
         {
           "entityPropertyPath": "shipping.state",
           "matchType": "exact"
+        },
+        {
+          "entityPropertyPath": "shipping.zip.fiveDigit",
+          "matchType": "exact"
         }
       ]
     }

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/entity-driven/test-data/steps/matching/matchCustomerShippingCityState.step.json

@@ -26,6 +26,10 @@
         {
           "entityPropertyPath": "billing.state",
           "matchType": "exact"
+        },
+        {
+          "entityPropertyPath": "billing.zip.fiveDigit",
+          "matchType": "exact"
         }
       ]
     }

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/entity-driven/test-data/steps/matching/matchNSCustomerBillingCityState.step.json

@@ -26,6 +26,10 @@
         {
           "entityPropertyPath": "shipping.state",
           "matchType": "exact"
+        },
+        {
+          "entityPropertyPath": "shipping.zip.fiveDigit",
+          "matchType": "exact"
         }
       ]
     }