xerbalind/planetwars.dev
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages 1 Wiki Activity

allow selecting opponent in demo

Browse source
This commit is contained in:
Ilion Beyst 2022-03-03 21:12:16 +01:00
parent 0f7c3c3102
commit b70328227e
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
planetwars-server/src/routes/demo.rs
View file

@ -18,8 +18,9 @@ const OPPONENT_NAME: &'static str = "simplebot";
#[derive(Serialize, Deserialize, Debug)] #[derive(Serialize, Deserialize, Debug)]
pub struct SubmitBotParams { pub struct SubmitBotParams {
pub bot_name: Option<String>,
pub code: String, pub code: String,
// TODO: would it be better to pass an ID here?
pub opponent_name: Option<String>,
} }
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
@ -46,10 +47,14 @@ pub async fn submit_bot(
) -> Result<Json<SubmitBotResponse>, StatusCode> { ) -> Result<Json<SubmitBotResponse>, StatusCode> {
let conn = pool.get().await.expect("could not get database connection"); let conn = pool.get().await.expect("could not get database connection");
let opponent_name = params
.opponent_name
.unwrap_or_else(|| OPPONENT_NAME.to_string());
let opponent = let opponent =
db::bots::find_bot_by_name(OPPONENT_NAME, &conn).expect("could not find opponent bot"); db::bots::find_bot_by_name(&opponent_name, &conn).map_err(|_| StatusCode::BAD_REQUEST)?;
let opponent_code_bundle = let opponent_code_bundle =
db::bots::active_code_bundle(opponent.id, &conn).expect("opponent bot has no code bundles"); db::bots::active_code_bundle(opponent.id, &conn).map_err(|_| StatusCode::BAD_REQUEST)?;
let player_code_bundle = save_code_bundle(&params.code, None, &conn) let player_code_bundle = save_code_bundle(&params.code, None, &conn)
// TODO: can we recover from this? // TODO: can we recover from this?