Merge pull request #479 from sparcs-kaist/feat/vote-ordering

Feat/display votes in descending chronological order

Author: lunikai

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 => {

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);

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],
   }));
 });
 

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),
     ],
   }));
 });