From 5c759dbfed576d58dac9b1a55fee30ada2211318 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Tue, 27 Apr 2021 11:38:56 +0300 Subject: [PATCH] Clean up Ecto changeset code for events --- lib/plausible/event/clickhouse_schema.ex | 74 ++++++++++--------- .../controllers/api/external_controller.ex | 24 +++--- 2 files changed, 52 insertions(+), 46 deletions(-) diff --git a/lib/plausible/event/clickhouse_schema.ex b/lib/plausible/event/clickhouse_schema.ex index 20e26773d..43b32598e 100644 --- a/lib/plausible/event/clickhouse_schema.ex +++ b/lib/plausible/event/clickhouse_schema.ex @@ -10,46 +10,52 @@ defmodule Plausible.ClickhouseEvent do field :pathname, :string field :user_id, :integer field :session_id, :integer + field :timestamp, :naive_datetime - field :referrer, :string - field :referrer_source, :string - field :utm_medium, :string - field :utm_source, :string - field :utm_campaign, :string + field :referrer, :string, default: "" + field :referrer_source, :string, default: "" + field :utm_medium, :string, default: "" + field :utm_source, :string, default: "" + field :utm_campaign, :string, default: "" - field :country_code, :string - field :screen_size, :string - field :operating_system, :string - field :operating_system_version, :string - field :browser, :string - field :browser_version, :string + field :country_code, :string, default: "" + field :screen_size, :string, default: "" + field :operating_system, :string, default: "" + field :operating_system_version, :string, default: "" + field :browser, :string, default: "" + field :browser_version, :string, default: "" - field :"meta.key", {:array, :string} - field :"meta.value", {:array, :string} - - timestamps(inserted_at: :timestamp, updated_at: false) + field :"meta.key", {:array, :string}, default: [] + field :"meta.value", {:array, :string}, default: [] end def new(attrs) do %__MODULE__{} - |> cast(attrs, [ - :name, - :domain, - :hostname, - :pathname, - :user_id, - :operating_system, - :operating_system_version, - :browser, - :browser_version, - :referrer, - :referrer_source, - :utm_medium, - :utm_source, - :utm_campaign, - :country_code, - :screen_size - ]) - |> validate_required([:name, :domain, :hostname, :pathname, :user_id]) + |> cast( + attrs, + [ + :name, + :domain, + :hostname, + :pathname, + :user_id, + :timestamp, + :operating_system, + :operating_system_version, + :browser, + :browser_version, + :referrer, + :referrer_source, + :utm_medium, + :utm_source, + :utm_campaign, + :country_code, + :screen_size, + :"meta.key", + :"meta.value" + ], + empty_values: [nil, ""] + ) + |> validate_required([:name, :domain, :hostname, :pathname, :user_id, :timestamp]) end end diff --git a/lib/plausible_web/controllers/api/external_controller.ex b/lib/plausible_web/controllers/api/external_controller.ex index edf2e79e0..bdc6e8ab2 100644 --- a/lib/plausible_web/controllers/api/external_controller.ex +++ b/lib/plausible_web/controllers/api/external_controller.ex @@ -84,17 +84,17 @@ defmodule PlausibleWeb.Api.ExternalController do name: params["name"], hostname: strip_www(uri && uri.host), pathname: get_pathname(uri, params["hash_mode"]), - referrer_source: get_referrer_source(query, ref) || "", - referrer: clean_referrer(ref) || "", - utm_medium: query["utm_medium"] || "", - utm_source: query["utm_source"] || "", - utm_campaign: query["utm_campaign"] || "", - country_code: country_code || "", - operating_system: (ua && os_name(ua)) || "", - operating_system_version: (ua && os_version(ua)) || "", - browser: (ua && browser_name(ua)) || "", - browser_version: (ua && browser_version(ua)) || "", - screen_size: calculate_screen_size(params["screen_width"]) || "", + referrer_source: get_referrer_source(query, ref), + referrer: clean_referrer(ref), + utm_medium: query["utm_medium"], + utm_source: query["utm_source"], + utm_campaign: query["utm_campaign"], + country_code: country_code, + operating_system: ua && os_name(ua), + operating_system_version: ua && os_version(ua), + browser: ua && browser_name(ua), + browser_version: ua && browser_version(ua), + screen_size: calculate_screen_size(params["screen_width"]), "meta.key": Map.keys(params["meta"]), "meta.value": Map.values(params["meta"]) |> Enum.map(&Kernel.to_string/1) } @@ -112,7 +112,7 @@ defmodule PlausibleWeb.Api.ExternalController do |> Plausible.ClickhouseEvent.new() if changeset.valid? do - event = struct(Plausible.ClickhouseEvent, event_attrs) + event = Ecto.Changeset.apply_changes(changeset) session_id = Plausible.Session.Store.on_event(event, previous_user_id) event