Insert boards in the db using correct keys

1 files changed, 4 insertions, 11 deletions

diff --git a/server/src/play.rs b/server/src/play.rs
index f413a74..99f451f 100644
--- a/server/src/play.rs
+++ b/server/src/play.rs
@@ -7,7 +7,7 @@ use protocol::{
         TableState,
     },
     card::Card,
-    core::{Deal, Player},
+    core::Deal,
     simple_bots::{AlwaysPassBiddingBot, RandomPlayingBot},
 };
 use rand::random;
@@ -106,7 +106,7 @@ where
 
 #[derive(PartialEq, Eq, Clone, Debug, Serialize, Deserialize)]
 pub enum TableUpdate {
-    NewDeal { deal: Deal, dealer: Player },
+    NewDeal { deal: Deal },
     ChangeSettings(TableSettings),
     Bid(Bid),
     Play(Card),
@@ -163,7 +163,6 @@ impl<J: Journal<TableUpdate>> Table<J> {
     async fn init(&mut self) -> Result<(), BridgeError> {
         self.insert_and_apply(TableUpdate::NewDeal {
             deal: random(),
-            dealer: random(),
         })
         .await
     }
@@ -177,14 +176,8 @@ impl<J: Journal<TableUpdate>> Table<J> {
     }
 
     pub async fn new_deal(&mut self) -> Result<(), BridgeError> {
-        let dealer = match &self.state {
-            TableState::Unknown => random(),
-            TableState::Game(g) => g.dealer(),
-            TableState::Result(_) => random(), // TODO: We should know the dealer here.
-        };
         self.insert_and_apply(TableUpdate::NewDeal {
             deal: random(),
-            dealer: dealer.next(),
         })
         .await
     }
@@ -210,8 +203,8 @@ impl<J: Journal<TableUpdate>> Table<J> {
                 self.state = self.game()?.clone().bid(bid)?.into();
                 Ok(())
             }
-            TableUpdate::NewDeal { deal, dealer } => {
-                self.state = GameState::new(deal, dealer).into();
+            TableUpdate::NewDeal { deal } => {
+                self.state = GameState::new(deal).into();
                 Ok(())
             }
             TableUpdate::Play(card) => {