server: allow regexp in meta filters

walmartlabs · Oct 27, 2023 · 2d947aa · 2d947aa
1 parent e8ec417
commit 2d947aa
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/server/db/src/main/java/com/walmartlabs/concord/db/PgUtils.java b/server/db/src/main/java/com/walmartlabs/concord/db/PgUtils.java
@@ -85,6 +85,10 @@ public static Condition jsonbTextNotExistsByPath(Field<JSONB> field, List<String
         return DSL.condition("not {0} #> {1} ?? {2}", field, inline(toPath(path)), DSL.value(value));
     }
 
+    public static Condition jsonbTextMatch(Field<JSONB> field, List<String> path, String value) {
+        return DSL.condition("{0} #>> {1} ~ {2}", field, inline(toPath(path)), DSL.value(value));
+    }
+
     /**
      * Returns a JOOQ field "now - d" where "d" is the specified duration.
      * The result is rounded down to seconds.

diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/FilterUtils.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/FilterUtils.java
@@ -55,7 +55,9 @@ public final class FilterUtils {
             SuffixMapping.of(".notEndsWith", ProcessFilter.FilterType.NOT_ENDS_WITH),
 
             SuffixMapping.of(".ge", ProcessFilter.FilterType.GREATER_OR_EQUALS),
-            SuffixMapping.of(".len", ProcessFilter.FilterType.LESS_OR_EQUALS_OR_NULL)
+            SuffixMapping.of(".len", ProcessFilter.FilterType.LESS_OR_EQUALS_OR_NULL),
+
+            SuffixMapping.of(".rm", ProcessFilter.FilterType.REGEXP_MATCH)
     };
 
     public static List<ProcessFilter.DateFilter> parseDate(String paramName, UriInfo uriInfo) {
@@ -152,6 +154,10 @@ public static void applyJson(SelectQuery<Record> q, Field<JSONB> column, List<Pr
                     q.addConditions(jsonbTextNotExistsByPath(column, f.path(), f.value()));
                     break;
                 }
+                case REGEXP_MATCH: {
+                    q.addConditions(jsonbTextMatch(column, f.path(), f.value()));
+                    break;
+                }
                 case STARTS_WITH: {
                     q.addConditions(jsonbTextByPath(column, f.path()).startsWith(f.value()));
                     break;

diff --git a/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessFilter.java b/server/impl/src/main/java/com/walmartlabs/concord/server/process/queue/ProcessFilter.java
@@ -158,6 +158,8 @@ enum FilterType {
         NOT_STARTS_WITH,
 
         GREATER_OR_EQUALS,
-        LESS_OR_EQUALS_OR_NULL
+        LESS_OR_EQUALS_OR_NULL,
+
+        REGEXP_MATCH
     }
 }
diff --git a/server/impl/src/test/java/com/walmartlabs/concord/server/process/queue/FilterUtilsTest.java b/server/impl/src/test/java/com/walmartlabs/concord/server/process/queue/FilterUtilsTest.java
@@ -0,0 +1,30 @@
+package com.walmartlabs.concord.server.process.queue;
+
+import org.junit.jupiter.api.Test;
+
+import javax.ws.rs.core.MultivaluedHashMap;
+import javax.ws.rs.core.UriInfo;
+import java.util.Collections;
+import java.util.List;
+
+import static com.walmartlabs.concord.server.process.queue.ProcessFilter.FilterType.REGEXP_MATCH;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class FilterUtilsTest {
+
+    @Test
+    public void testRegularExpressionMatch() {
+        MultivaluedHashMap<String, String> m = new MultivaluedHashMap<>();
+        m.put("test.rm", Collections.singletonList("myValue"));
+
+        UriInfo uriInfo = mock(UriInfo.class);
+        when(uriInfo.getQueryParameters()).thenReturn(m);
+
+        List<ProcessFilter.JsonFilter> filter =  FilterUtils.parseJson("test", uriInfo);
+        assertEquals(1, filter.size());
+        assertEquals(REGEXP_MATCH, filter.get(0).type());
+        assertEquals("myValue", filter.get(0).value());
+    }
+}