Merge branch 'master' into new-session-id

macros/base_select.sql

@@ -164,4 +164,4 @@
         WHEN event_name = 'purchase' THEN 1
         ELSE 0
     END AS is_purchase
-{% endmacro %}
+{% endmacro %}

models/staging/base/base_ga4__events.sql

@@ -60,6 +60,22 @@ with source as (
     {% if is_incremental() and var('end_date') is none %}
         and parse_date('%Y%m%d', left(replace(_table_suffix, 'intraday_', ''), 8)) in ({{ partitions_to_replace | join(',') }})
     {% endif %}
+    -- Add property ID filter for multiple brands
+    {% set selected_properties = [] %}
+    {% if 'all' in var('brands') %}
+        {% do selected_properties.extend(var('brand_properties')['all']) %}
+    {% else %}
+        {% for brand in var('brands') %}
+            {% do selected_properties.extend(var('brand_properties')[brand]) %}
+        {% endfor %}
+    {% endif %}
+    {{ log("Processing properties: " ~ selected_properties, info=True) }}
+    and (
+        {% for property_id in selected_properties %}
+        _table_suffix like '%{{ property_id }}'
+        {%- if not loop.last %} or {% endif -%}
+        {% endfor %}
+    )
 ),
 renamed as (
     select