Skip to content

Commit 20688f3

Browse files
committed
Require steamid for players and make player name optional in the database schema
1 parent 3e5410f commit 20688f3

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

migrations/002_update_player.sql

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ALTER TABLE players ALTER COLUMN steamid SET NOT NULL;
2+
3+
ALTER TABLE players ALTER COLUMN name DROP NOT NULL;

src/database/models.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ pub struct Player {
2828
deserialize_with = "deserialize_uuid"
2929
)]
3030
pub id: Uuid,
31-
pub name: String,
31+
pub name: Option<String>,
3232
#[serde(
3333
serialize_with = "serialize_uuid",
3434
deserialize_with = "deserialize_uuid"
3535
)]
3636
pub team_id: Uuid,
3737
pub tag: Option<String>,
38-
pub steamid: Option<String>,
38+
pub steamid: String,
3939
}
4040

4141
#[derive(Deserialize, Serialize, Debug, Clone, sqlx::FromRow)]

src/web/get5.rs

+4-8
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,10 @@ use crate::get5::basic::{
1212
use crate::web::State;
1313

1414
fn format_player(player: &Player) -> Option<Get5Player> {
15-
if let Some(steamid) = player.steamid.clone() {
16-
Some(Get5Player {
17-
steamID: steamid,
18-
name: Some(player.name.clone()), // TODO make player name optional in database
19-
})
20-
} else {
21-
None
22-
}
15+
Some(Get5Player {
16+
steamID: player.steamid.clone(),
17+
name: player.name.clone(),
18+
})
2319
}
2420

2521
#[derive(Deserialize, Debug)]

0 commit comments

Comments
 (0)