Votes div remains to have date displayed per vote
This commit is contained in:
100
src/main.rs
100
src/main.rs
@@ -68,6 +68,7 @@ struct Player {
|
||||
|
||||
#[derive(Serialize, Deserialize)]
|
||||
struct Vote {
|
||||
id: i64,
|
||||
plus_player_id: i64,
|
||||
plus_nickname: String,
|
||||
plus_reason: String,
|
||||
@@ -282,6 +283,7 @@ async fn get_votes(req: &Request<Incoming>, db: Arc<Mutex<SqlitePool>>) -> Vec<V
|
||||
items
|
||||
.iter()
|
||||
.map(|x| Vote {
|
||||
id: x.id,
|
||||
plus_player_id: x.plus_player_id,
|
||||
plus_nickname: x.plus_nickname.clone(),
|
||||
plus_reason: x.plus_reason.clone(),
|
||||
@@ -332,6 +334,27 @@ async fn get_admin(
|
||||
let stringed = serde_json::to_string(&players).unwrap_or("".to_string());
|
||||
Ok(Response::builder().body(Body::new(stringed)).unwrap())
|
||||
}
|
||||
"/admin/votes" => {
|
||||
let pool = db.clone().lock().unwrap().clone();
|
||||
let votes = sqlx::query!(r#"SELECT * FROM votes"#)
|
||||
.fetch_all(&pool)
|
||||
.await
|
||||
.unwrap();
|
||||
let votes: Vec<Vote> = votes
|
||||
.iter()
|
||||
.map(|x| Vote {
|
||||
id: x.id,
|
||||
plus_player_id: x.plus_player_id,
|
||||
plus_nickname: x.plus_nickname.clone(),
|
||||
plus_reason: x.plus_reason.clone(),
|
||||
minus_player_id: x.minus_player_id,
|
||||
minus_nickname: x.minus_nickname.clone(),
|
||||
minus_reason: x.minus_reason.clone(),
|
||||
})
|
||||
.collect();
|
||||
let stringed = serde_json::to_string(&votes).unwrap_or("".to_string());
|
||||
Ok(Response::builder().body(Body::new(stringed)).unwrap())
|
||||
}
|
||||
_ => not_found().await,
|
||||
}
|
||||
}
|
||||
@@ -382,7 +405,10 @@ async fn post_vote(
|
||||
ok().await
|
||||
}
|
||||
|
||||
async fn post_player(req: Request<Incoming>, db: Arc<Mutex<SqlitePool>>) -> Result<Response<Body>, Error> {
|
||||
async fn post_player(
|
||||
req: Request<Incoming>,
|
||||
db: Arc<Mutex<SqlitePool>>,
|
||||
) -> Result<Response<Body>, Error> {
|
||||
let data = req_json::<Value>(req).await;
|
||||
if data.is_none() {
|
||||
return bad_request().await;
|
||||
@@ -391,19 +417,37 @@ async fn post_player(req: Request<Incoming>, db: Arc<Mutex<SqlitePool>>) -> Resu
|
||||
let name = data.get("name").unwrap().as_str().unwrap();
|
||||
let pool = db.clone().lock().unwrap().clone();
|
||||
let mut conn = pool.acquire().await.unwrap();
|
||||
if let Ok(Some(player)) = sqlx::query!(r#"SELECT * FROM players WHERE name = ?1"#, name).fetch_optional(&pool).await {
|
||||
let player = Player{id: player.id, name: player.name};
|
||||
return Ok(Response::builder().body(Body::new(serde_json::to_string(&player).unwrap())).unwrap());
|
||||
if let Ok(Some(player)) = sqlx::query!(r#"SELECT * FROM players WHERE name = ?1"#, name)
|
||||
.fetch_optional(&pool)
|
||||
.await
|
||||
{
|
||||
let player = Player {
|
||||
id: player.id,
|
||||
name: player.name,
|
||||
};
|
||||
return Ok(Response::builder()
|
||||
.body(Body::new(serde_json::to_string(&player).unwrap()))
|
||||
.unwrap());
|
||||
}
|
||||
let r = sqlx::query!(r#"INSERT INTO players (name) VALUES (?1) RETURNING id"#, name).fetch_one(&mut *conn).await;
|
||||
let r = sqlx::query!(
|
||||
r#"INSERT INTO players (name) VALUES (?1) RETURNING id"#,
|
||||
name
|
||||
)
|
||||
.fetch_one(&mut *conn)
|
||||
.await;
|
||||
if r.is_err() {
|
||||
return Ok(Response::builder()
|
||||
.status(StatusCode::INTERNAL_SERVER_ERROR)
|
||||
.body(Body::Empty)
|
||||
.unwrap());
|
||||
}
|
||||
let player = Player{id: r.unwrap().id, name: name.to_string()};
|
||||
Ok(Response::builder().body(Body::new(serde_json::to_string(&player).unwrap())).unwrap())
|
||||
let player = Player {
|
||||
id: r.unwrap().id,
|
||||
name: name.to_string(),
|
||||
};
|
||||
Ok(Response::builder()
|
||||
.body(Body::new(serde_json::to_string(&player).unwrap()))
|
||||
.unwrap())
|
||||
}
|
||||
|
||||
async fn post_admin(
|
||||
@@ -504,6 +548,48 @@ async fn post_admin(
|
||||
}
|
||||
_ => bad_request().await,
|
||||
},
|
||||
"/admin/edit/vote" => match req_json::<Vote>(req).await {
|
||||
Some(vote) => {
|
||||
let pool = db.clone().lock().unwrap().clone();
|
||||
let _ = sqlx::query!(
|
||||
r#"UPDATE votes
|
||||
SET plus_player_id = ?1,
|
||||
plus_nickname = ?2,
|
||||
plus_reason = ?3,
|
||||
minus_player_id = ?4,
|
||||
minus_nickname = ?5,
|
||||
minus_reason = ?6
|
||||
WHERE id = ?7"#,
|
||||
vote.plus_player_id,
|
||||
vote.plus_nickname,
|
||||
vote.plus_reason,
|
||||
vote.minus_player_id,
|
||||
vote.minus_nickname,
|
||||
vote.minus_reason,
|
||||
vote.id
|
||||
)
|
||||
.execute(&pool)
|
||||
.await;
|
||||
ok().await
|
||||
}
|
||||
_ => bad_request().await,
|
||||
},
|
||||
"/admin/delete/vote" => match req_json::<Value>(req).await {
|
||||
Some(Value::Object(vote)) => {
|
||||
let id = vote.get("id");
|
||||
if id.is_none() {
|
||||
return bad_request().await;
|
||||
}
|
||||
let pool = db.clone().lock().unwrap().clone();
|
||||
let mut conn = pool.acquire().await.unwrap();
|
||||
let id = id.unwrap().as_i64().unwrap();
|
||||
let _ = sqlx::query!(r#"DELETE FROM votes WHERE id = ?1"#, id)
|
||||
.execute(&mut *conn)
|
||||
.await;
|
||||
ok().await
|
||||
}
|
||||
_ => bad_request().await,
|
||||
}
|
||||
_ => bad_request().await,
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user