From 0a99f958e7954292b168ffaacea62fb38c92d305 Mon Sep 17 00:00:00 2001 From: Adrian Gruntkowski Date: Wed, 3 Apr 2024 16:44:47 +0200 Subject: [PATCH] Populate newly added `Imported*` fields in GA4 imports --- fixture/ga4_report_imported_browsers.json | 87 ++++++- fixture/ga4_report_imported_devices.json | 72 +++++- fixture/ga4_report_imported_entry_pages.json | 72 +++++- fixture/ga4_report_imported_locations.json | 84 +++++- ...ga4_report_imported_operating_systems.json | 127 +++++++++- fixture/ga4_report_imported_pages.json | 84 +++++- fixture/ga4_report_imported_sources.json | 239 +++++++++++++++++- fixture/ga4_report_imported_visitors.json | 50 +++- lib/plausible/google/ga4/report_request.ex | 21 +- lib/plausible/imported/google_analytics4.ex | 27 +- .../imported/google_analytics4_test.exs | 16 +- 11 files changed, 849 insertions(+), 30 deletions(-) diff --git a/fixture/ga4_report_imported_browsers.json b/fixture/ga4_report_imported_browsers.json index 214ac2b26..e7dbdc699 100644 --- a/fixture/ga4_report_imported_browsers.json +++ b/fixture/ga4_report_imported_browsers.json @@ -16,6 +16,10 @@ "timeZone": "Europe/Warsaw" }, "metricHeaders": [ + { + "name": "screenPageViews", + "type": "TYPE_INTEGER" + }, { "name": "totalUsers", "type": "TYPE_INTEGER" @@ -33,8 +37,62 @@ "type": "TYPE_SECONDS" } ], - "rowCount": 5, + "rowCount": 7, "rows": [ + { + "dimensionValues": [ + { + "value": "20240403" + }, + { + "value": "Chrome" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240402" + }, + { + "value": "Chrome" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, { "dimensionValues": [ { @@ -54,6 +112,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -78,6 +139,9 @@ { "value": "2" }, + { + "value": "2" + }, { "value": "0" } @@ -89,21 +153,24 @@ "value": "20240222" }, { - "value": "Chrome" + "value": "Firefox" } ], "metricValues": [ { - "value": "1" + "value": "7" }, { "value": "1" }, + { + "value": "2" + }, { "value": "0" }, { - "value": "4" + "value": "21" } ] }, @@ -113,21 +180,24 @@ "value": "20240222" }, { - "value": "Firefox" + "value": "Chrome" } ], "metricValues": [ + { + "value": "4" + }, { "value": "1" }, { - "value": "2" + "value": "1" }, { "value": "0" }, { - "value": "21" + "value": "4" } ] }, @@ -141,6 +211,9 @@ } ], "metricValues": [ + { + "value": "2" + }, { "value": "1" }, diff --git a/fixture/ga4_report_imported_devices.json b/fixture/ga4_report_imported_devices.json index e8bcc0104..4bd72aa22 100644 --- a/fixture/ga4_report_imported_devices.json +++ b/fixture/ga4_report_imported_devices.json @@ -16,6 +16,10 @@ "timeZone": "Europe/Warsaw" }, "metricHeaders": [ + { + "name": "screenPageViews", + "type": "TYPE_INTEGER" + }, { "name": "totalUsers", "type": "TYPE_INTEGER" @@ -33,8 +37,62 @@ "type": "TYPE_SECONDS" } ], - "rowCount": 4, + "rowCount": 6, "rows": [ + { + "dimensionValues": [ + { + "value": "20240403" + }, + { + "value": "desktop" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240402" + }, + { + "value": "desktop" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, { "dimensionValues": [ { @@ -54,6 +112,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -78,6 +139,9 @@ { "value": "2" }, + { + "value": "2" + }, { "value": "0" } @@ -93,6 +157,9 @@ } ], "metricValues": [ + { + "value": "11" + }, { "value": "2" }, @@ -117,6 +184,9 @@ } ], "metricValues": [ + { + "value": "2" + }, { "value": "1" }, diff --git a/fixture/ga4_report_imported_entry_pages.json b/fixture/ga4_report_imported_entry_pages.json index 77370bb30..cad10b32e 100644 --- a/fixture/ga4_report_imported_entry_pages.json +++ b/fixture/ga4_report_imported_entry_pages.json @@ -16,6 +16,10 @@ "timeZone": "Europe/Warsaw" }, "metricHeaders": [ + { + "name": "screenPageViews", + "type": "TYPE_INTEGER" + }, { "name": "totalUsers", "type": "TYPE_INTEGER" @@ -33,8 +37,62 @@ "type": "TYPE_INTEGER" } ], - "rowCount": 4, + "rowCount": 6, "rows": [ + { + "dimensionValues": [ + { + "value": "20240403" + }, + { + "value": "/" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + }, + { + "value": "1" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240402" + }, + { + "value": "/" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + }, + { + "value": "1" + } + ] + }, { "dimensionValues": [ { @@ -51,6 +109,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" }, @@ -75,6 +136,9 @@ { "value": "2" }, + { + "value": "2" + }, { "value": "0" }, @@ -93,6 +157,9 @@ } ], "metricValues": [ + { + "value": "9" + }, { "value": "2" }, @@ -117,6 +184,9 @@ } ], "metricValues": [ + { + "value": "4" + }, { "value": "1" }, diff --git a/fixture/ga4_report_imported_locations.json b/fixture/ga4_report_imported_locations.json index b731a2102..e803d00c2 100644 --- a/fixture/ga4_report_imported_locations.json +++ b/fixture/ga4_report_imported_locations.json @@ -22,6 +22,10 @@ "timeZone": "Europe/Warsaw" }, "metricHeaders": [ + { + "name": "screenPageViews", + "type": "TYPE_INTEGER" + }, { "name": "totalUsers", "type": "TYPE_INTEGER" @@ -39,8 +43,74 @@ "type": "TYPE_SECONDS" } ], - "rowCount": 4, + "rowCount": 6, "rows": [ + { + "dimensionValues": [ + { + "value": "20240403" + }, + { + "value": "US" + }, + { + "value": "California" + }, + { + "value": "San Francisco" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240402" + }, + { + "value": "US" + }, + { + "value": "California" + }, + { + "value": "(not set)" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, { "dimensionValues": [ { @@ -66,6 +136,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -96,6 +169,9 @@ { "value": "2" }, + { + "value": "2" + }, { "value": "0" } @@ -117,6 +193,9 @@ } ], "metricValues": [ + { + "value": "11" + }, { "value": "2" }, @@ -147,6 +226,9 @@ } ], "metricValues": [ + { + "value": "2" + }, { "value": "1" }, diff --git a/fixture/ga4_report_imported_operating_systems.json b/fixture/ga4_report_imported_operating_systems.json index 158fe1efa..a7376b9fe 100644 --- a/fixture/ga4_report_imported_operating_systems.json +++ b/fixture/ga4_report_imported_operating_systems.json @@ -8,6 +8,9 @@ }, { "name": "operatingSystem" + }, + { + "name": "operatingSystemVersion" } ], "kind": "analyticsData#runReport", @@ -16,6 +19,10 @@ "timeZone": "Europe/Warsaw" }, "metricHeaders": [ + { + "name": "screenPageViews", + "type": "TYPE_INTEGER" + }, { "name": "totalUsers", "type": "TYPE_INTEGER" @@ -33,8 +40,68 @@ "type": "TYPE_SECONDS" } ], - "rowCount": 4, + "rowCount": 7, "rows": [ + { + "dimensionValues": [ + { + "value": "20240403" + }, + { + "value": "Windows" + }, + { + "value": "10" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240402" + }, + { + "value": "Windows" + }, + { + "value": "10" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, { "dimensionValues": [ { @@ -42,6 +109,9 @@ }, { "value": "iOS" + }, + { + "value": "17.3.1" } ], "metricValues": [ @@ -54,6 +124,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -66,6 +139,9 @@ }, { "value": "Windows" + }, + { + "value": "10" } ], "metricValues": [ @@ -78,6 +154,9 @@ { "value": "2" }, + { + "value": "2" + }, { "value": "0" } @@ -90,20 +169,56 @@ }, { "value": "Macintosh" + }, + { + "value": "Intel 10.15" } ], "metricValues": [ + { + "value": "7" + }, + { + "value": "1" + }, { "value": "2" }, { - "value": "3" + "value": "0" + }, + { + "value": "21" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240222" + }, + { + "value": "Macintosh" + }, + { + "value": "Intel 13.6" + } + ], + "metricValues": [ + { + "value": "4" + }, + { + "value": "1" + }, + { + "value": "1" }, { "value": "0" }, { - "value": "25" + "value": "4" } ] }, @@ -114,9 +229,15 @@ }, { "value": "iOS" + }, + { + "value": "17.3.1" } ], "metricValues": [ + { + "value": "2" + }, { "value": "1" }, diff --git a/fixture/ga4_report_imported_pages.json b/fixture/ga4_report_imported_pages.json index f7be04f26..2fd1f58b9 100644 --- a/fixture/ga4_report_imported_pages.json +++ b/fixture/ga4_report_imported_pages.json @@ -27,13 +27,71 @@ "name": "screenPageViews", "type": "TYPE_INTEGER" }, + { + "name": "sessions", + "type": "TYPE_INTEGER" + }, { "name": "userEngagementDuration", "type": "TYPE_SECONDS" } ], - "rowCount": 8, + "rowCount": 10, "rows": [ + { + "dimensionValues": [ + { + "value": "20240403" + }, + { + "value": "drawer.todo.computer" + }, + { + "value": "/" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240402" + }, + { + "value": "drawer-4l3.pages.dev" + }, + { + "value": "/" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, { "dimensionValues": [ { @@ -53,6 +111,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -77,6 +138,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -101,6 +165,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -125,6 +192,9 @@ { "value": "3" }, + { + "value": "3" + }, { "value": "7" } @@ -149,6 +219,9 @@ { "value": "7" }, + { + "value": "3" + }, { "value": "21" } @@ -173,6 +246,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -197,6 +273,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "1" } @@ -221,6 +300,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } diff --git a/fixture/ga4_report_imported_sources.json b/fixture/ga4_report_imported_sources.json index 4c5edb517..525e81b5c 100644 --- a/fixture/ga4_report_imported_sources.json +++ b/fixture/ga4_report_imported_sources.json @@ -20,6 +20,9 @@ }, { "name": "sessionGoogleAdsKeyword" + }, + { + "name": "pageReferrer" } ], "kind": "analyticsData#runReport", @@ -28,6 +31,10 @@ "timeZone": "Europe/Warsaw" }, "metricHeaders": [ + { + "name": "screenPageViews", + "type": "TYPE_INTEGER" + }, { "name": "totalUsers", "type": "TYPE_INTEGER" @@ -45,8 +52,92 @@ "type": "TYPE_SECONDS" } ], - "rowCount": 3, + "rowCount": 8, "rows": [ + { + "dimensionValues": [ + { + "value": "20240403" + }, + { + "value": "(direct)" + }, + { + "value": "(none)" + }, + { + "value": "(direct)" + }, + { + "value": "(not set)" + }, + { + "value": "(not set)" + }, + { + "value": "" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240402" + }, + { + "value": "(direct)" + }, + { + "value": "(none)" + }, + { + "value": "(direct)" + }, + { + "value": "(not set)" + }, + { + "value": "(not set)" + }, + { + "value": "" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, { "dimensionValues": [ { @@ -66,6 +157,9 @@ }, { "value": "(not set)" + }, + { + "value": "" } ], "metricValues": [ @@ -78,6 +172,9 @@ { "value": "1" }, + { + "value": "1" + }, { "value": "0" } @@ -102,6 +199,9 @@ }, { "value": "(not set)" + }, + { + "value": "" } ], "metricValues": [ @@ -114,6 +214,9 @@ { "value": "2" }, + { + "value": "2" + }, { "value": "0" } @@ -138,9 +241,15 @@ }, { "value": "(not set)" + }, + { + "value": "" } ], "metricValues": [ + { + "value": "7" + }, { "value": "3" }, @@ -151,7 +260,133 @@ "value": "0" }, { - "value": "29" + "value": "11" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240222" + }, + { + "value": "(direct)" + }, + { + "value": "(none)" + }, + { + "value": "(direct)" + }, + { + "value": "(not set)" + }, + { + "value": "(not set)" + }, + { + "value": "https://drawer.todo.computer/" + } + ], + "metricValues": [ + { + "value": "4" + }, + { + "value": "2" + }, + { + "value": "3" + }, + { + "value": "0" + }, + { + "value": "17" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240222" + }, + { + "value": "(direct)" + }, + { + "value": "(none)" + }, + { + "value": "(direct)" + }, + { + "value": "(not set)" + }, + { + "value": "(not set)" + }, + { + "value": "https://drawer.todo.computer/blog/" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + }, + { + "value": "0" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240222" + }, + { + "value": "(direct)" + }, + { + "value": "(none)" + }, + { + "value": "(direct)" + }, + { + "value": "(not set)" + }, + { + "value": "(not set)" + }, + { + "value": "https://drawer.todo.computer/blog/unicode-in-elixir/" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + }, + { + "value": "1" } ] } diff --git a/fixture/ga4_report_imported_visitors.json b/fixture/ga4_report_imported_visitors.json index 78d29b5e7..c6488a690 100644 --- a/fixture/ga4_report_imported_visitors.json +++ b/fixture/ga4_report_imported_visitors.json @@ -34,8 +34,56 @@ "type": "TYPE_SECONDS" } ], - "rowCount": 3, + "rowCount": 5, "rows": [ + { + "dimensionValues": [ + { + "value": "20240403" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, + { + "dimensionValues": [ + { + "value": "20240402" + } + ], + "metricValues": [ + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "1" + }, + { + "value": "0" + } + ] + }, { "dimensionValues": [ { diff --git a/lib/plausible/google/ga4/report_request.ex b/lib/plausible/google/ga4/report_request.ex index b859f1789..35cc6e58a 100644 --- a/lib/plausible/google/ga4/report_request.ex +++ b/lib/plausible/google/ga4/report_request.ex @@ -46,9 +46,11 @@ defmodule Plausible.Google.GA4.ReportRequest do "sessionMedium", "sessionCampaignName", "sessionManualAdContent", - "sessionGoogleAdsKeyword" + "sessionGoogleAdsKeyword", + "pageReferrer" ], metrics: [ + "screenPageViews", "totalUsers", "sessions", "bounces = sessions - engagedSessions", @@ -59,12 +61,13 @@ defmodule Plausible.Google.GA4.ReportRequest do dataset: "imported_pages", dimensions: ["date", "hostName", "pagePath"], # NOTE: no exits as GA4 DATA API does not provide that metric - metrics: ["totalUsers", "screenPageViews", "userEngagementDuration"] + metrics: ["totalUsers", "screenPageViews", "sessions", "userEngagementDuration"] }, %__MODULE__{ dataset: "imported_entry_pages", dimensions: ["date", "landingPage"], metrics: [ + "screenPageViews", "totalUsers", "sessions", "userEngagementDuration", @@ -75,12 +78,19 @@ defmodule Plausible.Google.GA4.ReportRequest do # %__MODULE__{ # dataset: "imported_exit_pages", # dimensions: ["date", "ga:exitPagePath"], - # metrics: ["totalUsers", "sessions"] + # metrics: [ + # "totalUsers", + # "sessions", + # "screenPageViews", + # "userEngagementDuration", + # "bounces = sessions - engagedSessions" + # ] # }, %__MODULE__{ dataset: "imported_locations", dimensions: ["date", "countryId", "region", "city"], metrics: [ + "screenPageViews", "totalUsers", "sessions", "bounces = sessions - engagedSessions", @@ -91,6 +101,7 @@ defmodule Plausible.Google.GA4.ReportRequest do dataset: "imported_devices", dimensions: ["date", "deviceCategory"], metrics: [ + "screenPageViews", "totalUsers", "sessions", "bounces = sessions - engagedSessions", @@ -101,6 +112,7 @@ defmodule Plausible.Google.GA4.ReportRequest do dataset: "imported_browsers", dimensions: ["date", "browser"], metrics: [ + "screenPageViews", "totalUsers", "sessions", "bounces = sessions - engagedSessions", @@ -109,8 +121,9 @@ defmodule Plausible.Google.GA4.ReportRequest do }, %__MODULE__{ dataset: "imported_operating_systems", - dimensions: ["date", "operatingSystem"], + dimensions: ["date", "operatingSystem", "operatingSystemVersion"], metrics: [ + "screenPageViews", "totalUsers", "sessions", "bounces = sessions - engagedSessions", diff --git a/lib/plausible/imported/google_analytics4.ex b/lib/plausible/imported/google_analytics4.ex index 583242133..42235410b 100644 --- a/lib/plausible/imported/google_analytics4.ex +++ b/lib/plausible/imported/google_analytics4.ex @@ -5,6 +5,8 @@ defmodule Plausible.Imported.GoogleAnalytics4 do use Plausible.Imported.Importer + alias PlausibleWeb.RefInspector + @missing_values ["(none)", "(not set)", "(not provided)", "(other)"] @impl true @@ -96,17 +98,28 @@ defmodule Plausible.Imported.GoogleAnalytics4 do end defp new_from_report(site_id, import_id, "imported_sources", row) do + referrer_uri = row.dimensions |> Map.fetch!("pageReferrer") |> URI.parse() + + referrer = + if RefInspector.right_uri?(referrer_uri) do + RefInspector.format_referrer(referrer_uri) + end + %{ site_id: site_id, import_id: import_id, date: get_date(row), source: row.dimensions |> Map.fetch!("sessionSource") |> parse_referrer(), + referrer: referrer, + # Only `source` exists in GA4 API + utm_source: nil, utm_medium: row.dimensions |> Map.fetch!("sessionMedium") |> default_if_missing(), utm_campaign: row.dimensions |> Map.fetch!("sessionCampaignName") |> default_if_missing(), utm_content: row.dimensions |> Map.fetch!("sessionManualAdContent") |> default_if_missing(), utm_term: row.dimensions |> Map.fetch!("sessionGoogleAdsKeyword") |> default_if_missing(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), + pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() } @@ -120,6 +133,7 @@ defmodule Plausible.Imported.GoogleAnalytics4 do hostname: row.dimensions |> Map.fetch!("hostName") |> String.replace_prefix("www.", ""), page: row.dimensions |> Map.fetch!("pagePath") |> URI.parse() |> Map.get(:path), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), + visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), # NOTE: no exits metric in GA4 API currently exits: 0, @@ -136,6 +150,7 @@ defmodule Plausible.Imported.GoogleAnalytics4 do visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), entrances: row.metrics |> Map.fetch!("sessions") |> parse_number(), visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number(), + pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number() } end @@ -148,7 +163,10 @@ defmodule Plausible.Imported.GoogleAnalytics4 do # date: get_date(row), # exit_page: Map.fetch!(row.dimensions, "exitPage"), # visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), - # exits: row.metrics |> Map.fetch!("sessions") |> parse_number() + # exits: row.metrics |> Map.fetch!("sessions") |> parse_number(), + # visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number(), + # pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), + # bounces: row.metrics |> Map.fetch!("bounces") |> parse_number() # } # end @@ -166,6 +184,7 @@ defmodule Plausible.Imported.GoogleAnalytics4 do city: city_data && city_data.id, visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), + pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() } @@ -179,6 +198,7 @@ defmodule Plausible.Imported.GoogleAnalytics4 do device: row.dimensions |> Map.fetch!("deviceCategory") |> String.capitalize(), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), + pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() } @@ -202,8 +222,11 @@ defmodule Plausible.Imported.GoogleAnalytics4 do import_id: import_id, date: get_date(row), browser: Map.get(@browser_google_to_plausible, browser, browser), + # Does not exist in GA4 API + browser_version: nil, visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), + pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() } @@ -223,8 +246,10 @@ defmodule Plausible.Imported.GoogleAnalytics4 do import_id: import_id, date: get_date(row), operating_system: Map.get(@os_google_to_plausible, os, os), + operating_system_version: row.dimensions |> Map.fetch!("operatingSystemVersion"), visitors: row.metrics |> Map.fetch!("totalUsers") |> parse_number(), visits: row.metrics |> Map.fetch!("sessions") |> parse_number(), + pageviews: row.metrics |> Map.fetch!("screenPageViews") |> parse_number(), bounces: row.metrics |> Map.fetch!("bounces") |> parse_number(), visit_duration: row.metrics |> Map.fetch!("userEngagementDuration") |> parse_number() } diff --git a/test/plausible/imported/google_analytics4_test.exs b/test/plausible/imported/google_analytics4_test.exs index a53a80854..94c56763e 100644 --- a/test/plausible/imported/google_analytics4_test.exs +++ b/test/plausible/imported/google_analytics4_test.exs @@ -82,15 +82,15 @@ defmodule Plausible.Imported.GoogleAnalytics4Test do Enum.each(Plausible.Imported.tables(), fn table -> count = case table do - "imported_sources" -> 3 - "imported_visitors" -> 3 - "imported_pages" -> 8 - "imported_entry_pages" -> 4 + "imported_sources" -> 8 + "imported_visitors" -> 5 + "imported_pages" -> 10 + "imported_entry_pages" -> 6 "imported_exit_pages" -> 0 - "imported_locations" -> 4 - "imported_devices" -> 4 - "imported_browsers" -> 5 - "imported_operating_systems" -> 4 + "imported_locations" -> 6 + "imported_devices" -> 6 + "imported_browsers" -> 7 + "imported_operating_systems" -> 7 end query = from(imported in table, where: imported.site_id == ^site.id)