[NAE-2460] PFQL placeholder support

- fix QueryLangEvaluator.handleInRangeStringComparison

Author: Retoocs

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

@@ -222,17 +222,29 @@ private String handleLoggedUserStringAttribute(QueryLangParser.LoggedUserStringA
 
     /// returns pair, where the first element is left value and the second element is right value
     private Pair<String, String> handleInRangeStringComparison(QueryLangParser.StringRangeContext ctx) {
-        String left = "", right = "";
+        List<ParseTree> filteredChildren = ctx.children.stream()
+                .filter(node -> node instanceof TerminalNode && ((TerminalNode) node).getSymbol().getType() == QueryLangParser.STRING
+                        || node instanceof QueryLangParser.LoggedUserStringAttributeContext)
+                .collect(Collectors.toList());
+
+        if (filteredChildren.size() < 2) {
+            throw new IllegalArgumentException("Wrong in range values");
+        }
 
-        if (ctx.STRING(0) != null) {
-            left = getStringValue(ctx.STRING(0).getText());
-        } else if (ctx.loggedUserStringAttribute(0) != null) {
-            left = ctx.loggedUserStringAttribute(0).getText();
+        String left;
+        ParseTree leftNode = filteredChildren.get(0);
+        if (leftNode instanceof TerminalNode) {
+            left = getStringValue(leftNode.getText());
+        } else {
+            left = handleLoggedUserStringAttribute((QueryLangParser.LoggedUserStringAttributeContext) leftNode);
         }
-        if (ctx.STRING(1) != null) {
-            right = getStringValue(ctx.STRING(1).getText());
-        } else if (ctx.loggedUserStringAttribute(1) != null) {
-            right = ctx.loggedUserStringAttribute(1).getText();
+
+        String right;
+        ParseTree rightNode = filteredChildren.get(1);
+        if (rightNode instanceof TerminalNode) {
+            right = getStringValue(rightNode.getText());
+        } else {
+            right = handleLoggedUserStringAttribute((QueryLangParser.LoggedUserStringAttributeContext) rightNode);
         }
 
         return Pair.of(left, right);

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

@@ -376,6 +376,22 @@ public void testSimpleMongodbCaseQuery() {
 
         compareMongoQueries(mongoDbUtils, actual, expected);
 
+        actual = evaluateQuery("cases: title in ('test1' : loggedUser.username)").getFullMongoQuery();
+        expected = QCase.case$.title.gt("test1").and(QCase.case$.title.lt(systemUser.getUsername()));
+
+        compareMongoQueries(mongoDbUtils, actual, expected);
+
+        actual = evaluateQuery("cases: title in (loggedUser.username : 'test1')").getFullMongoQuery();
+        expected = QCase.case$.title.gt(systemUser.getUsername()).and(QCase.case$.title.lt("test1"));
+
+        compareMongoQueries(mongoDbUtils, actual, expected);
+
+        actual = evaluateQuery("cases: title in (loggedUser.username : loggedUser.fullName)").getFullMongoQuery();
+        expected = QCase.case$.title.gt(systemUser.getUsername()).and(QCase.case$.title.lt(systemUser.getFullName()));
+
+        compareMongoQueries(mongoDbUtils, actual, expected);
+
+
         // only available for elastic query
         // places comparison
         actual = evaluateQuery("case: places.p1.marking eq 1").getFullMongoQuery();
@@ -1013,6 +1029,21 @@ public void testSimpleElasticCaseQuery() {
 
         // data options comparison
         checkStringComparisonElastic("case", "data.field1.options", "dataSet.field1.options");
+
+        actual = evaluateQuery("cases: title in ('test1' : loggedUser.username)").getFullElasticQuery();
+        expected = String.format("(title:>test1 AND title:<%s)", systemUser.getUsername());
+
+        assertEquals(expected, actual);
+
+        actual = evaluateQuery("cases: title in (loggedUser.username : 'test1')").getFullElasticQuery();
+        expected = String.format("(title:>%s AND title:<test1)", systemUser.getUsername());
+
+        assertEquals(expected, actual);
+
+        actual = evaluateQuery("cases: title in (loggedUser.username : loggedUser.fullName)").getFullElasticQuery();
+        expected = String.format("(title:>%s AND title:<%s)", systemUser.getUsername(), systemUser.getFullName());
+
+        assertEquals(expected, actual);
     }
 
     @Test