From d8699b03bd8938ca9ca14dabc728d2873f94a5ea Mon Sep 17 00:00:00 2001 From: Deluan Date: Thu, 28 May 2020 20:39:26 -0400 Subject: [PATCH] Fix album sort fields --- persistence/album_repository.go | 6 ++++-- persistence/persistence_suite_test.go | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/persistence/album_repository.go b/persistence/album_repository.go index 19f398c0f6a..205f2f538a0 100644 --- a/persistence/album_repository.go +++ b/persistence/album_repository.go @@ -26,8 +26,10 @@ func NewAlbumRepository(ctx context.Context, o orm.Ormer) model.AlbumRepository r.ormer = o r.tableName = "album" r.sortMappings = map[string]string{ - "artist": "compilation asc, order_album_artist_name asc, order_album_name asc", - "random": "RANDOM()", + "name": "order_album_name", + "artist": "compilation asc, order_album_artist_name asc, order_album_name asc", + "random": "RANDOM()", + "max_year": "max_year asc, name, order_album_name asc", } r.filterMappings = map[string]filterFunc{ "name": fullTextFilter, diff --git a/persistence/persistence_suite_test.go b/persistence/persistence_suite_test.go index 1643622bf20..8b2968ce2d3 100644 --- a/persistence/persistence_suite_test.go +++ b/persistence/persistence_suite_test.go @@ -40,9 +40,9 @@ var ( ) var ( - albumSgtPeppers = model.Album{ID: "101", Name: "Sgt Peppers", Artist: "The Beatles", AlbumArtistID: "3", Genre: "Rock", CoverArtId: "1", CoverArtPath: P("/beatles/1/sgt/a day.mp3"), SongCount: 1, MaxYear: 1967, FullText: " beatles peppers sgt the"} - albumAbbeyRoad = model.Album{ID: "102", Name: "Abbey Road", Artist: "The Beatles", AlbumArtistID: "3", Genre: "Rock", CoverArtId: "2", CoverArtPath: P("/beatles/1/come together.mp3"), SongCount: 1, MaxYear: 1969, FullText: " abbey beatles road the"} - albumRadioactivity = model.Album{ID: "103", Name: "Radioactivity", Artist: "Kraftwerk", AlbumArtistID: "2", Genre: "Electronic", CoverArtId: "3", CoverArtPath: P("/kraft/radio/radio.mp3"), SongCount: 2, FullText: " kraftwerk radioactivity"} + albumSgtPeppers = model.Album{ID: "101", Name: "Sgt Peppers", Artist: "The Beatles", OrderAlbumName: "sgt peppers", AlbumArtistID: "3", Genre: "Rock", CoverArtId: "1", CoverArtPath: P("/beatles/1/sgt/a day.mp3"), SongCount: 1, MaxYear: 1967, FullText: " beatles peppers sgt the"} + albumAbbeyRoad = model.Album{ID: "102", Name: "Abbey Road", Artist: "The Beatles", OrderAlbumName: "abbey road", AlbumArtistID: "3", Genre: "Rock", CoverArtId: "2", CoverArtPath: P("/beatles/1/come together.mp3"), SongCount: 1, MaxYear: 1969, FullText: " abbey beatles road the"} + albumRadioactivity = model.Album{ID: "103", Name: "Radioactivity", Artist: "Kraftwerk", OrderAlbumName: "radioactivity", AlbumArtistID: "2", Genre: "Electronic", CoverArtId: "3", CoverArtPath: P("/kraft/radio/radio.mp3"), SongCount: 2, FullText: " kraftwerk radioactivity"} testAlbums = model.Albums{ albumSgtPeppers, albumAbbeyRoad,