bug(DVPN-178): VPN event funnel not showing - quick fix (#497)

* reformatted SQL for event_types * implemented changes suggested by @sean-rose in PR#496 * only run escape_metachars() when property_name or property_value filter is set
mozilla · Aug 8, 2022 · 9073f59 · 9073f59
1 parent 6f33984
commit 9073f59
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/generator/views/funnel_analysis_view.py b/generator/views/funnel_analysis_view.py
@@ -165,8 +165,10 @@ def _event_types_lookml(self) -> List[Dict[str, Any]]:
                             SELECT
                               mozfun.event_analysis.aggregate_match_strings(
                                 ARRAY_AGG(
-                                  CONCAT(
+                                  DISTINCT CONCAT(
+                                    {{% if _filters['property_name'] or _filters['property_value'] -%}}
                                     COALESCE(mozfun.event_analysis.escape_metachars(property_value.value), ''),
+                                    {{% endif -%}}
                                     mozfun.event_analysis.event_index_to_match_string(et.index)
                                   )
                                 )

diff --git a/tests/test_funnel_analysis.py b/tests/test_funnel_analysis.py
@@ -178,8 +178,10 @@ def test_view_lookml(funnel_analysis_view):
                         SELECT
                           mozfun.event_analysis.aggregate_match_strings(
                             ARRAY_AGG(
-                              CONCAT(
+                              DISTINCT CONCAT(
+                                {% if _filters['property_name'] or _filters['property_value'] -%}
                                 COALESCE(mozfun.event_analysis.escape_metachars(property_value.value), ''),
+                                {% endif -%}
                                 mozfun.event_analysis.event_index_to_match_string(et.index)
                               )
                             )