diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index 52db5b3d7..a64e951bc 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -515,11 +515,18 @@ defmodule Plausible.Stats.Breakdown do defp do_group_by(q, "visit:device") do from( s in q, - group_by: s.screen_size, select_merge: %{ - device: fragment("if(empty(?), ?, ?)", s.screen_size, @not_set, s.screen_size) + device: + fragment( + "multiIf(empty(?), ?, ? = 'Laptop', 'Desktop', ?) as device", + s.screen_size, + @not_set, + s.screen_size, + s.screen_size + ) }, - order_by: {:asc, s.screen_size} + group_by: fragment("device"), + order_by: fragment("device ASC") ) end diff --git a/test/plausible_web/controllers/api/stats_controller/screen_sizes_test.exs b/test/plausible_web/controllers/api/stats_controller/screen_sizes_test.exs index 22f0d837b..ffb8009d8 100644 --- a/test/plausible_web/controllers/api/stats_controller/screen_sizes_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/screen_sizes_test.exs @@ -8,14 +8,14 @@ defmodule PlausibleWeb.Api.StatsController.ScreenSizesTest do populate_stats(site, [ build(:pageview, screen_size: "Desktop"), build(:pageview, screen_size: "Desktop"), - build(:pageview, screen_size: "Laptop") + build(:pageview, screen_size: "Mobile") ]) conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day") assert json_response(conn, 200) == [ %{"name" => "Desktop", "visitors" => 2, "percentage" => 67}, - %{"name" => "Laptop", "visitors" => 1, "percentage" => 33} + %{"name" => "Mobile", "visitors" => 1, "percentage" => 33} ] end @@ -119,27 +119,26 @@ defmodule PlausibleWeb.Api.StatsController.ScreenSizesTest do populate_stats(site, [ build(:pageview, screen_size: "Desktop"), build(:pageview, screen_size: "Desktop"), - build(:pageview, screen_size: "Laptop") + build(:pageview, screen_size: "Mobile") ]) populate_stats(site, [ build(:imported_devices, device: "Mobile"), - build(:imported_devices, device: "Laptop") + build(:imported_devices, device: "Mobile") ]) conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day") assert json_response(conn, 200) == [ %{"name" => "Desktop", "visitors" => 2, "percentage" => 67}, - %{"name" => "Laptop", "visitors" => 1, "percentage" => 33} + %{"name" => "Mobile", "visitors" => 1, "percentage" => 33} ] conn = get(conn, "/api/stats/#{site.domain}/screen-sizes?period=day&with_imported=true") assert json_response(conn, 200) == [ %{"name" => "Desktop", "visitors" => 2, "percentage" => 40}, - %{"name" => "Laptop", "visitors" => 2, "percentage" => 40}, - %{"name" => "Mobile", "visitors" => 1, "percentage" => 20} + %{"name" => "Mobile", "visitors" => 3, "percentage" => 20} ] end