From 185ba5270aaf94de9b91e4455be27db5198ec21e Mon Sep 17 00:00:00 2001
From: Santo Cariotti <santo@dcariotti.me>
Date: Wed, 21 Aug 2024 11:59:50 +0200
Subject: Reformat graphql mod

---
 src/graphql.rs        | 48 ------------------------------------------------
 src/graphql/mod.rs    |  2 ++
 src/graphql/query.rs  | 36 ++++++++++++++++++++++++++++++++++++
 src/graphql/routes.rs | 11 +++++++++++
 src/main.rs           |  4 ++--
 5 files changed, 51 insertions(+), 50 deletions(-)
 delete mode 100644 src/graphql.rs
 create mode 100644 src/graphql/mod.rs
 create mode 100644 src/graphql/query.rs
 create mode 100644 src/graphql/routes.rs

(limited to 'src')

diff --git a/src/graphql.rs b/src/graphql.rs
deleted file mode 100644
index 2843156..0000000
--- a/src/graphql.rs
+++ /dev/null
@@ -1,48 +0,0 @@
-use std::sync::Arc;
-
-use async_graphql::{Context, EmptyMutation, EmptySubscription, Object, Schema};
-use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
-
-// use crate::state::AppState;
-
-pub struct Query;
-
-#[Object]
-impl Query {
-    async fn api_version(&self) -> &'static str {
-        "1.0"
-    }
-
-    /// Returns the sum of a and b
-    async fn add<'ctx>(
-        &self,
-        _ctx: &Context<'ctx>,
-        #[graphql(desc = "First value")] a: i32,
-        #[graphql(desc = "Second value")] b: Option<i32>,
-    ) -> i32 {
-        // let state = ctx.data::<AppState>().unwrap();
-        // let client = &*state.client;
-        //
-        // // Perform a database query
-        // let rows = client
-        //     .query("SELECT owner FROM payment", &[])
-        //     .await
-        //     .unwrap();
-        // for row in rows {
-        //     let owner: String = row.get(0);
-        //     println!("{owner}");
-        // }
-
-        match b {
-            Some(x) => a + x,
-            None => a,
-        }
-    }
-}
-
-pub async fn graphql_handler(
-    schema: Arc<Schema<Query, EmptyMutation, EmptySubscription>>,
-    req: GraphQLRequest,
-) -> GraphQLResponse {
-    schema.execute(req.into_inner()).await.into()
-}
diff --git a/src/graphql/mod.rs b/src/graphql/mod.rs
new file mode 100644
index 0000000..305f0d3
--- /dev/null
+++ b/src/graphql/mod.rs
@@ -0,0 +1,2 @@
+pub mod query;
+pub mod routes;
diff --git a/src/graphql/query.rs b/src/graphql/query.rs
new file mode 100644
index 0000000..683885e
--- /dev/null
+++ b/src/graphql/query.rs
@@ -0,0 +1,36 @@
+use async_graphql::{Context, Object};
+
+pub struct Query;
+
+#[Object]
+impl Query {
+    async fn api_version(&self) -> &'static str {
+        "1.0"
+    }
+
+    /// Returns the sum of a and b
+    async fn add<'ctx>(
+        &self,
+        _ctx: &Context<'ctx>,
+        #[graphql(desc = "First value")] a: i32,
+        #[graphql(desc = "Second value")] b: Option<i32>,
+    ) -> i32 {
+        // let state = ctx.data::<AppState>().unwrap();
+        // let client = &*state.client;
+        //
+        // // Perform a database query
+        // let rows = client
+        //     .query("SELECT owner FROM payment", &[])
+        //     .await
+        //     .unwrap();
+        // for row in rows {
+        //     let owner: String = row.get(0);
+        //     println!("{owner}");
+        // }
+
+        match b {
+            Some(x) => a + x,
+            None => a,
+        }
+    }
+}
diff --git a/src/graphql/routes.rs b/src/graphql/routes.rs
new file mode 100644
index 0000000..2380760
--- /dev/null
+++ b/src/graphql/routes.rs
@@ -0,0 +1,11 @@
+use crate::graphql::query::*;
+use async_graphql::{EmptyMutation, EmptySubscription, Schema};
+use async_graphql_axum::{GraphQLRequest, GraphQLResponse};
+use std::sync::Arc;
+
+pub async fn graphql_handler(
+    schema: Arc<Schema<Query, EmptyMutation, EmptySubscription>>,
+    req: GraphQLRequest,
+) -> GraphQLResponse {
+    schema.execute(req.into_inner()).await.into()
+}
diff --git a/src/main.rs b/src/main.rs
index 7ef7ee6..e87a7c4 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -30,13 +30,13 @@ async fn create_app() -> Router {
         client: Arc::new(dbclient),
     };
 
-    let schema = Schema::build(graphql::Query, EmptyMutation, EmptySubscription)
+    let schema = Schema::build(graphql::query::Query, EmptyMutation, EmptySubscription)
         .data(state.clone())
         .finish();
     Router::new()
         .route(
             "/graphql",
-            post(move |req| graphql::graphql_handler(schema.clone().into(), req)),
+            post(move |req| graphql::routes::graphql_handler(schema.clone().into(), req)),
         )
         .fallback(crate::routes::page_404)
         // Mark the `Authorization` request header as sensitive so it doesn't
-- 
cgit v1.2.3-18-g5258