Consolidate Album and Artist image logic into concern

app/controllers/albums_controller.rb

@@ -21,7 +21,7 @@ def index
 
   def show
     @songs = @album.songs.includes(:artist)
-    AttachAlbumImageFromDiscogsJob.perform_later(@album) if @album.need_attach_from_discogs?
+    @album.attach_image_from_discogs
   end
 
   def edit

app/controllers/artists_controller.rb

@@ -17,7 +17,7 @@ def show
     @albums = @artist.albums.load_async
     @appears_on_albums = @artist.appears_on_albums.load_async
 
-    AttachArtistImageFromDiscogsJob.perform_later(@artist) if @artist.need_attach_from_discogs?
+    @artist.attach_image_from_discogs
   end
 
   def edit

app/jobs/attach_image_from_discogs_job.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class AttachImageFromDiscogsJob < ApplicationJob
+  queue_as :default
+
+  def perform(discogs_imageable)
+    image_url = DiscogsApi.image(discogs_imageable)
+    discogs_imageable.update(remote_image_url: image_url) if image_url.present?
+  end
+end

app/models/album.rb

@@ -2,29 +2,20 @@
 
 class Album < ApplicationRecord
   include Searchable
+  include Imageable
 
   validates :name, uniqueness: {scope: :artist}
 
   has_many :songs, -> { order(:tracknum) }, inverse_of: :album, dependent: :destroy
   belongs_to :artist, touch: true
 
-  mount_uploader :image, ImageUploader
-
   search_by :name, associations: :artist
 
   def title
     is_unknown? ? I18n.t("text.unknown_album") : name
   end
 
-  def has_image?
-    image.file.present?
-  end
-
   def is_unknown?
     name.blank?
   end
-
-  def need_attach_from_discogs?
-    Setting.discogs_token.present? && !has_image? && !is_unknown?
-  end
 end

app/models/artist.rb

@@ -2,12 +2,11 @@
 
 class Artist < ApplicationRecord
   include Searchable
+  include Imageable
 
   has_many :albums, dependent: :destroy
   has_many :songs
 
-  mount_uploader :image, ImageUploader
-
   search_by :name
 
   def title
@@ -17,10 +16,6 @@ def title
     name
   end
 
-  def has_image?
-    image.file.present?
-  end
-
   def is_unknown?
     name.blank?
   end
@@ -32,8 +27,4 @@ def all_albums
   def appears_on_albums
     Album.joins(:songs).where("albums.artist_id != ? AND songs.artist_id = ?", id, id).distinct
   end
-
-  def need_attach_from_discogs?
-    Setting.discogs_token.present? && !has_image? && !is_unknown?
-  end
 end

app/models/concerns/imageable.rb

@@ -0,0 +1,23 @@
+module Imageable
+  extend ActiveSupport::Concern
+
+  included do
+    mount_uploader :image, ImageUploader
+
+    after_commit :attach_image_from_discogs, on: :create
+  end
+
+  def has_image?
+    image.file.present?
+  end
+
+  def attach_image_from_discogs
+    AttachImageFromDiscogsJob.perform_later(self) if needs_image_from_discogs?
+  end
+
+  private
+
+  def needs_image_from_discogs?
+    Setting.discogs_token.present? && !has_image? && !is_unknown?
+  end
+end

app/models/discogs_api.rb

@@ -13,6 +13,10 @@ def search(options)
       JSON.parse response, symbolize_names: true if response.success?
     end
 
+    def image(imageable)
+      imageable.is_a?(Artist) ? artist_image(imageable) : album_image(imageable)
+    end
+
     def artist_image(artist)
       raise TypeError, "Expect Artist instance" unless artist.is_a? Artist
 

test/controllers/albums_controller_test.rb

@@ -40,7 +40,7 @@ class AlbumsControllerTest < ActionDispatch::IntegrationTest
     assert_not album.has_image?
     assert_not album.is_unknown?
 
-    assert_enqueued_with(job: AttachAlbumImageFromDiscogsJob) do
+    assert_enqueued_with(job: AttachImageFromDiscogsJob) do
       assert_login_access(url: album_url(album)) do
         assert_response :success
       end

test/controllers/artists_controller_test.rb

@@ -40,7 +40,7 @@ class ArtistsControllerTest < ActionDispatch::IntegrationTest
     assert_not artist.has_image?
     assert_not artist.is_unknown?
 
-    assert_enqueued_with(job: AttachArtistImageFromDiscogsJob) do
+    assert_enqueued_with(job: AttachImageFromDiscogsJob) do
       assert_login_access(url: artist_url(artist)) do
         assert_response :success
       end

test/jobs/attach_album_image_from_discogs_job_test.rb → test/jobs/attach_image_from_discogs_job_test.rb

@@ -16,8 +16,22 @@ class AttachAlbumImageFromDiscogsJobTest < ActiveJob::TestCase
     DiscogsApi.stub(:album_image, "http://example.com/cover.jpg") do
       assert_not album.has_image?
 
-      AttachAlbumImageFromDiscogsJob.perform_now(album)
+      AttachImageFromDiscogsJob.perform_now(album)
       assert album.reload.has_image?
     end
   end
+
+  test "should attach image to artist" do
+    artist = artists(:artist1)
+
+    stub_request(:get, "http://example.com/cover.jpg")
+      .to_return(body: file_fixture("cover_image.jpg").read, status: 200, headers: {"Content-Type" => "image/jpeg"})
+
+    DiscogsApi.stub(:artist_image, "http://example.com/cover.jpg") do
+      assert_not artist.has_image?
+
+      AttachImageFromDiscogsJob.perform_now(artist)
+      assert artist.reload.has_image?
+    end
+  end
 end