From e90ca47c5d1a5a11536923c50b9f221f0f806228 Mon Sep 17 00:00:00 2001
From: Teajey <21069848+Teajey@users.noreply.github.com>
Date: Mon, 13 May 2024 20:28:02 +1200
Subject: [PATCH] feat: sensible list order

---
 db/user.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/user.go b/db/user.go
index de485e4..8d3581b 100644
--- a/db/user.go
+++ b/db/user.go
@@ -83,7 +83,7 @@ func (u *User) GetPassHash() ([]byte, error) {
 }
 
 func (u *User) GetGifts() ([]Gift, error) {
-	stmt := "SELECT gift.id, gift.name, claimant.id, claimant.name, gift.sent FROM gift JOIN user ON gift.recipient_id = user.id LEFT JOIN user AS claimant ON gift.claimant_id = claimant.id WHERE user.id = ? ORDER BY gift.name DESC"
+	stmt := "SELECT gift.id, gift.name, claimant.id, claimant.name, gift.sent FROM gift JOIN user ON gift.recipient_id = user.id LEFT JOIN user AS claimant ON gift.claimant_id = claimant.id WHERE user.id = ?"
 	rows, err := database.Query(stmt, u.Id)
 	if err != nil {
 		return nil, err
@@ -114,7 +114,7 @@ func (u *User) GetGifts() ([]Gift, error) {
 }
 
 func (u *User) GetTodo() ([]Gift, error) {
-	stmt := "SELECT gift.id, gift.name, gift.sent, recipient.name, recipient.reference FROM gift JOIN user ON gift.claimant_id = user.id JOIN user AS recipient ON gift.recipient_id = recipient.id WHERE user.id = ? ORDER BY gift.sent, gift.name DESC"
+	stmt := "SELECT gift.id, gift.name, gift.sent, recipient.name, recipient.reference FROM gift JOIN user ON gift.claimant_id = user.id JOIN user AS recipient ON gift.recipient_id = recipient.id WHERE user.id = ? ORDER BY gift.sent ASC, gift.name"
 	rows, err := database.Query(stmt, u.Id)
 	if err != nil {
 		return nil, err