Move Artist and ArtistInfo under Artists context
This commit is contained in:
@@ -2,7 +2,8 @@ defmodule MusicLibrary.Artists do
|
|||||||
import Ecto.Query, warn: false
|
import Ecto.Query, warn: false
|
||||||
alias MusicLibrary.Repo
|
alias MusicLibrary.Repo
|
||||||
|
|
||||||
alias MusicLibrary.Records.{ArtistInfo, ArtistRecord, Record}
|
alias MusicLibrary.Artists.ArtistInfo
|
||||||
|
alias MusicLibrary.Records.{ArtistRecord, Record}
|
||||||
alias MusicLibrary.{BackgroundRepo, Worker}
|
alias MusicLibrary.{BackgroundRepo, Worker}
|
||||||
|
|
||||||
def get_artist!(musicbrainz_id) do
|
def get_artist!(musicbrainz_id) do
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
defmodule MusicLibrary.Records.Artist do
|
defmodule MusicLibrary.Artists.Artist do
|
||||||
use Ecto.Schema
|
use Ecto.Schema
|
||||||
|
|
||||||
import Ecto.Changeset
|
import Ecto.Changeset
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
defmodule MusicLibrary.Records.ArtistInfo do
|
defmodule MusicLibrary.Artists.ArtistInfo do
|
||||||
use Ecto.Schema
|
use Ecto.Schema
|
||||||
import Ecto.Changeset
|
import Ecto.Changeset
|
||||||
|
|
||||||
@@ -4,7 +4,7 @@ defmodule MusicLibrary.Records.ArtistRecord do
|
|||||||
"""
|
"""
|
||||||
use Ecto.Schema
|
use Ecto.Schema
|
||||||
|
|
||||||
alias MusicLibrary.Records.Artist
|
alias MusicLibrary.Artists.Artist
|
||||||
|
|
||||||
@primary_key false
|
@primary_key false
|
||||||
schema "artist_records" do
|
schema "artist_records" do
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ defmodule MusicLibrary.Records.Record do
|
|||||||
import Ecto.Changeset
|
import Ecto.Changeset
|
||||||
|
|
||||||
alias MusicBrainz.{Release, ReleaseGroup}
|
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]
|
@formats [:cd, :backup, :vinyl, :blu_ray, :dvd, :multi]
|
||||||
@types [:album, :ep, :live, :compilation, :single, :other]
|
@types [:album, :ep, :live, :compilation, :single, :other]
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ defmodule MusicLibrary.Records.SearchIndex do
|
|||||||
"""
|
"""
|
||||||
use Ecto.Schema
|
use Ecto.Schema
|
||||||
|
|
||||||
alias MusicLibrary.Records.{Artist, Record}
|
alias MusicLibrary.Artists.Artist
|
||||||
|
alias MusicLibrary.Records.Record
|
||||||
|
|
||||||
@primary_key {:id, :binary_id, autogenerate: false}
|
@primary_key {:id, :binary_id, autogenerate: false}
|
||||||
schema "records_search_index" do
|
schema "records_search_index" do
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
defmodule MusicLibraryWeb.ArtistLive.Show do
|
defmodule MusicLibraryWeb.ArtistLive.Show do
|
||||||
use MusicLibraryWeb, :live_view
|
use MusicLibraryWeb, :live_view
|
||||||
|
|
||||||
|
alias MusicLibrary.Artists.ArtistInfo
|
||||||
alias MusicLibrary.{Artists, Records}
|
alias MusicLibrary.{Artists, Records}
|
||||||
alias MusicLibrary.Records.ArtistInfo
|
|
||||||
|
|
||||||
import MusicLibraryWeb.RecordComponents,
|
import MusicLibraryWeb.RecordComponents,
|
||||||
only: [record_grid: 1, toggle_actions_menu: 1, close_actions_menu: 1, country_label: 1]
|
only: [record_grid: 1, toggle_actions_menu: 1, close_actions_menu: 1, country_label: 1]
|
||||||
|
|||||||
@@ -315,7 +315,7 @@ defmodule MusicLibraryWeb.CollectionLive.IndexTest do
|
|||||||
|
|
||||||
[marillion] = record.artists
|
[marillion] = record.artists
|
||||||
|
|
||||||
assert %MusicLibrary.Records.Artist{
|
assert %MusicLibrary.Artists.Artist{
|
||||||
name: "Marillion",
|
name: "Marillion",
|
||||||
sort_name: "Marillion",
|
sort_name: "Marillion",
|
||||||
disambiguation: "British progressive rock band",
|
disambiguation: "British progressive rock band",
|
||||||
@@ -420,7 +420,7 @@ defmodule MusicLibraryWeb.CollectionLive.IndexTest do
|
|||||||
|
|
||||||
[marillion] = record.artists
|
[marillion] = record.artists
|
||||||
|
|
||||||
assert %MusicLibrary.Records.Artist{
|
assert %MusicLibrary.Artists.Artist{
|
||||||
name: "Marillion",
|
name: "Marillion",
|
||||||
sort_name: "Marillion",
|
sort_name: "Marillion",
|
||||||
disambiguation: "British progressive rock band",
|
disambiguation: "British progressive rock band",
|
||||||
|
|||||||
Reference in New Issue
Block a user