Chellaris/chellaris-rust-api
Chellaris/chellaris-rust-api
Archived
1
0
Fork 0
Code Issues Pull requests Releases 16 Packages Activity Actions

DB Schema Update

Browse source
This commit is contained in:
Neshura 2023-09-02 20:23:13 +02:00
parent 07e6df6b64
commit 8fd4321944
Signed by: Neshura
GPG key ID: B6983AAA6B9A7A6C
3 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/db/schemas.rs
View file

@ -13,7 +13,7 @@ pub struct Portrait {
pub id: i32, pub id: i32,
pub group_id: i32, pub group_id: i32,
pub hires: String, pub hires: String,
pub lores: Option<String>, pub lores: String,
} }
#[derive(Serialize, ToSchema, Debug, FromRow)] #[derive(Serialize, ToSchema, Debug, FromRow)]
@ -39,12 +39,13 @@ pub struct Ethic {
#[derive(Serialize, ToSchema, Debug, FromRow)] #[derive(Serialize, ToSchema, Debug, FromRow)]
pub struct Empire { pub struct Empire {
pub id: i32, pub id: i32,
pub discord_user: Option<String>,
pub group_id: i32, pub group_id: i32,
pub gestalt: Option<bool>, // TODO: make nn in DB schema
pub empire_portrait_id: i32,
pub empire_portrait_group_id: i32,
pub group_game_id: i32, pub group_game_id: i32,
pub name: String,
pub discord_user: Option<String>,
pub gestalt: bool,
pub empire_portrait_id: Option<i32>,
pub empire_portrait_group_id: Option<i32>,
} }
#[derive(Serialize, ToSchema, Debug, FromRow)] #[derive(Serialize, ToSchema, Debug, FromRow)]

4
src/v2/mod.rs
View file

@ -74,7 +74,7 @@ pub(crate) async fn empires(
empire_portrait_id: entry.empire_portrait_id, empire_portrait_id: entry.empire_portrait_id,
group_game_id: entry.group_game_id, group_game_id: entry.group_game_id,
discord_user: None, discord_user: None,
gestalt: entry.gestalt gestalt: Some(entry.gestalt)
}; };
if let Some(auth_token) = params.token.clone() { if let Some(auth_token) = params.token.clone() {
@ -249,7 +249,7 @@ pub(crate) async fn portraits(
id: entry.id, id: entry.id,
group_id: entry.group_id, group_id: entry.group_id,
hires: entry.hires.clone(), hires: entry.hires.clone(),
lores: entry.lores.clone() lores: Some(entry.lores.clone())
}; };
parsed_data.push(new_data); parsed_data.push(new_data);

4
src/v2/schemas.rs
View file

@ -47,8 +47,8 @@ pub struct Empire {
pub discord_user: Option<String>, pub discord_user: Option<String>,
pub group_id: i32, pub group_id: i32,
pub gestalt: Option<bool>, // TODO: make nn in DB schema pub gestalt: Option<bool>, // TODO: make nn in DB schema
pub empire_portrait_id: i32, pub empire_portrait_id: Option<i32>,
pub empire_portrait_group_id: i32, pub empire_portrait_group_id: Option<i32>,
pub group_game_id: i32, pub group_game_id: i32,
} }