diff --git a/lib/workers/clickhouse_clean_sites.ex b/lib/workers/clickhouse_clean_sites.ex index 62541c91f..22881e193 100644 --- a/lib/workers/clickhouse_clean_sites.ex +++ b/lib/workers/clickhouse_clean_sites.ex @@ -37,7 +37,7 @@ defmodule Plausible.Workers.ClickhouseCleanSites do IngestRepo.query( "ALTER TABLE #{table} DELETE WHERE site_id IN (#{site_ids_expr})", [], - if(Mix.env() == :test, do: [mutations_sync: 1], else: []) + if(Mix.env() == :test, do: [mutations_sync: 2], else: []) ) end end diff --git a/test/workers/clickhouse_clean_sites_test.exs b/test/workers/clickhouse_clean_sites_test.exs index debb4c1e6..8d85dee2c 100644 --- a/test/workers/clickhouse_clean_sites_test.exs +++ b/test/workers/clickhouse_clean_sites_test.exs @@ -42,28 +42,28 @@ defmodule Plausible.Workers.ClickhouseCleanSitesTest do ClickhouseCleanSites.perform(nil) + assert_count(deleted_site, "events_v2", 0) + assert_count(deleted_site, "sessions_v2", 0) + assert_count(deleted_site, "imported_visitors", 0) + assert_count(deleted_site, "imported_sources", 0) + assert_count(deleted_site, "imported_pages", 0) + assert_count(deleted_site, "imported_entry_pages", 0) + assert_count(deleted_site, "imported_exit_pages", 0) + assert_count(deleted_site, "imported_locations", 0) + assert_count(deleted_site, "imported_devices", 0) + assert_count(deleted_site, "imported_browsers", 0) + assert_count(deleted_site, "imported_operating_systems", 0) + assert_count(site, "events_v2", 1) + assert_count(site, "sessions_v2", 1) + assert not Enum.member?( ClickhouseCleanSites.get_deleted_sites_with_clickhouse_data(), deleted_site.id ) - - assert get_count("events_v2") == 1 - assert get_count("sessions_v2") == 1 - assert get_count("imported_visitors") == 0 - assert get_count("imported_sources") == 0 - assert get_count("imported_pages") == 0 - assert get_count("imported_entry_pages") == 0 - assert get_count("imported_exit_pages") == 0 - assert get_count("imported_locations") == 0 - assert get_count("imported_devices") == 0 - assert get_count("imported_browsers") == 0 - assert get_count("imported_operating_systems") == 0 end - def get_count(table) do - %{count: count} = - from(e in table, select: %{count: fragment("count()")}) |> Plausible.ClickhouseRepo.one() - - count + def assert_count(site, table, expected_count) do + q = from(e in table, select: %{count: fragment("count()")}, where: e.site_id == ^site.id) + await_clickhouse_count(q, expected_count) end end