From b5797c8b10f4690217ff6ca9065ede42c1b1ba32 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 20 Nov 2019 16:49:22 +0800 Subject: [PATCH] Test getting conversions with a goal filter --- lib/plausible/stats/stats.ex | 6 +++--- .../api/stats_controller/conversions_test.exs | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/lib/plausible/stats/stats.ex b/lib/plausible/stats/stats.ex index 2c81a2245..5105381ef 100644 --- a/lib/plausible/stats/stats.ex +++ b/lib/plausible/stats/stats.ex @@ -205,10 +205,10 @@ defmodule Plausible.Stats do def goal_conversions(site, %Query{filters: %{"goal" => goal}} = query) when is_binary(goal) do Repo.all(from e in base_query(site, query), - select: %{name: ^goal, count: count(e.user_id, :distinct)}, + select: count(e.user_id, :distinct), group_by: e.name, - order_by: [desc: 2] - ) + order_by: [desc: 1] + ) |> Enum.map(fn count -> %{name: goal, count: count} end) end def goal_conversions(site, query) do diff --git a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs index 318d77621..6574ec111 100644 --- a/test/plausible_web/controllers/api/stats_controller/conversions_test.exs +++ b/test/plausible_web/controllers/api/stats_controller/conversions_test.exs @@ -54,4 +54,23 @@ defmodule PlausibleWeb.Api.StatsController.ConversionsTest do ] end end + + describe "GET /api/stats/:domain/conversions - with goal filter" do + setup [:create_user, :log_in, :create_site] + + test "returns only the conversion tha is filtered for", %{conn: conn, site: site} do + insert(:goal, %{domain: site.domain, page_path: "/success"}) + insert(:goal, %{domain: site.domain, event_name: "Signup"}) + + insert(:event, name: "Signup", hostname: site.domain, timestamp: ~N[2019-01-01 01:00:00]) + insert(:event, name: "pageview", pathname: "/success", hostname: site.domain, timestamp: ~N[2019-01-01 01:00:00]) + + filters = Jason.encode!(%{goal: "Signup"}) + conn = get(conn, "/api/stats/#{site.domain}/conversions?period=day&date=2019-01-01&filters=#{filters}") + + assert json_response(conn, 200) == [ + %{"name" => "Signup", "count" => 1}, + ] + end + end end