Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,6 @@ SQL >
{% if defined(date_to) %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
{% end %}
{% if defined(member_status) %} and member_status IN {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }} {% end %}
{% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
{% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
{% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
{% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
{% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
{% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ SQL >
)
)
{% end %}
{% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
{% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
{% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
{% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
{% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
{% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,6 @@ SQL >
)
)
{% end %}
{% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
{% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
{% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
-- we do filtering on source in the filtered_sessions pipe
# --{% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
{% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
{% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
{% if defined(post_uuid) %} and post_uuid = {{ String(post_uuid, description="Post UUID to filter on", required=False) }} {% end %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,6 @@ SQL >
)
)
{% end %}
{% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
{% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
{% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
{% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
{% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
{% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
Expand Down
36 changes: 0 additions & 36 deletions ghost/core/core/server/data/tinybird/tests/api_kpis.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,6 @@
{"date":"2100-01-06","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}
{"date":"2100-01-07","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}

- name: Filtered by browser - Chrome
description: Filtered by browser - Chrome
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&browser=chrome
expected_result: |
{"date":"2100-01-01","visits":1,"pageviews":2,"bounce_rate":0,"avg_session_sec":1111}
{"date":"2100-01-02","visits":0,"pageviews":0,"bounce_rate":0,"avg_session_sec":0}
{"date":"2100-01-03","visits":1,"pageviews":3,"bounce_rate":0,"avg_session_sec":1115}
{"date":"2100-01-04","visits":3,"pageviews":7,"bounce_rate":0.33,"avg_session_sec":572}
{"date":"2100-01-05","visits":1,"pageviews":3,"bounce_rate":0,"avg_session_sec":493}
{"date":"2100-01-06","visits":1,"pageviews":1,"bounce_rate":1,"avg_session_sec":0}
{"date":"2100-01-07","visits":0,"pageviews":0,"bounce_rate":0,"avg_session_sec":0}

- name: Filtered by device - desktop
description: Filtered by device - desktop
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&device=desktop
expected_result: |
{"date":"2100-01-01","visits":2,"pageviews":4,"bounce_rate":0,"avg_session_sec":870.5}
{"date":"2100-01-02","visits":1,"pageviews":3,"bounce_rate":0,"avg_session_sec":1027}
{"date":"2100-01-03","visits":3,"pageviews":7,"bounce_rate":0,"avg_session_sec":3333}
{"date":"2100-01-04","visits":3,"pageviews":7,"bounce_rate":0.33,"avg_session_sec":572}
{"date":"2100-01-05","visits":2,"pageviews":5,"bounce_rate":0,"avg_session_sec":308}
{"date":"2100-01-06","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}
{"date":"2100-01-07","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}

- name: Filtered by location - UK
description: Filtered by location - UK
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&location=GB
Expand All @@ -47,18 +23,6 @@
{"date":"2100-01-06","visits":1,"pageviews":1,"bounce_rate":1,"avg_session_sec":0}
{"date":"2100-01-07","visits":0,"pageviews":0,"bounce_rate":0,"avg_session_sec":0}

- name: Filtered by OS - Windows
description: Filtered by OS - Windows
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&os=windows
expected_result: |
{"date":"2100-01-01","visits":2,"pageviews":4,"bounce_rate":0,"avg_session_sec":870.5}
{"date":"2100-01-02","visits":1,"pageviews":3,"bounce_rate":0,"avg_session_sec":1027}
{"date":"2100-01-03","visits":3,"pageviews":7,"bounce_rate":0,"avg_session_sec":3333}
{"date":"2100-01-04","visits":3,"pageviews":7,"bounce_rate":0.33,"avg_session_sec":572}
{"date":"2100-01-05","visits":2,"pageviews":5,"bounce_rate":0,"avg_session_sec":308}
{"date":"2100-01-06","visits":1,"pageviews":1,"bounce_rate":1,"avg_session_sec":0}
{"date":"2100-01-07","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}

- name: Filtered by pathname - /about/
description: Filtered by pathname - /about/
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&pathname=%2Fabout%2F
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,40 +9,12 @@
{"location":"ES","visits":2}
{"location":"DE","visits":1}

- name: Filtered by browser - Chrome
description: Filtered by browser - Chrome
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
expected_result: |
{"location":"GB","visits":5}
{"location":"DE","visits":1}
{"location":"ES","visits":1}

- name: Filtered by device - desktop
description: Filtered by device - desktop
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
expected_result: |
{"location":"GB","visits":7}
{"location":"US","visits":3}
{"location":"FR","visits":2}
{"location":"ES","visits":2}
{"location":"DE","visits":1}

- name: Filtered by location - UK
description: Filtered by location - UK
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
expected_result: |
{"location":"GB","visits":8}

- name: Filtered by OS - Windows
description: Filtered by OS - Windows
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
expected_result: |
{"location":"GB","visits":7}
{"location":"US","visits":3}
{"location":"ES","visits":2}
{"location":"FR","visits":1}
{"location":"DE","visits":1}

- name: Filtered by pathname - /about/
description: Filtered by pathname - /about/
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
Expand Down Expand Up @@ -98,8 +70,7 @@

- name: Test with multiple filters combined
description: Test with multiple filters combined
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
expected_result: |
{"location":"US","visits":3}
{"location":"FR","visits":1}
{"location":"DE","visits":1}
{"location":"GB","visits":1}
31 changes: 1 addition & 30 deletions ghost/core/core/server/data/tinybird/tests/api_top_pages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,6 @@
{"post_uuid":"","pathname":"\/","visits":7}
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}

- name: Filtered by browser - Chrome
description: Filtered by browser - Chrome
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
expected_result: |
{"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":6}
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":3}
{"post_uuid":"","pathname":"\/","visits":3}

- name: Filtered by device - desktop
description: Filtered by device - desktop
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
expected_result: |
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":8}
{"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":8}
{"post_uuid":"","pathname":"\/","visits":7}
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}

- name: Filtered by location - UK
description: Filtered by location - UK
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
Expand All @@ -33,15 +16,6 @@
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":4}
{"post_uuid":"","pathname":"\/","visits":4}

- name: Filtered by OS - Windows
description: Filtered by OS - Windows
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
expected_result: |
{"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":8}
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":7}
{"post_uuid":"","pathname":"\/","visits":7}
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}

- name: Filtered by pathname - /about/
description: Filtered by pathname - /about/
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
Expand Down Expand Up @@ -90,12 +64,9 @@

- name: Test with multiple filters combined
description: Test with multiple filters combined
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
expected_result: |
{"post_uuid":"","pathname":"\/","visits":3}
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":2}
{"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":1}
{"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}

- name: Test with post_type - post
description: Test with post_type - post
Expand Down
43 changes: 2 additions & 41 deletions ghost/core/core/server/data/tinybird/tests/api_top_sources.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,28 +13,6 @@
{"source":"petty-queen.com","visits":1}
{"source":"my-ghost-site.com","visits":1}

- name: Filtered by browser - Chrome
description: Filtered by browser - Chrome
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
expected_result: |
{"source":"","visits":4}
{"source":"bing.com","visits":1}
{"source":"search.yahoo.com","visits":1}
{"source":"baidu.com","visits":1}

- name: Filtered by device - desktop
description: Filtered by device - desktop
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
expected_result: |
{"source":"","visits":6}
{"source":"bing.com","visits":2}
{"source":"search.yahoo.com","visits":2}
{"source":"google.com","visits":1}
{"source":"baidu.com","visits":1}
{"source":"wilted-tick.com","visits":1}
{"source":"duckduckgo.com","visits":1}
{"source":"my-ghost-site.com","visits":1}

- name: Filtered by location - UK
description: Filtered by location - UK
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
Expand All @@ -46,19 +24,6 @@
{"source":"baidu.com","visits":1}
{"source":"petty-queen.com","visits":1}

- name: Filtered by OS - Windows
description: Filtered by OS - Windows
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
expected_result: |
{"source":"","visits":5}
{"source":"bing.com","visits":2}
{"source":"search.yahoo.com","visits":2}
{"source":"google.com","visits":1}
{"source":"baidu.com","visits":1}
{"source":"wilted-tick.com","visits":1}
{"source":"duckduckgo.com","visits":1}
{"source":"my-ghost-site.com","visits":1}

- name: Filtered by pathname - /about/
description: Filtered by pathname - /about/
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
Expand Down Expand Up @@ -118,13 +83,9 @@

- name: Test with multiple filters combined
description: Test with multiple filters combined
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
expected_result: |
{"source":"google.com","visits":1}
{"source":"search.yahoo.com","visits":1}
{"source":"wilted-tick.com","visits":1}
{"source":"duckduckgo.com","visits":1}
{"source":"my-ghost-site.com","visits":1}
{"source":"bing.com","visits":2}

- name: Filtered by utm_source - google
description: Filtered by utm_source - google
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,6 @@
{"utm_campaign":"retention_q4","visits":1}
{"utm_campaign":"newsletter_weekly","visits":1}
- name: Filtered by browser - Chrome
description: Filtered by browser - Chrome
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
expected_result: |
{"utm_campaign":"brand_awareness","visits":2}
{"utm_campaign":"summer_sale_2024","visits":1}
{"utm_campaign":"retention_q4","visits":1}
- name: Filtered by device - desktop
description: Filtered by device - desktop
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
expected_result: |
{"utm_campaign":"brand_awareness","visits":2}
{"utm_campaign":"holiday_promo","visits":2}
{"utm_campaign":"product_launch","visits":2}
{"utm_campaign":"summer_sale_2024","visits":1}
{"utm_campaign":"retention_q4","visits":1}
{"utm_campaign":"newsletter_weekly","visits":1}
- name: Filtered by location - UK
description: Filtered by location - UK
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
Expand All @@ -38,17 +19,6 @@
{"utm_campaign":"product_launch","visits":1}
{"utm_campaign":"newsletter_weekly","visits":1}
- name: Filtered by OS - Windows
description: Filtered by OS - Windows
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
expected_result: |
{"utm_campaign":"brand_awareness","visits":2}
{"utm_campaign":"holiday_promo","visits":2}
{"utm_campaign":"product_launch","visits":2}
{"utm_campaign":"summer_sale_2024","visits":1}
{"utm_campaign":"retention_q4","visits":1}
{"utm_campaign":"newsletter_weekly","visits":1}
- name: Filtered by pathname - /about/
description: Filtered by pathname - /about/
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
Expand Down Expand Up @@ -103,7 +73,7 @@
- name: Test with multiple filters combined
description: Test with multiple filters combined
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
expected_result: |
{"utm_campaign":"holiday_promo","visits":2}
{"utm_campaign":"product_launch","visits":2}
{"utm_campaign":"retention_q4","visits":1}
{"utm_campaign":"newsletter_weekly","visits":1}
Loading