DHFPROD-4428: Handle non-string typesin XML entities

Author: ryanjdew

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

@@ -84,7 +84,7 @@ declare function helper-impl:property-name-to-query($options as element(), $full
               function($val, $weight) {
                 $scope-query(cts:element-value-query(
                   $qname,
-                  $val,
+                  $val ! fn:string(.),
                   ("case-insensitive"),
                   $weight
                 ))

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/matching/include-matches.xqy

@@ -19,7 +19,7 @@ return (
     test:assert-equal(1, fn:count($def-match/@threshold[. = "Definitive Match"])),
     test:assert-equal(1, fn:count($def-match/@action[. = $constants:MERGE-ACTION])),
     test:assert-exists($def-match/matches),
-    test:assert-equal(6, fn:count($def-match/matches/match))
+    test:assert-equal(7, fn:count($def-match/matches/match))
   ),
 
   let $likely-match := $actual/result[@threshold="Likely Match"]
@@ -28,6 +28,6 @@ return (
     test:assert-equal(1, fn:count($likely-match/@threshold[. = "Likely Match"])),
     test:assert-equal(1, fn:count($likely-match/@action[. = $constants:NOTIFY-ACTION])),
     test:assert-exists($likely-match/matches),
-    test:assert-equal(3, fn:count($likely-match/matches/match), "Expected 3 matches. Got: " || xdmp:describe($likely-match/matches/match, (),()))
+    test:assert-equal(4, fn:count($likely-match/matches/match), "Expected 3 matches. Got: " || xdmp:describe($likely-match/matches/match, (),()))
   )
 )

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/matching/options-to-json.sjs

@@ -6,6 +6,6 @@ const actual = matcher.getOptionsAsJson(lib['MATCH-OPTIONS-NAME']);
 
 [].concat(
   test.assertEqual("200", actual.options.tuning.maxScan.toString()),
-  test.assertEqual(7, actual.options.propertyDefs.properties.length),
+  test.assertEqual(8, actual.options.propertyDefs.properties.length),
   test.assertEqual(2, actual.options.algorithms.length)
 )

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/matching/test-data/doc1.xml

@@ -1,4 +1,4 @@
-<envelope xmlns="http://marklogic.com/entity-services">
+<envelope xmlns="http://marklogic.com/entity-services" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <headers>
     <smart-mastering:id xmlns:smart-mastering="http://marklogic.com/smart-mastering">bbc806e4-ff00-4585-9d46-877edbc3248e</smart-mastering:id>
     <smart-mastering:id xmlns:smart-mastering="http://marklogic.com/smart-mastering">66cbe731-7b56-4c91-9257-18a973008277</smart-mastering:id>
@@ -38,7 +38,7 @@
           <id>6986792174</id>
           <PersonBirthDate>19801001</PersonBirthDate>
           <PersonSex>F</PersonSex>
-          <CaseAmount>1287.9</CaseAmount>
+          <CaseAmount xsi:type="xs:decimal">1287.9</CaseAmount>
           <CustomThing>1</CustomThing>
           <PersonSSNIdentification>
             <PersonSSNIdentificationType>

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/matching/test-data/doc2.xml

@@ -1,4 +1,4 @@
-<envelope xmlns="http://marklogic.com/entity-services">
+<envelope xmlns="http://marklogic.com/entity-services" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <headers>
     <smart-mastering:id xmlns:smart-mastering="http://marklogic.com/smart-mastering">87c2f600-7488-429a-862c-0b2a5f6c6e1e</smart-mastering:id>
     <smart-mastering:id xmlns:smart-mastering="http://marklogic.com/smart-mastering">f57e1093-4c68-46d7-910c-150825ab2edc</smart-mastering:id>
@@ -34,7 +34,7 @@
           <IncidentCategoryCodeDate/>
           <id>6270654339</id>
           <PersonBirthDate>19801001</PersonBirthDate>
-          <CaseAmount>1287.9</CaseAmount>
+          <CaseAmount xsi:type="xs:decimal">1287.9</CaseAmount>
           <CustomThing>2</CustomThing>
           <PersonSSNIdentification>
             <PersonSSNIdentificationType>

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/matching/test-data/doc3.xml

@@ -1,4 +1,4 @@
-<envelope xmlns="http://marklogic.com/entity-services">
+<envelope xmlns="http://marklogic.com/entity-services" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <headers>
     <smart-mastering:id xmlns:smart-mastering="http://marklogic.com/smart-mastering">87c2f600-7488-429a-862c-0b2a5f6c6e1e</smart-mastering:id>
     <smart-mastering:id xmlns:smart-mastering="http://marklogic.com/smart-mastering">f57e1093-4c68-46d7-910c-150825ab2edc</smart-mastering:id>
@@ -34,7 +34,7 @@
           <IncidentCategoryCodeDate/>
           <id>6270654339</id>
           <PersonBirthDate>19801001</PersonBirthDate>
-          <CaseAmount>1287.9</CaseAmount>
+          <CaseAmount xsi:type="xs:decimal">1287.9</CaseAmount>
           <CustomThing>2</CustomThing>
           <PersonSSNIdentification>
             <PersonSSNIdentificationType>

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/matching/test-data/doc4.xml

@@ -1,4 +1,4 @@
-<envelope xmlns="http://marklogic.com/entity-services">
+<envelope xmlns="http://marklogic.com/entity-services" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <headers>
     <smart-mastering:id xmlns:smart-mastering="http://marklogic.com/smart-mastering">87c2f600-7488-429a-862c-0b2a5f6c6e1e</smart-mastering:id>
     <smart-mastering:id xmlns:smart-mastering="http://marklogic.com/smart-mastering">f57e1093-4c68-46d7-910c-150825ab2edc</smart-mastering:id>

marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/smart-mastering/matching/test-data/match-options.xml

@@ -7,6 +7,7 @@
     <property namespace="" localname="LocationCity" name="city"/>
     <property namespace="" localname="LocationState" name="state"/>
     <property namespace="" localname="LocationPostalCode" name="zip"/>
+    <property namespace="" localname="CaseAmount" name="case-amount"/>
   </property-defs>
   <algorithms>
     <algorithm name="std-reduce" function="standard-reduction"/>
@@ -20,6 +21,8 @@
     <add property-name="city" weight="3"/>
     <add property-name="state" weight="1"/>
     <add property-name="zip" weight="3"/>
+    <!-- Only adding case-amount to trigger test for bug DHFPROD-4428 -->
+    <add property-name="case-amount" weight="1"/>
     <expand property-name="first-name" algorithm-ref="dbl-metaphone" weight="6">
       <dictionary>name-dictionary.xml</dictionary>
       <distance-threshold>10</distance-threshold>