correlr/tutor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: correlr:736a1a07e7616768f15a07a3b3b5fb8895450ed4
Branches Tags
correlr:master
correlr:servant
...
compare: correlr:a90496bd0bb649a6e4ef9da9c4f7a2d259ba449b
Branches Tags
correlr:master
correlr:servant

2 commits
736a1a07e7 ... a90496bd0b

Author SHA1 Message Date
Correl
a90496bd0b Use foil price if the card in collection is foil 2022-07-28 20:04:04 -04:00
Correl
5b6344a695 Fix price ordering 
NULL price values were being sorted before cards with prices available.
 2022-07-28 19:30:50 -04:00
1 changed files with 6 additions and 3 deletions
Show stats Expand all files Collapse all files

9
tutor/database.py
View file

@ -183,13 +183,16 @@ async def advanced_search(
] ]
if sort_by == "price": if sort_by == "price":
orderings = [ orderings = [
"CAST(COALESCE(card_prices.usd, card_prices.usd_foil) as decimal) DESC", "CAST(COALESCE(CASE WHEN \"copies\".\"isFoil\" THEN card_prices.usd_foil ELSE card_prices.usd END, 0) as decimal) DESC",
*orderings, *orderings,
] ]
params["last_update_key"] = "last_update" params["last_update_key"] = "last_update"
query = " ".join( query = " ".join(
[ [
"SELECT cards.*, card_prices.* FROM cards", "SELECT cards.*, card_prices.*",
", CASE WHEN \"copies\".\"isFoil\" THEN card_prices.usd_foil",
" ELSE card_prices.usd END AS usd",
"FROM cards",
" ".join(joins), " ".join(joins),
"WHERE" if constraints else "", "WHERE" if constraints else "",
" AND ".join(constraints), " AND ".join(constraints),
@ -198,7 +201,7 @@ async def advanced_search(
f"LIMIT {limit} OFFSET {offset}", f"LIMIT {limit} OFFSET {offset}",
] ]
) )
logger.critical("Query: %s", (query, params)) logger.debug("Query: %s", (query, params))
await db.execute(query, params) await db.execute(query, params)
rows = await db.fetchall() rows = await db.fetchall()