more testing

Author: sebasptsch

apps/client/src/components/ResultsViewer.tsx

@@ -38,7 +38,7 @@ function ResultBar(props: {
 }
 
 // download text as file
-const handleDownload = (filename: string, filetype: string, text: string) => {
+const _handleDownload = (filename: string, filetype: string, text: string) => {
 	const element = document.createElement("a");
 	const file = new Blob([text], { type: filetype });
 	element.href = URL.createObjectURL(file);
@@ -84,15 +84,6 @@ export function ResultsViewer({ results }: { results: ResultsView }) {
 				...results.results.map((v) => v.votes),
 			);
 
-			const handleRoundsDownload = () => {
-				const roundsText = JSON.stringify(results.rounds, null, 2);
-				handleDownload(
-					"preferential-vote-rounds.json",
-					"application/json",
-					roundsText,
-				);
-			};
-
 			return (
 				<div className="flex flex-col gap-4">
 					{candidates.map((result) => (
@@ -109,9 +100,6 @@ export function ResultsViewer({ results }: { results: ResultsView }) {
 						max={maxVote}
 						grey={true}
 					/>
-					<button className="btn" onClick={handleRoundsDownload} type="button">
-						Download Rounds Data
-					</button>
 				</div>
 			);
 		}

apps/server/src/live/question.ts

@@ -67,7 +67,7 @@ export interface SingleVoteResultsView {
 export interface PreferentialVoteResultsView {
 	type: typeof preferentialVoteType;
 	results: CandidateWithRank[];
-	rounds: RoundRecord[];
+	records: RoundRecord[]
 }
 
 export type ResultsView = { abstained: number } & (

apps/server/src/room/interaction/db/questions.ts

@@ -6,7 +6,7 @@ import type { QuestionResponse, ResultsView } from "../../../live/question";
 import type { VotingCandidate } from "../../../live/states";
 import { UnreachableError } from "../../../unreachableError";
 import type { CreateQuestionParams, QuestionFormatDetails } from "../../types";
-import { rankedElection } from "../preferentialVote";
+import { STVElection } from "../preferentialVote";
 import type { CloseQuestionDetails, DbQuestionData } from "./queries";
 import {
 	dbCloseQuestion,
@@ -113,30 +113,28 @@ function mapDbQuestionData(question: DbQuestionData): RoomQuestion {
 					},
 				);
 
-				const candidateIds = question.candidates.map(
-					(candidate) => candidate.id,
-				);
+				const election = new STVElection()
+
+				for (const prefs of votingPreferences) {
+					election.addBallot(prefs);
+				}
 
-				const { elected, rounds } = rankedElection(
-					candidateIds,
-					votingPreferences,
-					question.maxElected,
-				); // get the result in order of preference
+				const { elected, records } = election.runElection(question.maxElected);
 
 				const results = elected.map((c, index) => ({
-					id: c.id,
-					// biome-ignore lint/style/noNonNullAssertion: Known keys
-					name: question.candidates.find((candidate) => candidate.id === c.id)
-						?.name!,
+					id: c,
+					name:
+						question.candidates.find(
+							(candidate) => candidate.id === c,
+						)?.name || "Unknown Candidate",
 					rank: index + 1,
-					votes: candidateWithVotes.filter((vote) => vote.candidateId === c.id)
-						.length,
+					votes: records[records.length - 1]?.voteTotals[c] || 0,
 				}));
 
 				return {
 					type: "PreferentialVote",
 					results,
-					rounds,
+					records,
 					abstained: abstainCount,
 				};
 			}