Make purchase order deterministic

Avoids ordering issues when records have the same purchased_at datetime
(which is what happens when they're scanned in batches).
This commit is contained in:
Claudio Ortolina
2025-05-04 09:20:45 +01:00
parent 0aa1a526b2
commit 93e1fad88e
2 changed files with 16 additions and 7 deletions
+3 -1
View File
@@ -5,6 +5,8 @@ defmodule MusicLibrary.Collection do
alias MusicLibrary.Records.{Record, SearchIndex}
alias MusicLibrary.Repo
import MusicLibrary.Records, only: [order_alphabetically: 0]
def search_records(query, opts \\ []) do
limit = Keyword.get(opts, :limit, 20)
offset = Keyword.get(opts, :offset, 0)
@@ -43,7 +45,7 @@ defmodule MusicLibrary.Collection do
q =
from r in Record,
where: not is_nil(r.purchased_at),
order_by: [desc: r.purchased_at],
order_by: [{:desc, r.purchased_at}, order_alphabetically()],
limit: 1,
select: ^Records.essential_fields()
+13 -6
View File
@@ -47,6 +47,14 @@ defmodule MusicLibrary.Records do
Repo.aggregate(search, :count)
end
defmacro order_alphabetically do
quote do
fragment(
"unaccent(json_extract(artists, '$[0].sort_name')) COLLATE NOCASE ASC, unaccent(title) COLLATE NOCASE ASC"
)
end
end
defp build_search(initial_search, query, order \\ :alphabetical) do
{:ok, parsed_query} = SearchParser.parse(query)
@@ -54,15 +62,14 @@ defmodule MusicLibrary.Records do
case order do
:alphabetical ->
initial_search
|> order_by(
fragment(
"unaccent(json_extract(artists, '$[0].sort_name')) COLLATE NOCASE ASC, unaccent(title) COLLATE NOCASE ASC"
)
)
|> order_by(order_alphabetically())
:purchase ->
initial_search
|> order_by([r], {:desc, r.purchased_at})
|> order_by([r], [
{:desc, r.purchased_at},
order_alphabetically()
])
end
Enum.reduce(parsed_query, search_with_order, fn