add simple vote counting

Author: Drewbi

client/app/components/admin/nominations/index.tsx

@@ -4,6 +4,23 @@ import NominationCard from "./card";
 import { BASE_URL } from "@/lib/utils";
 import { useToken } from "@/lib/user";
 
+interface Candidate {
+  id: number;
+  name: string;
+  isMember: boolean;
+  email: string;
+  graduation: string;
+  position_id: number;
+  attend: boolean;
+  club_benefit: string;
+  initiative: string;
+  join_reason: string;
+  other_clubs: string;
+  past_clubs: string;
+  say_something: string;
+  student_num: string | number;
+}
+
 const Nominations = () => {
   const { hash } = useLocation();
   const token = useToken();
@@ -36,7 +53,7 @@ const Nominations = () => {
 
   return (
     <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
-      {candidates?.map((data) => (
+      {candidates?.map((data: Candidate) => (
         <NominationCard key={data.name} {...data} />
       ))}
     </div>

client/app/components/admin/results/card.tsx

@@ -0,0 +1,30 @@
+import {
+    Card,
+    CardContent,
+    CardDescription,
+    CardHeader,
+    CardTitle,
+  } from "@/components/ui/card";
+import type { Candidate } from "@/components/vote/queries";
+
+interface ResultsProps {
+    candidate: Candidate;
+    stats: any
+}
+  
+const ResultCard = (props: ResultsProps) => {
+    return (
+        <Card className="relative gap-4">
+        <CardHeader>
+            <CardTitle>{props.candidate.name}</CardTitle>
+            <CardDescription>{props.candidate.student_num}</CardDescription>
+        </CardHeader>
+        <CardContent className="flex flex-col gap-2">
+            {JSON.stringify(props.stats)}
+        </CardContent>
+        </Card>
+    );
+};
+  
+  export default ResultCard;
+  

client/app/components/admin/results/index.tsx

@@ -0,0 +1,61 @@
+import { useLocation } from "react-router";
+import { useQuery } from "@tanstack/react-query";
+import ResultCard from "./card";
+import { BASE_URL } from "@/lib/utils";
+import { useToken } from "@/lib/user";
+import type { ElectedCandidate } from "@/components/vote/queries";
+
+const Results = () => {
+  const { hash } = useLocation();
+  const token = useToken();
+  const id = hash.split("?")[0].split("=")[1];
+
+  const { data: electedData, isLoading: isLoadingElected } = useQuery<ElectedCandidate[]>({
+    queryKey: ["results", id],
+    queryFn: async () => {
+      const response = await fetch(`${BASE_URL}/results/${id}`, {
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${token}`,
+        },
+      });
+      const val = await response.json();
+      return val;
+    },
+  });
+
+  const { data: countData, isLoading } = useQuery({
+    queryKey: ["votes", id],
+    queryFn: async () => {
+      const response = await fetch(`${BASE_URL}/vote/winningvotes/${id}`, {
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${token}`,
+        },
+      });
+      const val = await response.json();
+      return val;
+    },
+  });
+
+  if (isLoading)
+    return (
+      <div className="grid h-full place-items-center">
+        <span className="material-symbols-sharp animate-spin text-9xl!">
+          progress_activity
+        </span>
+      </div>
+    );
+
+  return (
+    <div className="grid grid-cols-1 gap-4 md:grid-cols-2">
+      {electedData && electedData.map(({ candidates: candidate }) => (
+        <ResultCard key={candidate.name} candidate={candidate} stats={countData} />
+      )) || (
+        <div className="text-xl">{ isLoadingElected ? 'Loading results...' : 'No Results Found'}</div>
+      )}
+    </div>
+  );
+};
+
+export default Results;

client/app/components/admin/results/overview.tsx

@@ -11,7 +11,7 @@ type WSData = {
 
 type RaceStatus = "closed" | "open" | "finished";
 
-interface Race {
+export interface Race {
   race: {
     id: number;
     position_id: number;
@@ -21,7 +21,7 @@ interface Race {
   positions: Position;
 }
 
-interface BaseCandidate {
+export interface Candidate {
   id: number;
   name: string;
   position_id: number;
@@ -33,27 +33,22 @@ interface BaseCandidate {
   past_clubs: string;
   say_something: string;
   student_num: string | number;
+  nominations: Nomination[]
 }
 
-interface Candidate extends BaseCandidate {
-  nominations: {
-    positions: {
-      id: number;
-      title: string;
-    };
-  }[];
+export interface Nomination {
+  positions: {
+    id: number;
+    title: string;
+  };
 }
 
-interface ElectedCandidate {
+export interface ElectedCandidate {
   elected: {
     candidate_id: number;
     race_id: number;
   };
-  candidates: {
-    id: number;
-    isMember: boolean;
-    name: string;
-  };
+  candidates: Candidate
 }
 
 export const useWS = () => {
@@ -151,7 +146,7 @@ export const useCandidates = (position_id?: number | string) => {
   const token = useToken();
 
   // get by position id
-  const { data: candidatesByPosition } = useQuery<BaseCandidate[]>({
+  const { data: candidatesByPosition } = useQuery<Candidate[]>({
     enabled: !!position_id,
     refetchInterval: 3000,
     queryKey: ["nominees", position_id],

client/app/components/vote/queries.ts

@@ -25,6 +25,7 @@ import type { Position } from "@/lib/types";
 import Auth from "@/components/auth";
 import { Button } from "@/components/ui/button";
 import Seats from "@/components/admin/seat";
+import Results from "@/components/admin/results";
 
 export function meta({}: Route.MetaArgs) {
   return [
@@ -109,7 +110,7 @@ export default function Admin() {
       CurrentView = Nominations;
     } else if (hash.includes("result")) {
       currentPage = `Result - ${title}`;
-      CurrentView = () => <> </>;
+      CurrentView = Results;
     }
   }
 

client/app/routes/admin.tsx

@@ -22,6 +22,20 @@ export function getVotePreference(
     );
 }
 
+export function getVotePreferenceForCandidate(
+  this: VotingObject,
+  candidate_id: number
+) {
+  return this.db
+    .select()
+    .from(votePreferencesTable)
+    .where(
+      and(
+        eq(votePreferencesTable.candidate_id, candidate_id)
+      )
+    );
+}
+
 export function getVotePreferencesForVote(this: VotingObject, vote_id: number) {
   return this.db
     .select()

src/models/db/vote-preference.ts

@@ -8,7 +8,7 @@ import { getAllNominations, getNominationsForPosition, getNominationsForCandidat
 import { getRace, getAllRaces, insertRace, updateRace, deleteRace, getCurrentRace, saveElectedForRace } from "./db/race";
 import { getSeat, insertSeat, deleteSeat, getSeatByCode } from "./db/seat";
 import { countUsers, getAllUsers, insertUser, updateUser, getUser, getUserByEmail, deleteUser } from "./db/user";
-import { getAllVotePreferences, insertVotePreference, updateVotePreference, getVotePreference, deleteVotePreference, getVotePreferencesForVote } from "./db/vote-preference";
+import { getAllVotePreferences, insertVotePreference, updateVotePreference, getVotePreference, deleteVotePreference, getVotePreferencesForVote, getVotePreferenceForCandidate } from "./db/vote-preference";
 import { countVotesForRace, getAllVotesForRace, insertVote, updateVote, getAllVotesByUser, getVoteByUserAndRace, deleteVote, getVoteAggregateForRace } from "./db/vote";
 import { seedMasterSeat, devSeeds, seedPositions, seedRaces } from "./seed";
 import * as schema from "./schema";
@@ -276,6 +276,12 @@ export class VotingObject extends DurableObject {
   ) {
     return getVotePreferencesForVote.call(this, ...args);
   }
+  
+  getVotePreferenceForCandidate(
+    ...args: Parameters<typeof getVotePreferenceForCandidate>
+  ) {
+    return getVotePreferenceForCandidate.call(this, ...args);
+  }
 
   insertVotePreference(...args: Parameters<typeof insertVotePreference>) {
     return insertVotePreference.call(this, ...args);

src/models/index.ts

@@ -70,7 +70,7 @@ app.get(
 
         return c.json(data);
       } else {
-        const data = DBData.map(({ candidates }) => ({
+        const data = DBData.map(({ candidates, nominations }) => ({
           id: candidates?.id,
           name: candidates?.name,
           join_reason: candidates?.join_reason,
@@ -80,6 +80,7 @@ app.get(
           past_clubs: candidates?.past_clubs,
           attend: candidates?.attend,
           say_something: candidates?.say_something,
+          nominations
         }));
         return c.json(data);
       }
@@ -149,6 +150,7 @@ app.post("/", requireAdmin, zValidator("json", insertSchema), async (c) => {
     );
     return c.json({ message: "Created successfully" });
   } catch (err) {
+    console.error(err)
     throw new HTTPException(400, { message: "Failed to create candidate" });
   }
 });

src/routes/candidate.ts

@@ -8,6 +8,7 @@ const app = factory.createApp();
 
 app.get(
   "/count/:id",
+  requireAdmin,
   zValidator(
     "param",
     z.object({
@@ -24,6 +25,31 @@ app.get(
   }
 );
 
+app.get(
+  "/winningvotes/:id",
+  requireAdmin,
+  zValidator(
+    "param",
+    z.object({
+      id: z.number({ coerce: true }),
+    })
+  ),
+  async (c) => {
+    const { id } = c.req.valid("param");
+    const winners = await c.var.STUB.getElectedForRace(id)
+    const elected_preferences = (await Promise.all(winners.map(winner => {
+      return c.var.STUB.getVotePreferenceForCandidate(winner.elected.candidate_id)
+    }))).map(preferences => {
+      return preferences.reduce<{ [key: number]: number }>((acc, curr) => {
+        if (!acc[curr.preference]) acc[curr.preference] = 0
+        acc[curr.preference] += 1
+        return acc
+      }, {})
+    })
+    return c.json(elected_preferences);
+  }
+);
+
 app.post(
   "/:race_id",
   zValidator(