From 38fde8bae0f5d5dccfad74da3d940b2e9ef732b6 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 9 Mar 2025 12:05:57 +0100 Subject: [PATCH] Fixed recently added artists sort , fixes #632 --- src/libs/database/impl/Artist.cpp | 4 ++-- src/libs/database/test/Artist.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/database/impl/Artist.cpp b/src/libs/database/impl/Artist.cpp index 5e8e9b76..250f00c0 100644 --- a/src/libs/database/impl/Artist.cpp +++ b/src/libs/database/impl/Artist.cpp @@ -169,10 +169,10 @@ namespace lms::db query.orderBy("RANDOM()"); break; case ArtistSortMethod::LastWrittenDesc: - query.orderBy("MAX(t.file_last_write) DESC"); + query.orderBy("MAX(t.file_last_write) DESC, a.sort_name"); break; case ArtistSortMethod::AddedDesc: - query.orderBy("MAX(t.file_added) DESC"); + query.orderBy("MIN(t.file_added) DESC, a.sort_name"); break; case ArtistSortMethod::StarredDateDesc: assert(params.starringUser.isValid()); diff --git a/src/libs/database/test/Artist.cpp b/src/libs/database/test/Artist.cpp index 14eb143d..f7228502 100644 --- a/src/libs/database/test/Artist.cpp +++ b/src/libs/database/test/Artist.cpp @@ -768,8 +768,8 @@ namespace lms::db::tests auto transaction{ session.createReadTransaction() }; const auto artists{ Artist::findIds(session, Artist::FindParameters{}.setSortMethod(ArtistSortMethod::AddedDesc)) }; ASSERT_EQ(artists.results.size(), 4); - EXPECT_EQ(artists.results[0], artistA.getId()); - EXPECT_EQ(artists.results[1], artistD.getId()); + EXPECT_EQ(artists.results[0], artistD.getId()); + EXPECT_EQ(artists.results[1], artistA.getId()); EXPECT_EQ(artists.results[2], artistB.getId()); EXPECT_EQ(artists.results[3], artistC.getId()); }