Restructure SQL tables
This commit is contained in:
parent
c06c18c0ba
commit
72884497c1
6 changed files with 96 additions and 50 deletions
|
|
@ -79,7 +79,7 @@ struct Player {
|
|||
|
||||
#[derive(cynic::QueryFragment, Debug)]
|
||||
struct User {
|
||||
slug: Option<String>,
|
||||
discriminator: Option<String>,
|
||||
}
|
||||
|
||||
// Unwrap
|
||||
|
|
@ -129,7 +129,7 @@ impl QueryUnwrap<EventSetsVars> for EventSets {
|
|||
id: p_.id?,
|
||||
name: p_.gamer_tag?,
|
||||
prefix: p_.prefix.filter(|pr| !pr.is_empty()),
|
||||
slug: p_.user?.slug?,
|
||||
discrim: p_.user?.discriminator?,
|
||||
})
|
||||
})
|
||||
.try_collect()
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ struct Player {
|
|||
|
||||
#[derive(cynic::QueryFragment, Debug)]
|
||||
struct User {
|
||||
slug: Option<String>,
|
||||
discriminator: Option<String>,
|
||||
}
|
||||
|
||||
// Unwrapping
|
||||
|
|
@ -38,7 +38,7 @@ pub struct PlayerData {
|
|||
pub id: PlayerId,
|
||||
pub name: String,
|
||||
pub prefix: Option<String>,
|
||||
pub slug: String,
|
||||
pub discrim: String,
|
||||
}
|
||||
|
||||
impl QueryUnwrap<PlayerInfoVars> for PlayerInfo {
|
||||
|
|
@ -50,7 +50,7 @@ impl QueryUnwrap<PlayerInfoVars> for PlayerInfo {
|
|||
id: player.id?,
|
||||
name: player.gamer_tag?,
|
||||
prefix: player.prefix.filter(|pr| !pr.is_empty()),
|
||||
slug: player.user?.slug?,
|
||||
discrim: player.user?.discriminator?,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ pub struct TournamentEventsVars<'a> {
|
|||
pub struct TournamentEvents {
|
||||
#[arguments(query: {
|
||||
page: $page,
|
||||
perPage: 250,
|
||||
perPage: 225,
|
||||
sortBy: "endAt asc",
|
||||
filter: {
|
||||
past: true,
|
||||
|
|
@ -62,6 +62,7 @@ struct Tournament {
|
|||
#[cynic(variables = "TournamentEventsVars")]
|
||||
struct Event {
|
||||
id: Option<EventId>,
|
||||
slug: Option<String>,
|
||||
start_at: Option<Timestamp>,
|
||||
}
|
||||
|
||||
|
|
@ -81,6 +82,7 @@ pub struct TournamentData {
|
|||
#[derive(Debug, Clone)]
|
||||
pub struct EventData {
|
||||
pub id: EventId,
|
||||
pub slug: String,
|
||||
pub time: Timestamp,
|
||||
}
|
||||
|
||||
|
|
@ -103,6 +105,7 @@ impl<'a> QueryUnwrap<TournamentEventsVars<'a>> for TournamentEvents {
|
|||
.filter_map(|event| {
|
||||
Some(EventData {
|
||||
id: event.id?,
|
||||
slug: event.slug?,
|
||||
time: event.start_at?,
|
||||
})
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue