From a86d9697baab945f8d6534edf47b4153ea5c2823 Mon Sep 17 00:00:00 2001 From: Vinicius Brasil Date: Tue, 25 Oct 2022 07:17:59 -0300 Subject: [PATCH] Clear stats_start_date after clearing GA stats (#2370) This commit fixes a bug where users clearing one import and trying to re-import would get invalid import date ranges. This was caused because the stats_start_date field was not updated to nil after clearing imported stats, as this field defines the end date of the import. --- lib/plausible/purge.ex | 5 ++++- test/plausible/purge_test.exs | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/plausible/purge.ex b/lib/plausible/purge.ex index 50796e151..2a778a2b0 100644 --- a/lib/plausible/purge.ex +++ b/lib/plausible/purge.ex @@ -23,7 +23,8 @@ defmodule Plausible.Purge do @spec delete_imported_stats!(Plausible.Site.t()) :: :ok @doc """ - Deletes imported stats from Google Analytics. + Deletes imported stats from Google Analytics, and clears the + `stats_start_date` field. """ def delete_imported_stats!(site) do Enum.each(Plausible.Imported.tables(), fn table -> @@ -31,6 +32,8 @@ defmodule Plausible.Purge do Ecto.Adapters.SQL.query!(Plausible.ClickhouseRepo, sql, [site.id]) end) + clear_stats_start_date!(site) + :ok end diff --git a/test/plausible/purge_test.exs b/test/plausible/purge_test.exs index 00a9ac60d..1efc98a83 100644 --- a/test/plausible/purge_test.exs +++ b/test/plausible/purge_test.exs @@ -45,9 +45,9 @@ defmodule Plausible.PurgeTest do end) end - test "delete_imported_stats!/1 does not reset stats_start_date", %{site: site} do + test "delete_imported_stats!/1 resets stats_start_date", %{site: site} do assert :ok == Plausible.Purge.delete_imported_stats!(site) - assert %Date{} = site.stats_start_date + assert %Plausible.Site{stats_start_date: nil} = Plausible.Repo.reload(site) end test "delete_native_stats!/1 deletes native stats", %{site: site} do