write player entries

server/src/game.rs

@@ -329,11 +329,6 @@ impl Game {
     }
 }
 
-
-// add client function call
-// check for cryp ability ownership
-// check for game participation
-
 pub fn game_ability(params: GameAbilityParams, tx: &mut Transaction, account: &Account) -> Result<Game, Error> {
     let query = "
         SELECT *
@@ -358,7 +353,7 @@ pub fn game_ability(params: GameAbilityParams, tx: &mut Transaction, account: &A
     return game_write(game, tx);
 }
 
-pub fn game_new(game: Game, tx: &mut Transaction) -> Result<Game, Error> {
+pub fn game_new(game: &Game, tx: &mut Transaction) -> Result<(), Error> {
     let game_bytes = to_vec(&game)?;
 
     let query = "
@@ -374,35 +369,32 @@ pub fn game_new(game: Game, tx: &mut Transaction) -> Result<Game, Error> {
 
     println!("{:?} wrote game", game.id);
 
-    return Ok(game);
+    return Ok(());
 }
 
-pub fn players_write(game: Game, tx: &mut Transaction) -> Result<Game, Error> {
-    let game_bytes = to_vec(&game)?;
+/// write a row for every cryp in a team when added to a battle
+pub fn players_write(team: &Team, game_id: Uuid, tx: &mut Transaction) -> Result<(), Error> {
+    // pve
+    if !team.id.is_nil() {
+        for cryp in &team.cryps {
+            let id = Uuid::new_v4();
 
-    for team in &game.teams {
-        // pve
-        if !team.id.is_nil() {
-            for cryp in &team.cryps {
-                let id = Uuid::new_v4();
+            let query = "
+                INSERT INTO players (id, game, cryp, account)
+                VALUES ($1, $2, $3, $4)
+                RETURNING id, account;
+            ";
 
-                let query = "
-                    INSERT INTO players (id, game, cryp, account)
-                    VALUES ($1, $2, $3, $4)
-                    RETURNING id, account;
-                ";
+            let result = tx
+                .query(query, &[&id, &game_id, &cryp.id, &team.id])?;
 
-                let result = tx
-                    .query(query, &[&id, &game.id, &cryp.id, &team.id])?;
+            let _returned = result.iter().next().expect("no row written");
 
-                let _returned = result.iter().next().expect("no row written");
-
-                println!("wrote player entry game:{:?} cryp:{:?} account:{:?}", game.id, cryp.id, team.id);
-            }
+            println!("wrote player entry game:{:?} cryp:{:?} account:{:?}", game_id, cryp.id, team.id);
         }
     }
 
-    return Ok(game);
+    return Ok(());
 }
 
 pub fn game_write(game: Game, tx: &mut Transaction) -> Result<Game, Error> {
@@ -471,6 +463,8 @@ pub fn game_pve(params: GamePveParams, tx: &mut Transaction, account: &Account)
 
     let mut game = Game::new();
 
+    let game_id = game.id;
+
     game
         .set_team_num(2)
         .set_team_size(1);
@@ -489,7 +483,11 @@ pub fn game_pve(params: GamePveParams, tx: &mut Transaction, account: &Account)
 
     game.start();
 
-    return game_new(game, tx);
+    // persist
+    game_new(&game, tx)?;
+    players_write(&game.team_by_id(account.id), game_id, tx)?;
+
+    Ok(game)
 }
 
 #[cfg(test)]