Only ever include an artist once in #listed scope

This fixes a bug in production where we were showing artists multiple times if they had multiple published albums.
freerange · Nov 16, 2023 · 635926b · 635926b
1 parent f071c12
commit 635926b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/app/models/artist.rb b/app/models/artist.rb
@@ -10,7 +10,7 @@ class Artist < ApplicationRecord
 
   validates :name, presence: true
 
-  scope :listed, -> { where.associated(:albums).where('albums.published': true) }
+  scope :listed, -> { where.associated(:albums).where('albums.published': true).distinct }
 
   after_update :transcode_albums, if: :metadata_changed?
 

diff --git a/test/models/artist_test.rb b/test/models/artist_test.rb
@@ -18,6 +18,14 @@ class ArtistTest < ActiveSupport::TestCase
     assert_equal [listed_artist], Artist.listed
   end
 
+  test '.listed only returns artist once if they have multiple published albums' do
+    published_album = create(:album, published: true)
+    another_published_album = create(:album, published: true)
+    listed_artist = create(:artist, name: 'Listed', albums: [published_album, another_published_album])
+
+    assert_equal [listed_artist], Artist.listed
+  end
+
   test '#listed?' do
     published_album = create(:album, published: true)
     unpublished_album = create(:album, published: false)