From e364b20b1bca543063bc92dc83511d9e8feebc43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro?= Date: Sun, 23 Jun 2024 12:59:05 +0200 Subject: [PATCH] remove old match repo --- .../dimensions/match/match_repo.ex | 7 ++++ .../lib/lol_analytics/match/match_repo.ex | 35 ------------------- .../lib/lol_analytics/match/match_schema.ex | 19 ---------- .../lib/scrapper/consumer/match_consumer.ex | 13 ------- .../lib/scrapper/queue/match_queue.ex | 2 +- 5 files changed, 8 insertions(+), 68 deletions(-) delete mode 100644 apps/lol_analytics/lib/lol_analytics/match/match_repo.ex delete mode 100644 apps/lol_analytics/lib/lol_analytics/match/match_schema.ex diff --git a/apps/lol_analytics/lib/lol_analytics/dimensions/match/match_repo.ex b/apps/lol_analytics/lib/lol_analytics/dimensions/match/match_repo.ex index 094ad6a..39a6765 100644 --- a/apps/lol_analytics/lib/lol_analytics/dimensions/match/match_repo.ex +++ b/apps/lol_analytics/lib/lol_analytics/dimensions/match/match_repo.ex @@ -33,6 +33,13 @@ defmodule LolAnalytics.Dimensions.Match.MatchRepo do end end + @spec get(String.t()) :: nil | %MatchSchema{} + def get(match_id) do + query = from m in MatchSchema, where: m.match_id == ^match_id + + Repo.one(query) + end + @type update_attrs :: %{ optional(:fact_champion_played_game_status) => process_status(), optional(:fact_champion_picked_item_status) => process_status(), diff --git a/apps/lol_analytics/lib/lol_analytics/match/match_repo.ex b/apps/lol_analytics/lib/lol_analytics/match/match_repo.ex deleted file mode 100644 index 7502507..0000000 --- a/apps/lol_analytics/lib/lol_analytics/match/match_repo.ex +++ /dev/null @@ -1,35 +0,0 @@ -defmodule LolAnalytics.Match.MatchRepo do - alias LolAnalytics.Match.MatchSchema - - import Ecto.Query - - def list_matches do - query = from m in MatchSchema, order_by: [desc: m.match_id] - LoLAnalytics.Repo.all(query) - end - - def number_of_matches do - query = from m in MatchSchema, select: count(m.match_id) - LoLAnalytics.Repo.one(query) - end - - @spec get_match(String.t()) :: %LolAnalytics.Match.MatchSchema{} | nil - def get_match(match_id) do - query = from m in MatchSchema, where: m.match_id == ^match_id - - LoLAnalytics.Repo.one(query) - end - - @spec insert_match(String.t()) :: %LolAnalytics.Match.MatchSchema{} - def insert_match(match_id) do - MatchSchema.changeset(%MatchSchema{}, %{:match_id => match_id, :processed => false}) - |> LoLAnalytics.Repo.insert() - end - - @spec update_match(%LolAnalytics.Match.MatchSchema{}, term()) :: - %LolAnalytics.Match.MatchSchema{} - def update_match(match, attrs) do - match = MatchSchema.changeset(match, attrs) - LoLAnalytics.Repo.update(match) - end -end diff --git a/apps/lol_analytics/lib/lol_analytics/match/match_schema.ex b/apps/lol_analytics/lib/lol_analytics/match/match_schema.ex deleted file mode 100644 index c46d69c..0000000 --- a/apps/lol_analytics/lib/lol_analytics/match/match_schema.ex +++ /dev/null @@ -1,19 +0,0 @@ -defmodule LolAnalytics.Match.MatchSchema do - use Ecto.Schema - import Ecto.Changeset - - schema "match" do - field :match_id, :string - field :processed, :boolean, default: false - field :match_url, :string - - timestamps() - end - - def changeset(%__MODULE__{} = match, params \\ %{}) do - match - |> cast(params, [:match_id, :processed, :match_url]) - |> validate_required([:match_id, :processed]) - end - -end diff --git a/apps/scrapper/lib/scrapper/consumer/match_consumer.ex b/apps/scrapper/lib/scrapper/consumer/match_consumer.ex index 8911d3e..bc673a1 100644 --- a/apps/scrapper/lib/scrapper/consumer/match_consumer.ex +++ b/apps/scrapper/lib/scrapper/consumer/match_consumer.ex @@ -69,19 +69,6 @@ defmodule Scrapper.Consumer.MatchConsumer do Storage.MatchStorage.S3MatchStorage.store_match(match_id, raw_match, "matches") end - match = LolAnalytics.Match.MatchRepo.get_match(match_id) - - case match do - nil -> - LolAnalytics.Match.MatchRepo.insert_match(match_id) - - _ -> - LolAnalytics.Match.MatchRepo.update_match(match, %{ - :processed => true, - :match_url => match_url - }) - end - decoded_match.metadata.participants # |> Enum.shuffle() # |> Enum.take(2) diff --git a/apps/scrapper/lib/scrapper/queue/match_queue.ex b/apps/scrapper/lib/scrapper/queue/match_queue.ex index e1f2a30..9ae1547 100644 --- a/apps/scrapper/lib/scrapper/queue/match_queue.ex +++ b/apps/scrapper/lib/scrapper/queue/match_queue.ex @@ -16,7 +16,7 @@ defmodule Scrapper.Queue.MatchQueue do @spec enqueue_match(String.t()) :: any() def enqueue_match(match_id) do - LolAnalytics.Match.MatchRepo.get_match(match_id) + LolAnalytics.Dimensions.Match.MatchRepo.get(match_id) |> case do nil -> GenServer.call(__MODULE__, {:enqueue_match, match_id}) _match -> :already_processed