From 4fc211f993c4897856875dee15d20125293ce77d Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Thu, 16 Mar 2023 15:31:30 +0200 Subject: [PATCH] Support `matches_member` and `not_matches_member` filters --- lib/plausible/stats/aggregate.ex | 8 ++++++++ lib/plausible/stats/filters.ex | 1 + 2 files changed, 9 insertions(+) diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.ex index 2878e7c28..9e43749a1 100644 --- a/lib/plausible/stats/aggregate.ex +++ b/lib/plausible/stats/aggregate.ex @@ -95,6 +95,14 @@ defmodule Plausible.Stats.Aggregate do page_regexes = Enum.map(exprs, &page_regex/1) {"not(multiMatchAny(p, {$#{where_param_idx}:Array(String)}))", page_regexes} + {:matches_member, exprs} -> + page_regexes = Enum.map(exprs, &page_regex/1) + {"multiMatchAny(p, array(?))", page_regexes} + + {:not_matches_member, exprs} -> + page_regexes = Enum.map(exprs, &page_regex/1) + {"not(multiMatchAny(p, array(?)))", page_regexes} + {:does_not_match, expr} -> regex = page_regex(expr) {"not(match(p, {$#{where_param_idx}:String}))", regex} diff --git a/lib/plausible/stats/filters.ex b/lib/plausible/stats/filters.ex index bb7af2cb7..5ac7a8585 100644 --- a/lib/plausible/stats/filters.ex +++ b/lib/plausible/stats/filters.ex @@ -63,6 +63,7 @@ defmodule Plausible.Stats.Filters do cond do is_negated && is_wildcard && is_list -> {:not_matches_member, val} is_negated && is_contains && is_list -> {:not_matches_member, Enum.map(val, &"**#{&1}**")} + is_wildcard && is_list -> {:matches_member, val} is_negated && is_wildcard -> {:does_not_match, val} is_negated && is_list -> {:not_member, val} is_negated && is_contains -> {:does_not_match, "**" <> val <> "**"}