DHFPROD-3581: Renaming properties to match ES naming conventions

rahulvudutala · MarkLogic Builder · commit a566f855785c · 2020-02-27T15:56:43.000-08:00
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/entitySearch/getMatchingPropertyValues.api b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/entitySearch/getMatchingPropertyValues.api
@@ -2,7 +2,7 @@
   "functionName": "getMatchingPropertyValues",
   "params": [
     {
-      "name": "entityIRI",
+      "name": "entityTypeId",
       "datatype": "string"
     },
     {
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/entitySearch/getMatchingPropertyValues.sjs b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/entitySearch/getMatchingPropertyValues.sjs
@@ -1,6 +1,6 @@
 const lib = require('/data-hub/5/impl/hub-es.sjs');
 
-var entityIRI;
+var entityTypeId;
 var propertyPath;
 var referenceType;
 var pattern;
@@ -15,7 +15,7 @@ if(referenceType === 'element') {
 } else if(referenceType === 'collection') {
   query = cts.collectionReference();
 } else {
-  let rangeIndexPath = lib.getPropertyRangePath(entityIRI, propertyPath);
+  let rangeIndexPath = lib.getPropertyRangePath(entityTypeId, propertyPath);
   query = cts.pathReference(rangeIndexPath);
 }
 
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/entitySearch/getMinAndMaxPropertyValues.api b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/entitySearch/getMinAndMaxPropertyValues.api
@@ -1,8 +1,8 @@
 {
-  "functionName": "getNumericFacetsRange",
+  "functionName": "getMinAndMaxPropertyValues",
   "params": [
     {
-      "name": "entityIRI",
+      "name": "entityTypeId",
       "datatype": "string"
     },
     {
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/entitySearch/getMinAndMaxPropertyValues.sjs b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/data-services/entitySearch/getMinAndMaxPropertyValues.sjs
@@ -1,6 +1,6 @@
 const lib = require('/data-hub/5/impl/hub-es.sjs');
 
-var entityIRI;
+var entityTypeId;
 var propertyPath;
 var referenceType;
 
@@ -12,13 +12,13 @@ let rangeValues = {
 };
 
 if(!referenceType || referenceType === "") {
-  referenceType = lib.getPropertyReferenceType(entityIRI, propertyPath);
+  referenceType = lib.getPropertyReferenceType(entityTypeId, propertyPath);
 }
 
 if(referenceType === 'element') {
   query = cts.elementReference(propertyPath);
 } else {
-  let rangeIndexPath = lib.getPropertyRangePath(entityIRI, propertyPath);
+  let rangeIndexPath = lib.getPropertyRangePath(entityTypeId, propertyPath);
   query = cts.pathReference(rangeIndexPath);
 }
 
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/entitySearch/getMatchingPropertyValuesTest.sjs b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/entitySearch/getMatchingPropertyValuesTest.sjs
@@ -1,10 +1,10 @@
 const test = require("/test/test-helper.xqy");
 
-function invokeService(entityIRI, propertyPath, referenceType, pattern, limit) {
+function invokeService(entityTypeId, propertyPath, referenceType, pattern, limit) {
   return fn.head(xdmp.invoke(
       "/data-hub/5/data-services/entitySearch/getMatchingPropertyValues.sjs",
       {
-        "entityIRI": entityIRI,
+        "entityTypeId": entityTypeId,
         "propertyPath": propertyPath,
         "referenceType": referenceType,
         "pattern": pattern,
@@ -15,9 +15,9 @@ function invokeService(entityIRI, propertyPath, referenceType, pattern, limit) {
 
 // Uncomment the tests when DHFPROD-4494 bug is resolved.
 /*function testMatchingValuesStartingWithPattern() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "numStrEntityProp/strCityProp";
-  const result = invokeService(entityIRI, propertyPath, "path", "doc2", 10);
+  const result = invokeService(entityTypeId, propertyPath, "path", "doc2", 10);
   return [
     test.assertEqual(2, result.length),
     test.assertTrue(result.includes("doc2City1Prop")),
@@ -26,9 +26,9 @@ function invokeService(entityIRI, propertyPath, referenceType, pattern, limit) {
 }
 
 function testMatchingValuesWithPatternInBetween() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "numStrEntityProp/strCityProp";
-  const result = invokeService(entityIRI, propertyPath, "path", "city", 10);
+  const result = invokeService(entityTypeId, propertyPath, "path", "city", 10);
   return [
     test.assertEqual(4, result.length),
     test.assertTrue(result.includes("doc2City1Prop")),
@@ -39,9 +39,9 @@ function testMatchingValuesWithPatternInBetween() {
 }
 
 function testMatchingValuesOnRangePathOneLevelNesting() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "numStrEntityProp/strCityProp";
-  const result = invokeService(entityIRI, propertyPath, "path", "city", 10);
+  const result = invokeService(entityTypeId, propertyPath, "path", "city", 10);
   return [
     test.assertEqual(4, result.length),
     test.assertTrue(result.includes("doc2City1Prop")),
@@ -52,9 +52,9 @@ function testMatchingValuesOnRangePathOneLevelNesting() {
 }
 
 function testMatchingValuesOnRangePathNoNesting() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "srchEntyProp2";
-  const result = invokeService(entityIRI, propertyPath, "path", "city", 10);
+  const result = invokeService(entityTypeId, propertyPath, "path", "city", 10);
   return [
     test.assertEqual(2, result.length),
     test.assertTrue(result.includes("doc1SrchEntyProp2")),
@@ -63,18 +63,18 @@ function testMatchingValuesOnRangePathNoNesting() {
 }
 
 function testMatchingValuesWithLimit() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "numStrEntityProp/strCityProp";
-  const result = invokeService(entityIRI, propertyPath, "path", "city", 3);
+  const result = invokeService(entityTypeId, propertyPath, "path", "city", 3);
   return [
     test.assertEqual(3, result.length)
   ];
 }*/
 
 function testMatchingValuesOnRangeElementIndexes() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "strNameProp";
-  const result = invokeService(entityIRI, propertyPath, "element", "name", 10);
+  const result = invokeService(entityTypeId, propertyPath, "element", "name", 10);
   return [
     test.assertEqual(4, result.length),
     test.assertTrue(result.includes("doc2Name1Prop")),
@@ -85,9 +85,9 @@ function testMatchingValuesOnRangeElementIndexes() {
 }
 
 function testMatchingValuesOnRangeFieldIndexes() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "datahubCreatedInFlow";
-  const result = invokeService(entityIRI, propertyPath, "field", "flow", 10);
+  const result = invokeService(entityTypeId, propertyPath, "field", "flow", 10);
   return [
     test.assertEqual(2, result.length),
     test.assertTrue(result.includes("my-flow-1")),
@@ -96,9 +96,9 @@ function testMatchingValuesOnRangeFieldIndexes() {
 }
 
 function testMatchingValuesOnCollectionNames() {
-  let entityIRI = "";
+  let entityTypeId = "";
   let propertyPath = "";
-  const result = invokeService(entityIRI, propertyPath,"collection", "doc", 10);
+  const result = invokeService(entityTypeId, propertyPath,"collection", "doc", 10);
   return [
     test.assertEqual(2, result.length),
     test.assertTrue(result.includes("doc1")),
diff --git a/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/entitySearch/getMinAndMaxPropertyValuesTest.sjs b/marklogic-data-hub/src/test/ml-modules/root/test/suites/data-hub/5/data-services/entitySearch/getMinAndMaxPropertyValuesTest.sjs
@@ -1,10 +1,10 @@
 const test = require("/test/test-helper.xqy");
 
-function invokeService(entityIRI, propertyPath, referenceType) {
+function invokeService(entityTypeId, propertyPath, referenceType) {
   return fn.head(xdmp.invoke(
       "/data-hub/5/data-services/entitySearch/getMinAndMaxPropertyValues.sjs",
       {
-        "entityIRI": entityIRI,
+        "entityTypeId": entityTypeId,
         "propertyPath": propertyPath,
         "referenceType": referenceType
       }
@@ -13,59 +13,59 @@ function invokeService(entityIRI, propertyPath, referenceType) {
 
 // Uncomment the tests when DHFPROD-4494 bug is resolved.
 /*function testMinMaxTwoLevelNesting() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "numStrEntityProp/numEntProp/intProp";
-  const result = invokeService(entityIRI, propertyPath, "path");
+  const result = invokeService(entityTypeId, propertyPath, "path");
   return [
     test.assertEqual(11, result.min),
     test.assertEqual(77, result.max)
   ];
 }
 
 function testMinMaxOneLevelNesting() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "numStrEntityProp/intProp";
-  const result = invokeService(entityIRI, propertyPath, "path");
+  const result = invokeService(entityTypeId, propertyPath, "path");
   return [
     test.assertEqual(1, result.min),
     test.assertEqual(2, result.max)
   ];
 }
 
 function testMinMaxLongProperty() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "numStrEntityProp/numEntProp/longProp";
-  const result = invokeService(entityIRI, propertyPath, "path");
+  const result = invokeService(entityTypeId, propertyPath, "path");
   return [
     test.assertEqual(110, result.min),
     test.assertEqual(757, result.max)
   ];
 }*/
 
 function testMinMaxDecimalProperty() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "decimalProp";
-  const result = invokeService(entityIRI, propertyPath, "element");
+  const result = invokeService(entityTypeId, propertyPath, "element");
   return [
     test.assertEqual(1000.5, result.min),
     test.assertEqual(7557.5, result.max)
   ];
 }
 
 function testMinMaxDoubleProperty() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "doubleProp";
-  const result = invokeService(entityIRI, propertyPath, "element");
+  const result = invokeService(entityTypeId, propertyPath, "element");
   return [
     test.assertEqual(100000.0, result.min),
     test.assertEqual(755577.0, result.max)
   ];
 }
 
 function testMinMaxFloatProperty() {
-  let entityIRI = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
+  let entityTypeId = "http://marklogic.com/EntitiesSearchEntity-0.0.1/EntitiesSearchEntity";
   let propertyPath = "floatProp";
-  const result = invokeService(entityIRI, propertyPath, "element");
+  const result = invokeService(entityTypeId, propertyPath, "element");
   return [
     test.assertEqual(10000.0, result.min),
     test.assertEqual(75577.0, result.max)

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`"functionName": "getMatchingPropertyValues",`
`3`	`3`	`"params": [`
`4`	`4`	`{`
`5`		`- "name": "entityIRI",`
	`5`	`+ "name": "entityTypeId",`
`6`	`6`	`"datatype": "string"`
`7`	`7`	`},`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`		`- "functionName": "getNumericFacetsRange",`
	`2`	`+ "functionName": "getMinAndMaxPropertyValues",`
`3`	`3`	`"params": [`
`4`	`4`	`{`
`5`		`- "name": "entityIRI",`
	`5`	`+ "name": "entityTypeId",`
`6`	`6`	`"datatype": "string"`
`7`	`7`	`},`
`8`	`8`	`{`