Rework query infrastructure
This commit is contained in:
parent
7751829bd5
commit
589277bb34
|
@ -41,7 +41,7 @@ fn main() {
|
|||
.expect("Error reading from stdin");
|
||||
|
||||
if let Some(response) = block_on(run_query::<VideogameSearch, _>(
|
||||
VideogameSearchVars { name: search },
|
||||
VideogameSearchVars { name: &search },
|
||||
&auth_key,
|
||||
)) {
|
||||
for game in response.into_iter() {
|
||||
|
|
|
@ -1,5 +1,3 @@
|
|||
use std::fmt::{Display, Formatter};
|
||||
|
||||
use cynic::{GraphQlResponse, QueryBuilder};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
|
@ -19,18 +17,24 @@ pub struct ID(pub u64);
|
|||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct VideogameId(pub u64);
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub struct PlayerId(pub u64);
|
||||
pub struct EntrantId(pub u64);
|
||||
|
||||
// Query machinery
|
||||
|
||||
pub trait QueryUnwrap<Vars>: QueryBuilder<Vars> {
|
||||
type VarsUnwrapped;
|
||||
type Unwrapped;
|
||||
|
||||
fn wrap_vars(vars: Self::VarsUnwrapped) -> Vars;
|
||||
|
||||
fn unwrap_response(response: GraphQlResponse<Self>) -> Option<Self::Unwrapped>;
|
||||
}
|
||||
|
||||
// Generic function for running start.gg queries
|
||||
pub async fn run_query<Builder: 'static, Vars>(vars: Vars, auth: &str) -> Option<Builder::Unwrapped>
|
||||
pub async fn run_query<Builder: 'static, Vars>(
|
||||
vars: Builder::VarsUnwrapped,
|
||||
auth: &str,
|
||||
) -> Option<Builder::Unwrapped>
|
||||
where
|
||||
Builder: QueryUnwrap<Vars>,
|
||||
Vars: Serialize,
|
||||
|
@ -38,7 +42,7 @@ where
|
|||
{
|
||||
use cynic::http::SurfExt;
|
||||
|
||||
let query = Builder::build(vars);
|
||||
let query = Builder::build(<Builder as QueryUnwrap<Vars>>::wrap_vars(vars));
|
||||
|
||||
let response = surf::post("https://api.start.gg/gql/alpha")
|
||||
.header("Authorization", String::from("Bearer ") + auth)
|
||||
|
|
|
@ -2,11 +2,11 @@ use super::{QueryUnwrap, VideogameId, ID};
|
|||
use cynic::GraphQlResponse;
|
||||
use schema::schema;
|
||||
|
||||
// Query
|
||||
// Variables
|
||||
|
||||
#[derive(cynic::QueryVariables)]
|
||||
pub struct VideogameSearchVars {
|
||||
pub name: String,
|
||||
pub struct VideogameSearchVars<'a> {
|
||||
pub name: &'a str,
|
||||
}
|
||||
|
||||
// Query
|
||||
|
@ -15,18 +15,18 @@ pub struct VideogameSearchVars {
|
|||
#[cynic(graphql_type = "Query", variables = "VideogameSearchVars")]
|
||||
pub struct VideogameSearch {
|
||||
#[arguments(query: { filter: { name: $name }, page: 1, perPage: 10 })]
|
||||
pub videogames: Option<VideogameConnection>,
|
||||
videogames: Option<VideogameConnection>,
|
||||
}
|
||||
|
||||
#[derive(cynic::QueryFragment, Debug)]
|
||||
pub struct VideogameConnection {
|
||||
pub nodes: Option<Vec<Option<Videogame>>>,
|
||||
struct VideogameConnection {
|
||||
nodes: Option<Vec<Option<Videogame>>>,
|
||||
}
|
||||
|
||||
#[derive(cynic::QueryFragment, Debug)]
|
||||
pub struct Videogame {
|
||||
pub id: Option<ID>,
|
||||
pub name: Option<String>,
|
||||
struct Videogame {
|
||||
id: Option<ID>,
|
||||
name: Option<String>,
|
||||
}
|
||||
|
||||
// Unwrapping
|
||||
|
@ -36,9 +36,14 @@ pub struct VideogameResponse {
|
|||
pub name: String,
|
||||
}
|
||||
|
||||
impl QueryUnwrap<VideogameSearchVars> for VideogameSearch {
|
||||
impl<'a> QueryUnwrap<VideogameSearchVars<'a>> for VideogameSearch {
|
||||
type VarsUnwrapped = VideogameSearchVars<'a>;
|
||||
type Unwrapped = Vec<VideogameResponse>;
|
||||
|
||||
fn wrap_vars(vars: VideogameSearchVars) -> VideogameSearchVars {
|
||||
vars
|
||||
}
|
||||
|
||||
fn unwrap_response(
|
||||
response: GraphQlResponse<VideogameSearch>,
|
||||
) -> Option<Vec<VideogameResponse>> {
|
||||
|
@ -48,14 +53,14 @@ impl QueryUnwrap<VideogameSearchVars> for VideogameSearch {
|
|||
.videogames?
|
||||
.nodes?
|
||||
.into_iter()
|
||||
.map(|game| {
|
||||
.filter_map(|game| {
|
||||
let game_ = game?;
|
||||
Some(VideogameResponse {
|
||||
id: VideogameId(game_.id?.0),
|
||||
name: game_.name?,
|
||||
})
|
||||
})
|
||||
.try_collect()?,
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue