DHFPROD-2461: case insensitive searches for step definitions

aebadirad · aebadirad · commit a0e4801d1b63 · 2019-05-08T17:28:20.000-07:00
diff --git a/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/impl/step.sjs b/marklogic-data-hub/src/main/resources/ml-modules/root/data-hub/5/impl/step.sjs
@@ -77,20 +77,20 @@ class Step {
   }
 
   getStepsByType(type = 'custom') {
-    let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('type', type)];
+    let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('type', type, 'case-insensitive')];
     return cts.search(cts.andQuery(query)).toArray();
   }
 
   getStepByNameAndType(name, type = 'custom') {
-    let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('name', name), cts.jsonPropertyValueQuery('type', type)];
+    let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('name', name, 'case-insensitive'), cts.jsonPropertyValueQuery('type', type, 'case-insensitive')];
     let doc = fn.head(cts.search(cts.andQuery(query)));
     if(doc) {
       return doc.toObject();
     }
   }
 
   getStepProcessor(flow, name, type = 'custom') {
-    let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('name', name), cts.jsonPropertyValueQuery('type', type)];
+    let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('name', name, 'case-insensitive'), cts.jsonPropertyValueQuery('type', type, 'case-insensitive')];
     let doc = fn.head(cts.search(cts.andQuery(query)));
     if(doc){
       doc = doc.toObject();

Original file line number	Diff line number	Diff line change
`@@ -77,20 +77,20 @@ class Step {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`getStepsByType(type = 'custom') {`
`80`		`- let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('type', type)];`
	`80`	`+ let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('type', type, 'case-insensitive')];`
`81`	`81`	`return cts.search(cts.andQuery(query)).toArray();`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`getStepByNameAndType(name, type = 'custom') {`
`85`		`- let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('name', name), cts.jsonPropertyValueQuery('type', type)];`
	`85`	`+ let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('name', name, 'case-insensitive'), cts.jsonPropertyValueQuery('type', type, 'case-insensitive')];`
`86`	`86`	`let doc = fn.head(cts.search(cts.andQuery(query)));`
`87`	`87`	`if(doc) {`
`88`	`88`	`return doc.toObject();`
`89`	`89`	`}`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`getStepProcessor(flow, name, type = 'custom') {`
`93`		`- let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('name', name), cts.jsonPropertyValueQuery('type', type)];`
	`93`	`+ let query = [cts.collectionQuery('http://marklogic.com/data-hub/step-definition'), cts.jsonPropertyValueQuery('name', name, 'case-insensitive'), cts.jsonPropertyValueQuery('type', type, 'case-insensitive')];`
`94`	`94`	`let doc = fn.head(cts.search(cts.andQuery(query)));`
`95`	`95`	`if(doc){`
`96`	`96`	`doc = doc.toObject();`