From ca1a9f31851070cd0f75b66bd61673f3305d53f7 Mon Sep 17 00:00:00 2001
From: Rebecca-Chou <beihaozhou@gmail.com>
Date: Wed, 16 Feb 2022 21:45:37 +0800
Subject: [PATCH] debug sort function

---
 lib/members.ts | 20 ++++----------------
 lib/team.ts    | 11 ++++++-----
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/lib/members.ts b/lib/members.ts
index 71b6242b..77fb9589 100644
--- a/lib/members.ts
+++ b/lib/members.ts
@@ -8,14 +8,6 @@ export interface Member {
   program: string;
 }
 
-const execPositions: { [name: string]: number } = {
-  presidentcro: 1,
-  "vice-president": 2,
-  secretary: 3,
-  treasurer: 4,
-  sysadmin: 5,
-};
-
 export async function getMembers(year: string, term: Term): Promise<Member[]> {
   if (process.env.USE_LDAP?.toLowerCase() !== "true") {
     return dummyMembers;
@@ -41,16 +33,12 @@ export async function getMembers(year: string, term: Term): Promise<Member[]> {
         return {
           name: item.cn as string,
           id: item.uid as string,
-          program: item.position === undefined ? "" : (item.position as string),
+          program: item.program === undefined ? "" : (item.program as string),
         };
       })
-      .filter((item: Member) => item.program !== "")
-      .sort((item1: Member, item2: Member) => {
-        return execPositions[item1.program] - execPositions[item2.program];
-      });
-    // .sort((item1: Member, item2: Member) =>
-    //   item1.name.localeCompare(item2.name)
-    // );
+      .sort((item1: Member, item2: Member) =>
+        item1.name.localeCompare(item2.name)
+      );
   } finally {
     await client.unbind();
   }
diff --git a/lib/team.ts b/lib/team.ts
index 8bf35269..83052f5c 100644
--- a/lib/team.ts
+++ b/lib/team.ts
@@ -71,10 +71,11 @@ export async function getExecNames() {
             item.position === undefined ? "" : (item.position as string),
         };
       })
-      .filter((item: execMembers) => item.position !== "")
-      .sort((item1: execMembers, item2: execMembers) => {
-        return execPositions[item1.position] - execPositions[item2.position];
-      });
+      .filter((item: execMembers) => item.position !== "");
+
+    execMembers = execMembers.sort((item1: execMembers, item2: execMembers) => {
+      return execPositions[item1.position] - execPositions[item2.position];
+    });
 
     formattedExec = execMembers.map(
       (member) =>
@@ -118,7 +119,7 @@ export async function getExec(fileName: string, convert = true) {
       content: "Coming soon!",
       metadata: {
         name: `${firstName} ${lastName}`,
-        role: `${posName}`,
+        role: `${posName} ${Number(posOrder) - 1}`,
       },
     });