From f9630e5b4602ba9fa9e7f1c7b5fc84ca1e7fbe87 Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Fri, 5 Apr 2024 12:58:26 +0200 Subject: [PATCH] Clear `sites.imported_data` after backfilling site imports in data migration script --- lib/plausible/data_migration/site_imports.ex | 10 +++++----- test/plausible/data_migration/site_imports_test.exs | 10 +++++++--- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/lib/plausible/data_migration/site_imports.ex b/lib/plausible/data_migration/site_imports.ex index fc4c91b2d..a79d7df29 100644 --- a/lib/plausible/data_migration/site_imports.ex +++ b/lib/plausible/data_migration/site_imports.ex @@ -77,10 +77,6 @@ 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 - clear_imported_data(site, dry_run?) - end - delete!(site_import, dry_run?) else end_date = @@ -104,7 +100,11 @@ defmodule Plausible.DataMigration.SiteImports do end end - IO.puts("Done processing site ID #{site.id}") + clear_imported_data(site, dry_run?) + + IO.puts( + "Done processing site ID #{site.id} (site.imported_data: #{inspect(site.imported_data)})" + ) end IO.puts("Finished") diff --git a/test/plausible/data_migration/site_imports_test.exs b/test/plausible/data_migration/site_imports_test.exs index a99ded097..bb1550da6 100644 --- a/test/plausible/data_migration/site_imports_test.exs +++ b/test/plausible/data_migration/site_imports_test.exs @@ -43,9 +43,11 @@ defmodule Plausible.DataMigration.SiteImportsTest do site = Repo.reload!(site) + assert site.imported_data == nil + assert [%{id: id, legacy: true} = site_import] = Imported.list_all_imports(site) assert id > 0 - assert site_import.start_date == site.imported_data.start_date + assert site_import.start_date == ~D[2021-01-02] assert site_import.end_date == ~D[2021-01-07] assert site_import.source == :universal_analytics end @@ -84,9 +86,10 @@ defmodule Plausible.DataMigration.SiteImportsTest do site = Repo.reload!(site) + assert site.imported_data == nil assert [%{id: id, legacy: true} = site_import] = Imported.list_all_imports(site) assert id > 0 - assert site_import.start_date == site.imported_data.start_date + assert site_import.start_date == ~D[2021-01-02] assert site_import.end_date == ~D[2021-01-08] assert site_import.source == :universal_analytics end @@ -132,9 +135,10 @@ defmodule Plausible.DataMigration.SiteImportsTest do site = Repo.reload!(site) + assert site.imported_data == nil assert [%{id: id, legacy: true} = site_import] = Imported.list_all_imports(site) assert id == existing_import.id - assert site_import.start_date == site.imported_data.start_date + assert site_import.start_date == ~D[2021-01-02] assert site_import.end_date == ~D[2021-01-08] assert site_import.source == :universal_analytics end