diff --git a/lib/music_library/artists/artist_info.ex b/lib/music_library/artists/artist_info.ex index cd4b7765..ef97cdd0 100644 --- a/lib/music_library/artists/artist_info.ex +++ b/lib/music_library/artists/artist_info.ex @@ -49,10 +49,11 @@ defmodule MusicLibrary.Artists.ArtistInfo do end def extract_image(artist_info) do - primary_image = extract_image(artist_info.discogs_data, "primary") - secondary_image = extract_image(artist_info.discogs_data, "secondary") + image = + extract_image(artist_info.discogs_data, "primary") || + extract_image(artist_info.discogs_data, "secondary") - if image = primary_image || secondary_image do + if image do {:ok, %{url: image["resource_url"], width: image["width"]}} else {:error, :image_not_found} diff --git a/mix.lock b/mix.lock index 654439f6..e349c841 100644 --- a/mix.lock +++ b/mix.lock @@ -5,7 +5,7 @@ "circular_buffer": {:hex, :circular_buffer, "1.0.0", "25c004da0cba7bd8bc1bdabded4f9a902d095e20600fd15faf1f2ffbaea18a07", [:mix], [], "hexpm", "c829ec31c13c7bafd1f546677263dff5bfb006e929f25635878ac3cfba8749e5"}, "cloak": {:hex, :cloak, "1.1.4", "aba387b22ea4d80d92d38ab1890cc528b06e0e7ef2a4581d71c3fdad59e997e7", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "92b20527b9aba3d939fab0dd32ce592ff86361547cfdc87d74edce6f980eb3d7"}, "cloak_ecto": {:hex, :cloak_ecto, "1.3.0", "0de127c857d7452ba3c3367f53fb814b0410ff9c680a8d20fbe8b9a3c57a1118", [:mix], [{:cloak, "~> 1.1.1", [hex: :cloak, repo: "hexpm", optional: false]}, {:ecto, "~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}], "hexpm", "314beb0c123b8a800418ca1d51065b27ba3b15f085977e65c0f7b2adab2de1cc"}, - "credo": {:hex, :credo, "1.7.13", "126a0697df6b7b71cd18c81bc92335297839a806b6f62b61d417500d1070ff4e", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "47641e6d2bbff1e241e87695b29f617f1a8f912adea34296fb10ecc3d7e9e84f"}, + "credo": {:hex, :credo, "1.7.14", "c7e75216cea8d978ba8c60ed9dede4cc79a1c99a266c34b3600dd2c33b96bc92", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "12a97d6bb98c277e4fb1dff45aaf5c137287416009d214fb46e68147bd9e0203"}, "db_connection": {:hex, :db_connection, "2.8.1", "9abdc1e68c34c6163f6fb96a96532272d13ad7ca45262156ae8b7ec6d9dc4bec", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a61a3d489b239d76f326e03b98794fb8e45168396c925ef25feb405ed09da8fd"}, "decimal": {:hex, :decimal, "2.3.0", "3ad6255aa77b4a3c4f818171b12d237500e63525c2fd056699967a3e7ea20f62", [:mix], [], "hexpm", "a4d66355cb29cb47c3cf30e71329e58361cfcb37c34235ef3bf1d7bf3773aeac"}, "earmark": {:hex, :earmark, "1.4.48", "5f41e579d85ef812351211842b6e005f6e0cef111216dea7d4b9d58af4608434", [:mix], [], "hexpm", "a461a0ddfdc5432381c876af1c86c411fd78a25790c75023c7a4c035fdc858f9"}, diff --git a/test/music_library/records/similarity_test.exs b/test/music_library/records/similarity_test.exs index 62d8082b..6acd8c42 100644 --- a/test/music_library/records/similarity_test.exs +++ b/test/music_library/records/similarity_test.exs @@ -160,7 +160,7 @@ defmodule MusicLibrary.Records.SimilarityTest do test "finds similar records", %{record1: record1, record2: record2} do similar = Similarity.find_similar(record1.id, limit: 5) - assert length(similar) >= 1 + refute Enum.empty?(similar) # record2 should be most similar to record1 %{record: first_record, similarity: similarity} = List.first(similar) assert first_record.id == record2.id diff --git a/test/music_library_web/live/collection_live/index_test.exs b/test/music_library_web/live/collection_live/index_test.exs index f4381a8a..a5903327 100644 --- a/test/music_library_web/live/collection_live/index_test.exs +++ b/test/music_library_web/live/collection_live/index_test.exs @@ -113,8 +113,8 @@ defmodule MusicLibraryWeb.CollectionLive.IndexTest do {page_3_records, rest_of_records} = Enum.split(rest_of_records, page_size) # Safeguard - make sure we're not testing against empty lists - assert length(page_3_records) !== 0 - assert length(rest_of_records) !== 0 + refute Enum.empty?(page_3_records) + refute Enum.empty?(rest_of_records) page_3_session = visit(conn, ~p"/collection?order=alphabetical&page=3&page_size=#{page_size}")