From 10d977ab23a470793ae5c74d64a1e02137b958cb Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Wed, 16 Oct 2024 20:57:08 +0800
Subject: [PATCH] :bug: Fix notification order

---
 .idea/workspace.xml                          | 8 ++++----
 pkg/internal/server/api/notifications_api.go | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fd6d24f..77aebcd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,9 +4,9 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":alien: Support better metadata encoder / decoder">
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Bug fixes on compile time">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/grpc/realms.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/grpc/realms.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/notifications_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/notifications_api.go" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -153,7 +153,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":sparkles: Preload api key's ticket" />
     <MESSAGE value=":bug: Fix preloading issue" />
     <MESSAGE value=":bug: Fix bot related key api issue" />
     <MESSAGE value=":bug: Fix query statement column issue" />
@@ -178,7 +177,8 @@
     <MESSAGE value=":sparkles: New login alert" />
     <MESSAGE value=":bug: Bug fixes in non-cached notification preferences" />
     <MESSAGE value=":alien: Support better metadata encoder / decoder" />
-    <option name="LAST_COMMIT_MESSAGE" value=":alien: Support better metadata encoder / decoder" />
+    <MESSAGE value=":bug: Bug fixes on compile time" />
+    <option name="LAST_COMMIT_MESSAGE" value=":bug: Bug fixes on compile time" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/internal/server/api/notifications_api.go b/pkg/internal/server/api/notifications_api.go
index 4cd2b23..dfe1917 100644
--- a/pkg/internal/server/api/notifications_api.go
+++ b/pkg/internal/server/api/notifications_api.go
@@ -32,7 +32,7 @@ func getNotifications(c *fiber.Ctx) error {
 	if err := tx.
 		Limit(take).
 		Offset(offset).
-		Order("CASE WHEN read_at IS NULL THEN 0 ELSE 1 END, created_at").
+		Order("read_at DESC, created_at").
 		Find(&notifications).Error; err != nil {
 		return fiber.NewError(fiber.StatusInternalServerError, err.Error())
 	}