feat: add artist filter to album view

persistence/album_repository.go

@@ -28,11 +28,19 @@ func NewAlbumRepository(ctx context.Context, o orm.Ormer) model.AlbumRepository
 	r.filterMappings = map[string]filterFunc{
 		"name":        fullTextFilter,
 		"compilation": booleanFilter,
+		"artist_id":   artistFilter,
 	}
 
 	return r
 }
 
+func artistFilter(field string, value interface{}) Sqlizer {
+	return Or{
+		exist("from media_file where album.id = media_file.album_id and media_file.artist_id='" + value.(string) + "'"),
+		exist("from media_file where album.id = media_file.album_id and media_file.album_artist_id='" + value.(string) + "'"),
+	}
+}
+
 func (r *albumRepository) CountAll(options ...model.QueryOptions) (int64, error) {
 	return r.count(Select(), options...)
 }
@@ -62,7 +70,7 @@ func (r *albumRepository) Get(id string) (*model.Album, error) {
 }
 
 func (r *albumRepository) FindByArtist(artistId string) (model.Albums, error) {
-	sq := r.selectAlbum().Where(Eq{"artist_id": artistId}).OrderBy("year")
+	sq := r.selectAlbum().Where(Eq{"album_artist_id": artistId}).OrderBy("year")
 	res := model.Albums{}
 	err := r.queryAll(sq, &res)
 	return res, err
@@ -91,8 +99,8 @@ func (r *albumRepository) Refresh(ids ...string) error {
 		HasCoverArt bool
 	}
 	var albums []refreshAlbum
-	sel := Select(`album_id as id, album as name, f.artist, f.album_artist, f.artist_id, f.compilation, f.genre,
-		max(f.year) as year, sum(f.duration) as duration, count(*) as song_count, a.id as current_id, 
+	sel := Select(`album_id as id, album as name, f.artist, f.album_artist, f.artist_id, f.album_artist_id, 
+		f.compilation, f.genre, max(f.year) as year, sum(f.duration) as duration, count(*) as song_count, a.id as current_id, 
 		f.id as cover_art_id, f.path as cover_art_path, f.has_cover_art`).
 		From("media_file f").
 		LeftJoin("album a on f.album_id = a.id").

persistence/artist_repository.go

@@ -114,12 +114,12 @@ func (r *artistRepository) Refresh(ids ...string) error {
 		Compilation bool
 	}
 	var artists []refreshArtist
-	sel := Select("f.artist_id as id", "f.artist as name", "f.album_artist", "f.compilation",
+	sel := Select("f.album_artist_id as id", "f.artist as name", "f.album_artist", "f.compilation",
 		"count(*) as album_count", "a.id as current_id").
 		From("album f").
-		LeftJoin("artist a on f.artist_id = a.id").
-		Where(Eq{"f.artist_id": ids}).
-		GroupBy("f.artist_id").OrderBy("f.id")
+		LeftJoin("artist a on f.album_artist_id = a.id").
+		Where(Eq{"f.album_artist_id": ids}).
+		GroupBy("f.album_artist_id").OrderBy("f.id")
 	err := r.queryAll(sel, &artists)
 	if err != nil {
 		return err

persistence/helpers.go

@@ -60,3 +60,10 @@ func toCamelCase(str string) string {
 		return strings.ToUpper(strings.Replace(s, "_", "", -1))
 	})
 }
+
+type exist string
+
+func (e exist) ToSql() (string, []interface{}, error) {
+	sql := fmt.Sprintf("exists (select 1 %s)", e)
+	return sql, nil, nil
+}

persistence/mock_album_repo.go

@@ -68,7 +68,7 @@ func (m *MockAlbum) FindByArtist(artistId string) (model.Albums, error) {
 	var res = make(model.Albums, len(m.data))
 	i := 0
 	for _, a := range m.data {
-		if a.ArtistID == artistId {
+		if a.AlbumArtistID == artistId {
 			res[i] = *a
 			i++
 		}

persistence/persistence_suite_test.go

@@ -40,9 +40,9 @@ var (
 )
 
 var (
-	albumSgtPeppers    = model.Album{ID: "1", Name: "Sgt Peppers", Artist: "The Beatles", ArtistID: "3", Genre: "Rock", CoverArtId: "1", CoverArtPath: P("/beatles/1/sgt/a day.mp3"), SongCount: 1, Year: 1967, FullText: "sgt peppers the beatles"}
-	albumAbbeyRoad     = model.Album{ID: "2", Name: "Abbey Road", Artist: "The Beatles", ArtistID: "3", Genre: "Rock", CoverArtId: "2", CoverArtPath: P("/beatles/1/come together.mp3"), SongCount: 1, Year: 1969, FullText: "abbey road the beatles"}
-	albumRadioactivity = model.Album{ID: "3", Name: "Radioactivity", Artist: "Kraftwerk", ArtistID: "2", Genre: "Electronic", CoverArtId: "3", CoverArtPath: P("/kraft/radio/radio.mp3"), SongCount: 2, FullText: "radioactivity kraftwerk"}
+	albumSgtPeppers    = model.Album{ID: "1", Name: "Sgt Peppers", Artist: "The Beatles", AlbumArtistID: "3", Genre: "Rock", CoverArtId: "1", CoverArtPath: P("/beatles/1/sgt/a day.mp3"), SongCount: 1, Year: 1967, FullText: "sgt peppers the beatles"}
+	albumAbbeyRoad     = model.Album{ID: "2", Name: "Abbey Road", Artist: "The Beatles", AlbumArtistID: "3", Genre: "Rock", CoverArtId: "2", CoverArtPath: P("/beatles/1/come together.mp3"), SongCount: 1, Year: 1969, FullText: "abbey road the beatles"}
+	albumRadioactivity = model.Album{ID: "3", Name: "Radioactivity", Artist: "Kraftwerk", AlbumArtistID: "2", Genre: "Electronic", CoverArtId: "3", CoverArtPath: P("/kraft/radio/radio.mp3"), SongCount: 2, FullText: "radioactivity kraftwerk"}
 	testAlbums         = model.Albums{
 		albumSgtPeppers,
 		albumAbbeyRoad,