[NAE-2460] PFQL placeholder support

- update QueryLangEvaluator to aim for fulltextValue elasticsearch attribute

Author: Retoocs

src/main/java/com/netgrif/application/engine/pfql/service/QueryLangEvaluator.java

@@ -1215,7 +1215,11 @@ public void exitDataString(QueryLangParser.DataStringContext ctx) {
         String string = handleStringComparisonWithPlaceholders(ctx.stringComparison());
 
         setMongoQuery(ctx, null);
-        setElasticQuery(ctx, buildElasticQuery("dataSet." + fieldId + ".textValue", op.getType(), string, not));
+        String attribute = "dataSet." + fieldId + ".fulltextValue";
+        if (op.getType() == QueryLangParser.EQ || op.getType() == QueryLangParser.NEQ) {
+            attribute += ".keyword";
+        }
+        setElasticQuery(ctx, buildElasticQuery(attribute, op.getType(), string, not));
         this.searchWithElastic = true;
     }
 
@@ -1226,7 +1230,7 @@ public void exitDataStringList(QueryLangParser.DataStringListContext ctx) {
         List<String> stringList = handleStringListComparison(ctx.inListStringComparison().stringList());
 
         setMongoQuery(ctx, null);
-        setElasticQuery(ctx, buildElasticQueryInList("dataSet." + fieldId + ".textValue", stringList, not));
+        setElasticQuery(ctx, buildElasticQueryInList("dataSet." + fieldId + ".fulltextValue", stringList, not));
         this.searchWithElastic = true;
     }
 
@@ -1239,7 +1243,7 @@ public void exitDataStringRange(QueryLangParser.DataStringRangeContext ctx) {
         Pair<String, String> leftAndRightStrings = handleInRangeStringComparison(ctx.inRangeStringComparison().stringRange());
 
         setMongoQuery(ctx, null);
-        setElasticQuery(ctx, buildElasticQueryInRange("dataSet." + fieldId + ".textValue", leftAndRightStrings.getFirst(),
+        setElasticQuery(ctx, buildElasticQueryInRange("dataSet." + fieldId + ".fulltextValue", leftAndRightStrings.getFirst(),
                 leftEndpointOpen, leftAndRightStrings.getSecond(), rightEndpointOpen, not));
         this.searchWithElastic = true;
     }

src/test/java/com/netgrif/application/engine/pfql/QueryLangTest.java

@@ -1011,7 +1011,7 @@ public void testSimpleElasticCaseQuery() {
         assertEquals(expected, actual);
 
         // data value comparison
-        checkStringComparisonElastic("case", "data.field1.value", "dataSet.field1.textValue");
+        checkStringComparisonElastic("case", "data.field1.value", "dataSet.field1.fulltextValue");
 
         checkNumberComparisonElastic("case", "data.field2.value", "dataSet.field2.numberValue");
 
@@ -2034,7 +2034,12 @@ private static void checkDateComparison(MongoDbUtils<?> mongoDbUtils, String res
 
     private static void checkStringComparisonElastic(String resource, String attribute, String resultAttribute) {
         String actual = evaluateQuery(String.format("%s: %s eq 'test'", resource, attribute)).getFullElasticQuery();
-        String expected = String.format("%s:test", resultAttribute);
+        String expected;
+        if (resultAttribute.matches("dataSet\\.[^.]*\\.fulltextValue")) {
+            expected = String.format("%s.keyword:test", resultAttribute);
+        } else {
+            expected = String.format("%s:test", resultAttribute);
+        }
 
         assertEquals(expected, actual);