From c9b2d7d62ee407135dc5ee5415068e4ded705fd0 Mon Sep 17 00:00:00 2001
From: Gabriel Tofvesson <contact@w1zzrd.dev>
Date: Tue, 25 Oct 2022 05:04:24 +0200
Subject: [PATCH] Fix race-condition in voting

---
 functions/src/route/voting.ts | 11 +----------
 functions/src/types/vote.ts   |  5 +++--
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/functions/src/route/voting.ts b/functions/src/route/voting.ts
index 09cc481..6fd2dd0 100644
--- a/functions/src/route/voting.ts
+++ b/functions/src/route/voting.ts
@@ -4,8 +4,6 @@ import {
   getEntriesFromSnapshot,
   getVoteSnapshot,
   getVoteCounts,
-  getVoteEntry,
-  makeVoteEntry,
   updateVoteEntry,
   getVote,
   getActiveVote,
@@ -42,14 +40,7 @@ const vote = async (
     return {error: "Invalid vote index", code: 400};
   }
 
-  const entry = await getVoteEntry(vote.ref, voter);
-  if (!entry) {
-    await makeVoteEntry(vote.ref, voter, voteIndex);
-    await updateVoteCount();
-    return {success: true};
-  }
-
-  await updateVoteEntry(entry, voteIndex);
+  await updateVoteEntry(vote, voter, voteIndex);
   await updateVoteCount();
   return {success: true};
 };
diff --git a/functions/src/types/vote.ts b/functions/src/types/vote.ts
index 7630f40..d4a12f6 100644
--- a/functions/src/types/vote.ts
+++ b/functions/src/types/vote.ts
@@ -43,10 +43,11 @@ export const getVoteEntry = async (
       .where(usernameField, "==", username)
       .get() as QuerySnapshot<VoteEntry>).docs[0]?.ref;
 export const updateVoteEntry = async (
-    vote: DocumentReference<VoteEntry>,
+    vote: DocumentSnapshot<Vote>,
+    username: string,
     voteIndex: number
 ) =>
-  vote.update({[voteIndexField]: voteIndex});
+  vote.ref.collection(entriesCollectionName).doc(username).set({[voteIndexField]: voteIndex});
 export const makeVoteEntry = async (
     vote: DocumentReference<Vote>,
     username: string,