Move Artist and ArtistInfo under Artists context

lib/music_library/records/artist.ex

@@ -1,18 +0,0 @@
-defmodule MusicLibrary.Records.Artist do
-  use Ecto.Schema
-
-  import Ecto.Changeset
-
-  @primary_key {:musicbrainz_id, :binary_id, autogenerate: false}
-  embedded_schema do
-    field :name, :string
-    field :sort_name, :string
-    field :disambiguation, :string
-  end
-
-  def changeset(artist, attrs) do
-    artist
-    |> cast(attrs, [:name, :sort_name, :disambiguation, :musicbrainz_id])
-    |> validate_required([:name, :sort_name, :musicbrainz_id])
-  end
-end

lib/music_library/records/artist_info.ex

@@ -1,84 +0,0 @@
-defmodule MusicLibrary.Records.ArtistInfo do
-  use Ecto.Schema
-  import Ecto.Changeset
-
-  alias MusicLibrary.Records.Cover
-
-  @primary_key {:id, :binary_id, autogenerate: true}
-  schema "artist_infos" do
-    field :musicbrainz_data, :map, default: %{}
-    field :discogs_data, :map, default: %{}
-    field :image_data, :binary
-    field :image_data_hash, :string
-    field :image_data_width, :integer
-
-    timestamps(type: :utc_datetime)
-  end
-
-  def changeset(artist_info, attrs) do
-    artist_info
-    |> cast(attrs, [
-      :id,
-      :musicbrainz_data,
-      :discogs_data,
-      :image_data,
-      :image_data_width
-    ])
-    |> validate_required([:musicbrainz_data])
-    |> generate_image_hash()
-  end
-
-  def country(artist_info) do
-    %{"area" => area} =
-      artist_info.musicbrainz_data
-
-    country_code =
-      case area["iso-3166-1-codes"] || area["iso-3166-2-codes"] do
-        [code | _rest] -> code
-        nil -> artist_info.musicbrainz_data["country"]
-      end
-
-    %{name: area["name"] || "World", code: keep_alpha_2(country_code) || "XW"}
-  end
-
-  defp keep_alpha_2(nil), do: nil
-
-  defp keep_alpha_2(country_code) do
-    String.slice(country_code, 0..1)
-  end
-
-  def generate_image_hash(%__MODULE__{image_data: image_data} = artist_info) do
-    change(artist_info, image_data_hash: Cover.hash(image_data))
-  end
-
-  def generate_image_hash(changeset) do
-    case get_change(changeset, :image_data) do
-      nil ->
-        changeset
-
-      image_data ->
-        put_change(changeset, :image_data_hash, Cover.hash(image_data))
-    end
-  end
-
-  def extract_image(artist_info) when is_nil(artist_info.discogs_data) do
-    {:error, :no_discogs_data}
-  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")
-
-    if image = primary_image || secondary_image do
-      {:ok, %{url: image["resource_url"], width: image["width"]}}
-    else
-      {:error, :image_not_found}
-    end
-  end
-
-  defp extract_image(discogs_data, type) do
-    Enum.find(discogs_data["images"] || [], fn image ->
-      image["type"] == type
-    end)
-  end
-end

lib/music_library/records/artist_records.ex

@@ -4,7 +4,7 @@ defmodule MusicLibrary.Records.ArtistRecord do
   """
   use Ecto.Schema
 
-  alias MusicLibrary.Records.Artist
+  alias MusicLibrary.Artists.Artist
 
   @primary_key false
   schema "artist_records" do

lib/music_library/records/record.ex

@@ -3,7 +3,8 @@ defmodule MusicLibrary.Records.Record do
   import Ecto.Changeset
 
   alias MusicBrainz.{Release, ReleaseGroup}
-  alias MusicLibrary.Records.{Artist, Cover}
+  alias MusicLibrary.Artists.Artist
+  alias MusicLibrary.Records.Cover
 
   @formats [:cd, :backup, :vinyl, :blu_ray, :dvd, :multi]
   @types [:album, :ep, :live, :compilation, :single, :other]

lib/music_library/records/search_index.ex

@@ -11,7 +11,8 @@ defmodule MusicLibrary.Records.SearchIndex do
   """
   use Ecto.Schema
 
-  alias MusicLibrary.Records.{Artist, Record}
+  alias MusicLibrary.Artists.Artist
+  alias MusicLibrary.Records.Record
 
   @primary_key {:id, :binary_id, autogenerate: false}
   schema "records_search_index" do