Move scrobble queries from Records to ListeningStats

Closes #110

lib/music_library/listening_stats.ex

@@ -10,7 +10,7 @@ defmodule MusicLibrary.ListeningStats do
   import Ecto.Query
 
   alias LastFm.Track
-  alias MusicLibrary.{Artists, Collection, Records.ArtistRecord, Repo, Wishlist}
+  alias MusicLibrary.{Artists, Collection, Records.ArtistRecord, Records.Record, Repo, Wishlist}
 
   @pagination Application.compile_env!(:music_library, :pagination)
 
@@ -247,6 +247,42 @@ defmodule MusicLibrary.ListeningStats do
     }
   end
 
+  @spec get_last_listened_track(Record.t()) :: Track.t() | nil
+  def get_last_listened_track(record) do
+    q =
+      from t in scrobbles_for_record_query(record),
+        order_by: [desc: t.scrobbled_at_uts],
+        limit: 1
+
+    Repo.one(q)
+  end
+
+  @spec play_count(Record.t()) :: non_neg_integer()
+  def play_count(record) do
+    record
+    |> scrobbles_for_record_query()
+    |> Repo.aggregate(:count)
+  end
+
+  defp scrobbles_for_record_query(record) do
+    record_id = record.id
+
+    q =
+      from r in fragment("records, json_each(records.release_ids)"),
+        where: fragment("records.id = ?", ^record_id),
+        select: r.value
+
+    release_ids = Repo.all(q)
+    main_artist_name = Record.main_artist(record).name
+    record_title = record.title
+
+    from t in Track,
+      where: fragment("? ->> '$.musicbrainz_id'", t.album) in ^release_ids,
+      or_where:
+        fragment("? ->> '$.title'", t.album) == ^record_title and
+          fragment("? ->> '$.name'", t.artist) == ^main_artist_name
+  end
+
   defp polyfill_artist(artist, musicbrainz_id) do
     if is_nil(artist.musicbrainz_id) or artist.musicbrainz_id == "" do
       %{artist | musicbrainz_id: musicbrainz_id}

lib/music_library/records.ex

@@ -278,42 +278,6 @@ defmodule MusicLibrary.Records do
     end
   end
 
-  @spec get_last_listened_track(Record.t()) :: LastFm.Track.t() | nil
-  def get_last_listened_track(record) do
-    q =
-      from t in scrobbles_for_record_query(record),
-        order_by: [desc: t.scrobbled_at_uts],
-        limit: 1
-
-    Repo.one(q)
-  end
-
-  @spec play_count(Record.t()) :: non_neg_integer()
-  def play_count(record) do
-    record
-    |> scrobbles_for_record_query()
-    |> Repo.aggregate(:count)
-  end
-
-  defp scrobbles_for_record_query(record) do
-    record_id = record.id
-
-    q =
-      from r in fragment("records, json_each(records.release_ids)"),
-        where: fragment("records.id = ?", ^record_id),
-        select: r.value
-
-    release_ids = Repo.all(q)
-    main_artist_name = Record.main_artist(record).name
-    record_title = record.title
-
-    from t in LastFm.Track,
-      where: fragment("? ->> '$.musicbrainz_id'", t.album) in ^release_ids,
-      or_where:
-        fragment("? ->> '$.title'", t.album) == ^record_title and
-          fragment("? ->> '$.name'", t.artist) == ^main_artist_name
-  end
-
   @spec refresh_cover(Record.t()) :: {:ok, Record.t()} | {:error, term()}
   def refresh_cover(record) do
     with {:ok, cover_data} <- MusicBrainz.get_cover_art({:url, record.cover_url}),

lib/music_library_web/live/collection_live/show.ex

@@ -21,7 +21,7 @@ defmodule MusicLibraryWeb.CollectionLive.Show do
       similar_records: 1
     ]
 
-  alias MusicLibrary.{Records, RecordSets, ScrobbleActivity}
+  alias MusicLibrary.{ListeningStats, Records, RecordSets, ScrobbleActivity}
   alias MusicLibrary.Records.Similarity
   alias MusicLibraryWeb.ErrorMessages
   alias Phoenix.LiveView.JS
@@ -346,8 +346,8 @@ defmodule MusicLibraryWeb.CollectionLive.Show do
   @impl true
   def handle_params(%{"id" => id}, _, socket) do
     record = Records.get_record!(id)
-    last_listened_track = Records.get_last_listened_track(record)
-    play_count = Records.play_count(record) || 0
+    last_listened_track = ListeningStats.get_last_listened_track(record)
+    play_count = ListeningStats.play_count(record) || 0
 
     socket =
       if record.selected_release_id do