Merge pull request #30 from Recruitee/reports-move-to-locus-CU-86c0p0yb9

Reports move to locus cu 86c0p0yb9

Author: jacooobi

lib/plausible_web/controllers/api/external_controller.ex

@@ -450,43 +450,56 @@ defmodule PlausibleWeb.Api.ExternalController do
 
   @decorate trace("ingest.geolocation")
   defp visitor_location_details(conn) do
-    result =
-      PlausibleWeb.RemoteIp.get(conn)
-      |> Geolix.lookup()
+    ip = PlausibleWeb.RemoteIp.get(conn)
 
-    country_code =
-      get_in(result, [:geolocation, :country, :iso_code])
-      |> ignore_unknown_country
+    case :locus.lookup(:geolocation, ip) do
+      {:ok, result} -> get_location_details(result)
+      _ -> get_location_details(%{})
+    end
+  end
 
-    city_geoname_id = get_in(result, [:geolocation, :city, :geoname_id])
+  defp get_location_details(geo_data) do
+    %{
+      country_code: get_country_code(geo_data),
+      subdivision1_code: get_subdivision_code(geo_data, 0),
+      subdivision2_code: get_subdivision_code(geo_data, 1),
+      city_geoname_id: get_city_geoname_id(geo_data)
+    }
+  end
 
-    subdivision1_code =
-      case result do
-        %{geolocation: %{subdivisions: [%{iso_code: iso_code} | _rest]}} ->
-          country_code <> "-" <> iso_code
+  defp get_country_code(%{}), do: ""
 
-        _ ->
-          ""
-      end
+  defp get_country_code(geo_data) do
+    geo_data
+    |> Map.get("country", %{})
+    |> Map.get("iso_code")
+    |> ignore_unknown_country()
+  end
 
-    subdivision2_code =
-      case result do
-        %{geolocation: %{subdivisions: [_first, %{iso_code: iso_code} | _rest]}} ->
-          country_code <> "-" <> iso_code
+  defp get_city_geoname_id(%{}), do: ""
 
-        _ ->
-          ""
-      end
+  defp get_city_geoname_id(geo_data) do
+    city =
+      geo_data
+      |> Map.get("city", %{})
+      |> Map.get("geoname_id", "")
 
-    %{
-      country_code: country_code,
-      subdivision1_code: subdivision1_code,
-      subdivision2_code: subdivision2_code,
-      city_geoname_id: Map.get(@city_overrides, city_geoname_id, city_geoname_id)
-    }
+    Map.get(@city_overrides, city, city)
+  end
+
+  defp get_subdivision_code(%{}, _), do: ""
+
+  defp get_subdivision_code(geo_data, n) do
+    subdivisions = Map.get(geo_data, "subdivision", [])
+    country_code = get_country_code(geo_data)
+
+    case Enum.at(subdivisions, n) do
+      %{"iso_code" => iso_code} -> country_code <> "-" <> iso_code
+      _ -> ""
+    end
   end
 
-  defp ignore_unknown_country("ZZ"), do: nil
+  defp ignore_unknown_country("ZZ"), do: ""
   defp ignore_unknown_country(country), do: country
 
   @decorate trace("ingest.parse_referrer")

mix.exs

@@ -86,6 +86,7 @@ defmodule Plausible.MixProject do
       {:siphash, "~> 3.2"},
       {:oban, "~> 2.12.0"},
       {:geolix, "~> 1.0"},
+      {:locus, "~> 2.3.10"},
       {:clickhouse_ecto, git: "https://github.com/Recruitee/clickhouse_ecto.git", ref: "ed45cd0"},
       {:location, git: "https://github.com/plausible/location.git"},
       {:geolix_adapter_mmdb2, "~> 0.5.0"},

mix.lock

@@ -57,6 +57,7 @@
   "jumper": {:hex, :jumper, "1.0.1", "3c00542ef1a83532b72269fab9f0f0c82bf23a35e27d278bfd9ed0865cecabff", [:mix], [], "hexpm", "318c59078ac220e966d27af3646026db9b5a5e6703cb2aa3e26bcfaba65b7433"},
   "kaffy": {:hex, :kaffy, "0.9.0", "bef34c9729f6a3af4d0dea8eede8bcb9e11371a83ac9a8b393991bce81839517", [:mix], [{:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.11", [hex: :phoenix_html, repo: "hexpm", optional: false]}], "hexpm", "d18ff57b8e68feb433aed11e71510cd357abc7034e75358af5deff7d0d4c6ed3"},
   "location": {:git, "https://github.com/plausible/location.git", "ca2e4e69e1032d7100b190bbcbabf51a5349847a", []},
+  "locus": {:hex, :locus, "2.3.10", "e5baa7f9fcea23d293e1d7fae46ac4e6b1ffceb10a5552ae8afa1ef0815761da", [:rebar3], [{:tls_certificate_check, "~> 1.9", [hex: :tls_certificate_check, repo: "hexpm", optional: false]}], "hexpm", "5b6de8c70ca3070956286e6412446f4593103c19f88944b38e3c9f66d2c8fcd2"},
   "metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
   "mime": {:hex, :mime, "1.6.0", "dabde576a497cef4bbdd60aceee8160e02a6c89250d6c0b29e56c0dfb00db3d2", [:mix], [], "hexpm", "31a1a8613f8321143dde1dafc36006a17d28d02bdfecb9e95a880fa7aabd19a7"},
   "mimerl": {:hex, :mimerl, "1.2.0", "67e2d3f571088d5cfd3e550c383094b47159f3eee8ffa08e64106cdf5e981be3", [:rebar3], [], "hexpm", "f278585650aa581986264638ebf698f8bb19df297f66ad91b18910dfc6e19323"},