From 176f4579166a6df47e57764e3713df766bed003e Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Fri, 5 Apr 2024 13:34:57 +0200 Subject: [PATCH] Keep `sites.imported_data` in sync with backfilled `SiteImport` when migrating --- lib/plausible/data_migration/site_imports.ex | 12 +++++++++++- test/plausible/data_migration/site_imports_test.exs | 6 ++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/plausible/data_migration/site_imports.ex b/lib/plausible/data_migration/site_imports.ex index fc4c91b2d..6ee5a3dd6 100644 --- a/lib/plausible/data_migration/site_imports.ex +++ b/lib/plausible/data_migration/site_imports.ex @@ -11,6 +11,8 @@ defmodule Plausible.DataMigration.SiteImports do alias Plausible.Repo alias Plausible.Site + require Plausible.Imported.SiteImport + def run(opts \\ []) do dry_run? = Keyword.get(opts, :dry_run?, true) @@ -77,7 +79,8 @@ defmodule Plausible.DataMigration.SiteImports do "Site import #{site_import.id} (site ID #{site.id}) does not have any recorded stats. Removing it." ) - if site_import.legacy do + if site.imported_data && site_import.legacy && + site_import.status == Imported.SiteImport.completed() do clear_imported_data(site, dry_run?) end @@ -98,6 +101,13 @@ defmodule Plausible.DataMigration.SiteImports do |> Ecto.Changeset.change(end_date: end_date) |> update!(dry_run?) + if site.imported_data && site_import.legacy && + site_import.status == Imported.SiteImport.completed() do + site + |> Ecto.Changeset.change(imported_data: %{end_date: end_date}) + |> update!(dry_run?) + end + IO.puts( "End date of site import #{site_import.id} (site ID #{site.id}) adjusted to #{end_date}" ) diff --git a/test/plausible/data_migration/site_imports_test.exs b/test/plausible/data_migration/site_imports_test.exs index a99ded097..e1bf730f9 100644 --- a/test/plausible/data_migration/site_imports_test.exs +++ b/test/plausible/data_migration/site_imports_test.exs @@ -47,6 +47,7 @@ defmodule Plausible.DataMigration.SiteImportsTest do assert id > 0 assert site_import.start_date == site.imported_data.start_date assert site_import.end_date == ~D[2021-01-07] + assert site.imported_data.end_date == ~D[2021-01-07] assert site_import.source == :universal_analytics end @@ -64,8 +65,11 @@ defmodule Plausible.DataMigration.SiteImportsTest do assert :ok = SiteImports.run() end) =~ "Processing 1 sites" + site = Repo.reload!(site) + assert [%{id: id, legacy: true}] = Imported.list_all_imports(site) assert id == 0 + assert site.imported_data.end_date == ~D[2021-01-08] end test "does not set end date to latter than the current one" do @@ -88,6 +92,7 @@ defmodule Plausible.DataMigration.SiteImportsTest do assert id > 0 assert site_import.start_date == site.imported_data.start_date assert site_import.end_date == ~D[2021-01-08] + assert site.imported_data.end_date == ~D[2021-01-08] assert site_import.source == :universal_analytics end @@ -105,6 +110,7 @@ defmodule Plausible.DataMigration.SiteImportsTest do site = Repo.reload!(site) assert [] = Imported.list_all_imports(site) + assert site.imported_data == nil end test "leaves site and imports unchanged if everything fits" do