Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
APIv2: visit:country_name, visit:region_name, visit:city_name dimensions (#4328)
Karl-Aksel Puulmannee3d1e770ec3
diff --git a/config/runtime.exs b/config/runtime.exsindex 1458d5725a..b0572c3090 100644--- a/config/runtime.exs+++ b/config/runtime.exs@@ -589,7 +589,9 @@ base_cron = [# Every day at 1am{"0 1 * * *", Plausible.Workers.CleanInvitations},# Every 2 hours- {"0 */2 * * *", Plausible.Workers.ExpireDomainChangeTransitions}+ {"0 */2 * * *", Plausible.Workers.ExpireDomainChangeTransitions},+ # Daily at midnight+ {"0 0 * * *", Plausible.Workers.LocationsSync}]cloud_cron = [@@ -621,7 +623,9 @@ base_queues = [analytics_exports: 1,notify_exported_analytics: 1,domain_change_transition: 1,- check_accept_traffic_until: 1+ check_accept_traffic_until: 1,+ clickhouse_clean_sites: 1,+ locations_sync: 1]cloud_queues = [diff --git a/lib/mix/tasks/clean_clickhouse.ex b/lib/mix/tasks/clean_clickhouse.exindex 71b984b492..16731c9764 100644--- a/lib/mix/tasks/clean_clickhouse.ex+++ b/lib/mix/tasks/clean_clickhouse.ex@@ -6,7 +6,7 @@ defmodule Mix.Tasks.CleanClickhouse dodef run(_) do%{rows: rows} = IngestRepo.query!("show tables")tables = Enum.map(rows, fn [table] -> table end)- to_truncate = tables -- ["schema_migrations"]+ to_truncate = tables -- ["schema_migrations", "location_data", "location_data_dict"]Enum.each(to_truncate, fn table ->IngestRepo.query!("truncate #{table}")diff --git a/lib/plausible/clickhouse_location_data.ex b/lib/plausible/clickhouse_location_data.exnew file mode 100644index 0000000000..cb936d2b5f--- /dev/null+++ b/lib/plausible/clickhouse_location_data.ex@@ -0,0 +1,16 @@+defmodule Plausible.ClickhouseLocationData do+ @moduledoc """+ Schema for storing location id <-> translation mappings in ClickHouse++ Indirectly read via dictionary `location_data_dictionary` in ALIAS columns in+ `events_v2`, `sessions_v2` and `imported_locations` table.+ """+ use Ecto.Schema++ @primary_key false+ schema "location_data" do+ field :type, Ch, type: "LowCardinality(String)"+ field :id, :string+ field :name, :string+ end+enddiff --git a/lib/plausible/data_migration/locations_sync.ex b/lib/plausible/data_migration/locations_sync.exnew file mode 100644index 0000000000..9b81179c84--- /dev/null+++ b/lib/plausible/data_migration/locations_sync.ex@@ -0,0 +1,140 @@+defmodule Plausible.DataMigration.LocationsSync do+ @moduledoc """+ ClickHouse locations data migration for storing location names in ClickHouse.++ Only run when `Location.version()` changes: either as a migration or in cron.++ The migration:+ 1. Truncates existing `location_data` table (if exists)+ 2. Creates new table (if needed)+ 3. Inserts new data from Location module+ 4. (Re-)Creates dictionary to read location data from table+ 5. Creates ALIAS columns in `events_v2`, `sessions_v2` and `imported_locations` table to make reading location names easy+ 6. Updates table comment for `location_data` to indicate last version synced.++ Note that the dictionary is large enough to cache the whole dataset in memory, making lookups fast.++ This migration is intended to be idempotent and rerunnable - if run multiple times, it should always set things to the same+ result as if run once.++ SQL files available at: priv/data_migrations/LocationsSync/sql+ """+ alias Plausible.ClickhouseLocationData++ use Plausible.DataMigration, dir: "LocationsSync", repo: Plausible.IngestRepo++ @columns [+ %{+ table: "events_v2",+ column_name: "country_name",+ type: "country",+ input_column: "country_code"+ },+ %{+ table: "events_v2",+ column_name: "region_name",+ type: "subdivision",+ input_column: "subdivision1_code"+ },+ %{+ table: "events_v2",+ column_name: "city_name",+ type: "city",+ input_column: "city_geoname_id"+ },+ %{+ table: "sessions_v2",+ column_name: "country_name",+ type: "country",+ input_column: "country_code"+ },+ %{+ table: "sessions_v2",+ column_name: "region_name",+ type: "subdivision",+ input_column: "subdivision1_code"+ },+ %{+ table: "sessions_v2",+ column_name: "city_name",+ type: "city",+ input_column: "city_geoname_id"+ },+ %{+ table: "imported_locations",+ column_name: "country_name",+ type: "country",+ input_column: "country"+ },+ %{+ table: "imported_locations",+ column_name: "region_name",+ type: "subdivision",+ input_column: "region"+ },+ %{+ table: "imported_locations",+ column_name: "city_name",+ type: "city",+ input_column: "city"+ }+ ]++ def out_of_date?() do+ case run_sql("get-location-data-table-comment") do+ {:ok, %{rows: [[stored_version]]}} -> stored_version != Location.version()+ _ -> true+ end+ end++ def run() do+ cluster? = Plausible.MigrationUtils.clustered_table?("sessions_v2")++ {:ok, _} = run_sql("truncate-location-data-table", cluster?: cluster?)+ {:ok, _} = run_sql("create-location-data-table", cluster?: cluster?)++ countries =+ Location.Country.all()+ |> Enum.map(fn %Location.Country{alpha_2: alpha_2, name: name} ->+ %{type: "country", id: alpha_2, name: name}+ end)++ subdivisions =+ Location.Subdivision.all()+ |> Enum.map(fn %Location.Subdivision{code: code, name: name} ->+ %{type: "subdivision", id: code, name: name}+ end)++ cities =+ Location.City.all()+ |> Enum.map(fn %Location.City{id: id, name: name} ->+ %{type: "city", id: Integer.to_string(id), name: name}+ end)++ insert_data = Enum.concat([countries, subdivisions, cities])+ @repo.insert_all(ClickhouseLocationData, insert_data)++ {:ok, _} =+ run_sql("update-location-data-dictionary",+ cluster?: cluster?,+ dictionary_connection_params: Plausible.MigrationUtils.dictionary_connection_params()+ )++ for column <- @columns do+ {:ok, _} =+ run_sql("add-alias-column",+ cluster?: cluster?,+ table: column.table,+ column_name: column.column_name,+ type: column.type,+ input_column: column.input_column+ )+ end++ {:ok, _} =+ run_sql("update-location-data-table-comment",+ cluster?: cluster?,+ version: Location.version()+ )+ end+enddiff --git a/lib/plausible/data_migration/populate_event_session_columns.ex b/lib/plausible/data_migration/populate_event_session_columns.exindex 818f995007..796fc0435d 100644--- a/lib/plausible/data_migration/populate_event_session_columns.ex+++ b/lib/plausible/data_migration/populate_event_session_columns.ex@@ -28,7 +28,11 @@ defmodule Plausible.DataMigration.PopulateEventSessionColumns dorun_sql("create-sessions-dictionary",cluster?: cluster?,dictionary_connection_params:- Keyword.get(opts, :dictionary_connection_string, dictionary_connection_params()),+ Keyword.get(+ opts,+ :dictionary_connection_string,+ Plausible.MigrationUtils.dictionary_connection_params()+ ),dictionary_config: dictionary_config(opts))@@ -136,19 +140,6 @@ defmodule Plausible.DataMigration.PopulateEventSessionColumns do|> Map.merge(Keyword.get(opts, :dictionary_config, %{}))end- # See https://clickhouse.com/docs/en/sql-reference/dictionaries#clickhouse for context- defp dictionary_connection_params() do- Plausible.IngestRepo.config()- |> Enum.map(fn- {:database, database} -> "DB '#{database}'"- {:username, username} -> "USER '#{username}'"- {:password, password} -> "PASSWORD '#{password}'"- _ -> nil- end)- |> Enum.reject(&is_nil/1)- |> Enum.join(" ")- end-defp get_partitions(opts) do[min_partition, max_partition] = Keyword.get(opts, :partition_range, ["0", "999999"])diff --git a/lib/plausible/migration_utils.ex b/lib/plausible/migration_utils.exindex ac416a389a..a5f4eba6bf 100644--- a/lib/plausible/migration_utils.ex+++ b/lib/plausible/migration_utils.ex@@ -13,4 +13,17 @@ defmodule Plausible.MigrationUtils do{:ok, _} -> trueendend++ # See https://clickhouse.com/docs/en/sql-reference/dictionaries#clickhouse for context+ def dictionary_connection_params() do+ Plausible.IngestRepo.config()+ |> Enum.map(fn+ {:database, database} -> "DB '#{database}'"+ {:username, username} -> "USER '#{username}'"+ {:password, password} -> "PASSWORD '#{password}'"+ _ -> nil+ end)+ |> Enum.reject(&is_nil/1)+ |> Enum.join(" ")+ endenddiff --git a/lib/plausible/stats/filters/filters.ex b/lib/plausible/stats/filters/filters.exindex 60c1575fc8..5195dd3a4e 100644--- a/lib/plausible/stats/filters/filters.ex+++ b/lib/plausible/stats/filters/filters.ex@@ -23,6 +23,9 @@ defmodule Plausible.Stats.Filters do:country,:region,:city,+ :country_name,+ :region_name,+ :city_name,:entry_page,:exit_page,:entry_page_hostname,diff --git a/lib/plausible/stats/imported/base.ex b/lib/plausible/stats/imported/base.exindex 2fb5affd6c..5bc46d07ee 100644--- a/lib/plausible/stats/imported/base.ex+++ b/lib/plausible/stats/imported/base.ex@@ -21,6 +21,9 @@ defmodule Plausible.Stats.Imported.Base do"visit:country" => "imported_locations","visit:region" => "imported_locations","visit:city" => "imported_locations",+ "visit:country_name" => "imported_locations",+ "visit:region_name" => "imported_locations",+ "visit:city_name" => "imported_locations","visit:device" => "imported_devices","visit:browser" => "imported_browsers","visit:browser_version" => "imported_browsers",diff --git a/lib/plausible/stats/imported/sql/builder.ex b/lib/plausible/stats/imported/sql/builder.exindex 557b95b27b..96a846121c 100644--- a/lib/plausible/stats/imported/sql/builder.ex+++ b/lib/plausible/stats/imported/sql/builder.ex@@ -318,6 +318,10 @@ defmodule Plausible.Stats.Imported.SQL.Builder dodefp filter_group_values(q, "visit:region"), do: where(q, [i], i.region != "")defp filter_group_values(q, "visit:city"), do: where(q, [i], i.city != 0 and not is_nil(i.city))+ defp filter_group_values(q, "visit:country_name"), do: where(q, [i], i.country_name != "ZZ")+ defp filter_group_values(q, "visit:region_name"), do: where(q, [i], i.region_name != "")+ defp filter_group_values(q, "visit:city_name"), do: where(q, [i], i.city_name != "")+defp filter_group_values(q, _dimension), do: qdef select_joined_dimensions(q, query) dodiff --git a/lib/plausible/stats/sql/expression.ex b/lib/plausible/stats/sql/expression.exindex 7d5d21aae6..146eae8fee 100644--- a/lib/plausible/stats/sql/expression.ex+++ b/lib/plausible/stats/sql/expression.ex@@ -187,6 +187,15 @@ defmodule Plausible.Stats.SQL.Expression dodef select_dimension(q, key, "visit:city", _table, _query),do: select_merge_as(q, [t], %{key => t.city})+ def select_dimension(q, key, "visit:country_name", _table, _query),+ do: select_merge_as(q, [t], %{key => t.country_name})++ def select_dimension(q, key, "visit:region_name", _table, _query),+ do: select_merge_as(q, [t], %{key => t.region_name})++ def select_dimension(q, key, "visit:city_name", _table, _query),+ do: select_merge_as(q, [t], %{key => t.city_name})+def event_metric(:pageviews) dowrap_alias([e], %{pageviews:diff --git a/lib/workers/locations_sync.ex b/lib/workers/locations_sync.exnew file mode 100644index 0000000000..a261af3261--- /dev/null+++ b/lib/workers/locations_sync.ex@@ -0,0 +1,15 @@+defmodule Plausible.Workers.LocationsSync do+ @moduledoc false++ use Plausible.Repo+ use Oban.Worker, queue: :locations_sync++ @impl Oban.Worker+ def perform(_job) do+ if Plausible.DataMigration.LocationsSync.out_of_date?() do+ Plausible.DataMigration.LocationsSync.run()+ end++ :ok+ end+enddiff --git a/mix.lock b/mix.lockindex 947382e3e4..ed608a6ff9 100644--- a/mix.lock+++ b/mix.lock@@ -72,7 +72,7 @@"joken": {:hex, :joken, "2.6.0", "b9dd9b6d52e3e6fcb6c65e151ad38bf4bc286382b5b6f97079c47ade6b1bcc6a", [:mix], [{:jose, "~> 1.11.5", [hex: :jose, repo: "hexpm", optional: false]}], "hexpm", "5a95b05a71cd0b54abd35378aeb1d487a23a52c324fa7efdffc512b655b5aaa7"},"jose": {:hex, :jose, "1.11.6", "613fda82552128aa6fb804682e3a616f4bc15565a048dabd05b1ebd5827ed965", [:mix, :rebar3], [], "hexpm", "6275cb75504f9c1e60eeacb771adfeee4905a9e182103aa59b53fed651ff9738"},"kaffy": {:hex, :kaffy, "0.10.2", "72e807c525323bd0cbc3ac0c127b7bde61caffdc576fb6554964d3fe6a2a6100", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0.2", [hex: :phoenix_view, repo: "hexpm", optional: false]}], "hexpm", "651cad5f3bcc91510a671c13c7a273b8b8195fdf2d809208708baecbb77300bf"},- "location": {:git, "https://github.com/plausible/location.git", "eddd52590f2423cd677d9206787468e1fb018668", []},+ "location": {:git, "https://github.com/plausible/location.git", "a89bf79985c3c3d0830477ae587001156a646ce8", []},"locus": {:hex, :locus, "2.3.6", "c9f53fd5df872fca66a54dc0aa2f8b2d3640388e56a0c39a741be0df6d8854bf", [:rebar3], [{:tls_certificate_check, "~> 1.9", [hex: :tls_certificate_check, repo: "hexpm", optional: false]}], "hexpm", "6087aa9a69673e7011837fb4b3d7f756560adde76892c32f5f93904ee30064e2"},"mail": {:hex, :mail, "0.3.1", "cb0a14e4ed8904e4e5a08214e686ccf6f9099346885db17d8c309381f865cc5c", [:mix], [], "hexpm", "1db701e89865c1d5fa296b2b57b1cd587587cca8d8a1a22892b35ef5a8e352a6"},"makeup": {:hex, :makeup, "1.1.1", "fa0bc768698053b2b3869fa8a62616501ff9d11a562f3ce39580d60860c3a55e", [:mix], [{:nimble_parsec, "~> 1.2.2 or ~> 1.3", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "5dc62fbdd0de44de194898b6710692490be74baa02d9d108bc29f007783b0b48"},diff --git a/priv/data_migrations/LocationsSync/sql/add-alias-column.sql.eex b/priv/data_migrations/LocationsSync/sql/add-alias-column.sql.eexnew file mode 100644index 0000000000..36c77dab8f--- /dev/null+++ b/priv/data_migrations/LocationsSync/sql/add-alias-column.sql.eex@@ -0,0 +1,5 @@+ALTER TABLE <%= @table %>+<%= if @cluster? do %>ON CLUSTER '{cluster}'<% end %>+ADD COLUMN IF NOT EXISTS+<%= @column_name %> String+ALIAS dictGet('location_data_dict', 'name', tuple('<%= @type %>', <%= @input_column %>))diff --git a/priv/data_migrations/LocationsSync/sql/create-location-data-table.sql.eex b/priv/data_migrations/LocationsSync/sql/create-location-data-table.sql.eexnew file mode 100644index 0000000000..db2f3ebb91--- /dev/null+++ b/priv/data_migrations/LocationsSync/sql/create-location-data-table.sql.eex@@ -0,0 +1,13 @@+CREATE TABLE IF NOT EXISTS location_data <%= if @cluster? do %>ON CLUSTER '{cluster}'<% end %>+(+ `type` LowCardinality(String),+ `id` String,+ `name` String+)+<%= if @cluster? do %>+ENGINE = ReplicateMergeTree('/clickhouse/{cluster}/tables/{shard}/plausible_prod/location_data', '{replica}')+<% else %>+ENGINE = MergeTree()+<% end %>+ORDER BY (type, id)+SETTINGS index_granularity = 128diff --git a/priv/data_migrations/LocationsSync/sql/get-location-data-table-comment.sql.eex b/priv/data_migrations/LocationsSync/sql/get-location-data-table-comment.sql.eexnew file mode 100644index 0000000000..8d8acc1e4a--- /dev/null+++ b/priv/data_migrations/LocationsSync/sql/get-location-data-table-comment.sql.eex@@ -0,0 +1 @@+select comment from system.tables where database = currentDatabase() and table = 'location_data'diff --git a/priv/data_migrations/LocationsSync/sql/truncate-location-data-table.sql.eex b/priv/data_migrations/LocationsSync/sql/truncate-location-data-table.sql.eexnew file mode 100644index 0000000000..852d56c11f--- /dev/null+++ b/priv/data_migrations/LocationsSync/sql/truncate-location-data-table.sql.eex@@ -0,0 +1 @@+TRUNCATE TABLE IF EXISTS location_data <%= if @cluster? do %>ON CLUSTER '{cluster}'<% end %>diff --git a/priv/data_migrations/LocationsSync/sql/update-location-data-dictionary.sql.eex b/priv/data_migrations/LocationsSync/sql/update-location-data-dictionary.sql.eexnew file mode 100644index 0000000000..1b24d16d30--- /dev/null+++ b/priv/data_migrations/LocationsSync/sql/update-location-data-dictionary.sql.eex@@ -0,0 +1,11 @@+CREATE OR REPLACE DICTIONARY location_data_dict+<%= if @cluster? do %>ON CLUSTER '{cluster}'<% end %>+(+ `type` String,+ `id` String,+ `name` String+)+PRIMARY KEY type, id+SOURCE(CLICKHOUSE(TABLE location_data <%= @dictionary_connection_params %>))+LIFETIME(0)+LAYOUT(complex_key_cache(size_in_cells 500000))diff --git a/priv/data_migrations/LocationsSync/sql/update-location-data-table-comment.sql.eex b/priv/data_migrations/LocationsSync/sql/update-location-data-table-comment.sql.eexnew file mode 100644index 0000000000..94b3c081af--- /dev/null+++ b/priv/data_migrations/LocationsSync/sql/update-location-data-table-comment.sql.eex@@ -0,0 +1,3 @@+ALTER TABLE location_data+<%= if @cluster? do %>ON CLUSTER '{cluster}'<% end %>+MODIFY COMMENT '<%= @version %>'diff --git a/priv/ingest_repo/migrations/20240709181437_populate_location_data.exs b/priv/ingest_repo/migrations/20240709181437_populate_location_data.exsnew file mode 100644index 0000000000..8bb0fb126a--- /dev/null+++ b/priv/ingest_repo/migrations/20240709181437_populate_location_data.exs@@ -0,0 +1,18 @@+defmodule Plausible.IngestRepo.Migrations.PopulateLocationData do+ use Ecto.Migration++ def up do+ try do+ Location.load_all()+ rescue+ # Already loaded+ ArgumentError -> nil+ end++ Plausible.DataMigration.LocationsSync.run()+ end++ def down do+ raise "Irreversible"+ end+enddiff --git a/test/plausible_web/controllers/api/external_stats_controller/query_imported_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_imported_test.exsindex 2e395a6acd..82f87a9cb6 100644--- a/test/plausible_web/controllers/api/external_stats_controller/query_imported_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/query_imported_test.exs@@ -674,7 +674,10 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryImportedTest dofor {dimension, stats_value, imports_value} <- [{"visit:country", "DE", "EE"},{"visit:region", "DE-BE", "EE-37"},- {"visit:city", 2_950_159, 588_409}+ {"visit:city", 2_950_159, 588_409},+ {"visit:country_name", "Germany", "Estonia"},+ {"visit:region_name", "Berlin", "Harjumaa"},+ {"visit:city_name", "Berlin", "Tallinn"}] doconn =post(conn, "/api/v2/query", %{@@ -691,5 +694,53 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryImportedTest do]endend++ test "imported country and city names", %{+ site: site,+ conn: conn+ } do+ site_import = insert(:site_import, site: site)++ populate_stats(site, site_import.id, [+ build(:pageview,+ country_code: "GB",+ # London+ city_geoname_id: 2_643_743+ ),+ build(:pageview,+ country_code: "CA",+ # Different London+ city_geoname_id: 6_058_560+ ),+ build(:imported_locations, country: "GB", city: 2_643_743, visitors: 33)+ ])++ conn =+ post(conn, "/api/v2/query", %{+ "site_id" => site.domain,+ "metrics" => ["visitors"],+ "date_range" => "all",+ "dimensions" => ["visit:city_name"],+ "include" => %{"imports" => true}+ })++ assert json_response(conn, 200)["results"] == [+ %{"dimensions" => ["London"], "metrics" => [35]}+ ]++ conn =+ post(conn, "/api/v2/query", %{+ "site_id" => site.domain,+ "metrics" => ["visitors"],+ "date_range" => "all",+ "dimensions" => ["visit:city_name", "visit:country_name"],+ "include" => %{"imports" => true}+ })++ assert json_response(conn, 200)["results"] == [+ %{"dimensions" => ["London", "United Kingdom"], "metrics" => [34]},+ %{"dimensions" => ["London", "Canada"], "metrics" => [1]}+ ]+ endendenddiff --git a/test/plausible_web/controllers/api/external_stats_controller/query_test.exs b/test/plausible_web/controllers/api/external_stats_controller/query_test.exsindex 9e574f464b..0c64082ac2 100644--- a/test/plausible_web/controllers/api/external_stats_controller/query_test.exs+++ b/test/plausible_web/controllers/api/external_stats_controller/query_test.exs@@ -2920,4 +2920,60 @@ defmodule PlausibleWeb.Api.ExternalStatsController.QueryTest do%{"dimensions" => ["2021-01-03 00:00:00", "Twitter"], "metrics" => [1]}]end++ test "filtering by visit:country_name, visit:region_name, visit:city_name", %{+ conn: conn,+ site: site+ } do+ populate_stats(site, [+ # GB, London+ build(:pageview,+ country_code: "GB",+ subdivision1_code: "GB-LND",+ city_geoname_id: 2_643_743+ ),+ # CA, London+ build(:pageview,+ country_code: "CA",+ subdivision1_code: "CA-ON",+ city_geoname_id: 6_058_560+ ),+ # EE, Tallinn+ build(:pageview,+ country_code: "EE",+ subdivision1_code: "EE-37",+ city_geoname_id: 588_409+ ),+ # EE, Tartu+ build(:pageview,+ country_code: "EE",+ subdivision1_code: "EE-79",+ city_geoname_id: 588_335+ ),+ # EE, Jõgeva+ build(:pageview,+ country_code: "EE",+ subdivision1_code: "EE-50",+ city_geoname_id: 591_902+ )+ ])++ conn =+ post(conn, "/api/v2/query", %{+ "site_id" => site.domain,+ "date_range" => "all",+ "metrics" => ["pageviews"],+ "filters" => [+ ["is", "visit:country_name", ["Estonia", "United Kingdom"]],+ ["is_not", "visit:region_name", ["Tartumaa"]],+ ["contains", "visit:city_name", ["n"]]+ ],+ "dimensions" => ["visit:country_name", "visit:region_name", "visit:city_name"]+ })++ assert json_response(conn, 200)["results"] == [+ %{"dimensions" => ["Estonia", "Harjumaa", "Tallinn"], "metrics" => [1]},+ %{"dimensions" => ["United Kingdom", "London", "London"], "metrics" => [1]}+ ]+ endend