From a15e9b03ddfebb33a92175b61625aacb68015794 Mon Sep 17 00:00:00 2001
From: Chaemin Lee <140066207+lunariana@users.noreply.github.com>
Date: Wed, 13 Mar 2024 20:22:58 +0900
Subject: [PATCH 1/3] feat: display previously concluded votes in reverse
 chronological order

---
 packages/api/src/service/admin.agenda.ts | 3 +++
 packages/api/src/service/agenda.ts       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/api/src/service/admin.agenda.ts b/packages/api/src/service/admin.agenda.ts
index ce18062a..85c76959 100644
--- a/packages/api/src/service/admin.agenda.ts
+++ b/packages/api/src/service/admin.agenda.ts
@@ -354,6 +354,9 @@ export const retrieveAll = async (): Promise<schema.AdminAgenda[]> => {
       },
       voters: selectOnlyUser,
     },
+    orderBy: {
+      endAt: "desc",
+    },
   });
 
   const res = agendaFromDB.map(agenda => {
diff --git a/packages/api/src/service/agenda.ts b/packages/api/src/service/agenda.ts
index 23ac6e0c..cfed46de 100644
--- a/packages/api/src/service/agenda.ts
+++ b/packages/api/src/service/agenda.ts
@@ -19,6 +19,9 @@ export const retrieveAll = async (
         },
       },
     },
+    orderBy: {
+      endAt: "desc",
+    },
   });
   const res = agendaDbRes.map((agenda): schema.Agenda => {
     const userVotable = agenda.voters.some(v => v.userId === user.id);

From 7fef470f36f21f971f3f0594e35fe1e336d58440 Mon Sep 17 00:00:00 2001
From: Chaemin Lee <140066207+lunariana@users.noreply.github.com>
Date: Wed, 20 Mar 2024 21:37:07 +0900
Subject: [PATCH 2/3] feat: display newly terminated agendas at the top of the
 list

---
 packages/web/src/services/agenda.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/src/services/agenda.ts b/packages/web/src/services/agenda.ts
index e8bcfcb1..a1077d1e 100644
--- a/packages/web/src/services/agenda.ts
+++ b/packages/web/src/services/agenda.ts
@@ -54,8 +54,8 @@ socket.on("agenda.voted", ({ id, user, voters }) => {
 socket.on("agenda.terminated", terminatedAgenda => {
   useAgenda.setState(state => ({
     agendas: [
-      ...state.agendas.filter(agenda => agenda.id !== terminatedAgenda.id),
       terminatedAgenda,
+      ...state.agendas.filter(agenda => agenda.id !== terminatedAgenda.id),
     ],
   }));
 });

From f7d44375d075cccda699d7913bcd3a212b2ed1d0 Mon Sep 17 00:00:00 2001
From: Chaemin Lee <140066207+lunariana@users.noreply.github.com>
Date: Thu, 21 Mar 2024 00:22:02 +0900
Subject: [PATCH 3/3] feat: display freshly terminated agendas at the top for
 admins as well

---
 packages/web/src/services/admin-agenda.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web/src/services/admin-agenda.ts b/packages/web/src/services/admin-agenda.ts
index 17387315..3c6abe8a 100644
--- a/packages/web/src/services/admin-agenda.ts
+++ b/packages/web/src/services/admin-agenda.ts
@@ -77,7 +77,7 @@ export const useAdminAgenda = create<AdminAgendaState>(set => ({
 
 socket.on("admin.agenda.created", adminAgenda => {
   useAdminAgenda.setState(state => ({
-    adminAgendas: [...state.adminAgendas, adminAgenda],
+    adminAgendas: [adminAgenda, ...state.adminAgendas],
   }));
 });