Remove old stpuid roles

secert-hitler/src/controller/gamemaster/gamemaster.rs

@@ -1,11 +1,12 @@
 use super::super::super::model::state::room::Room;
 use super::lobby::Lobby;
+use super::player::Player;
 use super::gameevent::GameEvent;
 use super::gameevent::GameEventType;
 
 use std::thread;
 use std::time;
-use log::{info, warn, error, debug};
+use log::{info, debug, LevelFilter};
 
 pub struct GameMaster {
    room: Box<dyn Room>,
@@ -33,30 +34,61 @@ impl GameMaster {
    }
 
    fn run_lobby(&mut self) -> Result<usize, &str> {
+      self.run_lobby_loop()?;
+      self.lobby.ready()
+   }
+
+   fn run_lobby_loop(&mut self) -> Result<usize, &str> {
       while !self.lobby.locked {
-         let rollback = self.room.since();
-         let events = self.room.sync();
-         for e in &events {
-            let ge = GameEvent::new(e.body.clone());
-            if ge.mode() == GameEventType::GameStart {
-               self.room.rollback(e.since.clone());
-               self.lobby.lock();
-               return self.lobby.ready();
-            }
-            self.lobby.eat(e.clone());
-         }
+         self.run_lobby_scrape()?;
          thread::sleep(time::Duration::new(1, 0));
       }
-      return self.lobby.ready();
+      Ok(0)
+   }
+
+   fn run_lobby_scrape(&mut self) -> Result<usize, &str> {
+      /*
+      let rollback = self.room.since();
+      let events = self.room.sync();
+      for e in &events {
+         let ge = GameEvent::new(e.body.clone());
+         if ge.mode() == GameEventType::GameStart {
+            self.room.rollback(e.since.clone());
+            self.lobby.lock();
+            return self.lobby.ready();
+         }
+         self.lobby.eat(e.clone());
+      }
+      */
+      Ok(0)
    }
 
    fn run_game_setup(&mut self) -> Result<String, String> {
+      for player in self.players() {
+         if self.player(player.clone()).is_none() {
+            return Err(format!("missing player {}", player));
+         }
+         debug!("player = {}", player);
+      }
+      debug!("/players");
       Err("not impl".to_string())
    }
 
    fn run_game(&mut self) -> Result<String, String> {
       Err("not impl".to_string())
    }
+
+   fn players(&self) -> Vec<String> {
+      let mut players = vec![];
+      for k in self.lobby.players.keys() {
+         players.push(k.clone());
+      }
+      players
+   }
+
+   fn player(&mut self, id: String) -> Option<&mut Player> {
+      self.lobby.players.get_mut(&id)
+   }
 }
 
 #[cfg(test)]
@@ -67,9 +99,9 @@ mod tests {
    use super::super::super::super::model::state::rooms::Rooms;
 
    fn init() {
-      use env_logger::Env;
       let _ = env_logger::builder()
          .is_test(true)
+         .filter_level(LevelFilter::Trace)
          .try_init();
    }
 
@@ -125,7 +157,12 @@ mod tests {
 
    #[test]
    fn run_game_setup_fail() {
-      assert!(false, "not impl");
+      init();
+      let mut mrs = MockRooms::new();
+      let r1 = mrs.create();
+      let room_id = r1.room_id();
+      let mut gm = GameMaster::new(r1);
+      assert!(gm.run_game_setup().is_ok());
    }
 
    #[test]