Merge pull request #2 from korir248/main

changes from main

Author: korir248

examples/web_app_graphql/Cargo.toml

@@ -23,3 +23,4 @@ meilisearch-sdk = "0.24.3"
 serde = { version = "1.0.192", features = ["derive"] }
 serde_json = "1.0.108"
 thiserror = "1.0.51"
+validator = { version = "0.16.1", features = ["derive"] }

examples/web_app_graphql/src/graphql_schema/mod.rs

@@ -1,9 +1,15 @@
 use async_graphql::SimpleObject;
 pub mod users;
 
-use users::UsersQuery;
+use users::mutation::UsersMut;
+use users::query::UsersQuery;
 
 #[derive(Default, SimpleObject)]
 pub struct Query {
     users: UsersQuery,
 }
+
+#[derive(Default, SimpleObject)]
+pub struct Mutation {
+    users: UsersMut,
+}

examples/web_app_graphql/src/graphql_schema/users/mod.rs

@@ -1,10 +1,2 @@
-use async_graphql::MergedObject;
-pub mod get_users;
-pub mod search;
-
-use get_users::GetUsers;
-use search::SearchUsers;
-
-//Combines user queries into one struct
-#[derive(Default, MergedObject)]
-pub struct UsersQuery(pub GetUsers, pub SearchUsers);
+pub mod mutation;
+pub mod query;

examples/web_app_graphql/src/graphql_schema/users/mutation/add_user.rs

@@ -0,0 +1,68 @@
+use async_graphql::{Context, InputObject, Object, Result};
+use diesel_async::RunQueryDsl;
+use validator::Validate;
+
+use crate::{
+    models::{NewUser, User},
+    validate_input, GraphQlData,
+};
+
+#[derive(Default)]
+pub struct AddUser;
+
+#[derive(InputObject, Validate)]
+pub struct IAddUser {
+    #[validate(length(min = 1))]
+    pub first_name: String,
+    #[validate(length(min = 1))]
+    pub last_name: String,
+    #[validate(email)]
+    pub email: String,
+}
+
+#[Object]
+impl AddUser {
+    ///Resolver for creating a new user and storing that data in the database
+    ///
+    /// The mutation can be run as follows
+    /// ```gpl
+    /// mutation AddUser{
+    ///     users {
+    ///         signup(input: {firstName: "",lastName: "",email: ""}){
+    ///             id
+    ///             firstName
+    ///             lastName
+    ///             email
+    ///         }
+    ///     }
+    /// }
+    pub async fn signup(&self, ctx: &Context<'_>, input: IAddUser) -> Result<User> {
+        validate_input(&input)?;
+
+        use crate::schema::users::dsl::users;
+
+        let GraphQlData { pool, .. } = ctx.data().map_err(|e| {
+            log::error!("Failed to get app data: {:?}", e);
+            e
+        })?;
+
+        let mut connection = pool.get().await?;
+
+        let value = NewUser {
+            first_name: input.first_name,
+            last_name: input.last_name,
+            email: input.email,
+        };
+
+        let result = diesel::insert_into(users)
+            .values(&value)
+            .get_result::<User>(&mut connection)
+            .await
+            .map_err(|e| {
+                log::error!("Could not create new user: {:#?}", e);
+                e
+            })?;
+
+        Ok(result)
+    }
+}

examples/web_app_graphql/src/graphql_schema/users/mutation/mod.rs

@@ -0,0 +1,8 @@
+pub mod add_user;
+
+use add_user::AddUser;
+use async_graphql::MergedObject;
+
+//Combines user queries into one struct
+#[derive(Default, MergedObject)]
+pub struct UsersMut(pub AddUser);

examples/web_app_graphql/src/graphql_schema/users/get_users.rs renamed to examples/web_app_graphql/src/graphql_schema/users/query/get_users.rs

@@ -0,0 +1,10 @@
+pub mod get_users;
+pub mod search;
+
+use async_graphql::MergedObject;
+use get_users::GetUsers;
+use search::SearchUsers;
+
+//Combines user queries into one struct
+#[derive(Default, MergedObject)]
+pub struct UsersQuery(pub GetUsers, pub SearchUsers);

examples/web_app_graphql/src/graphql_schema/users/query/mod.rs

@@ -6,19 +6,22 @@ mod schema;
 
 use actix_web::{web, HttpResponse, Result};
 use app_env_vars::AppEnvVars;
-use async_graphql::{http::GraphiQLSource, EmptyMutation, EmptySubscription, Schema};
+use async_graphql::{
+    http::GraphiQLSource, EmptySubscription, Error, Result as GraphqlResult, Schema,
+};
 use async_graphql_actix_web::{GraphQLRequest, GraphQLResponse};
 use diesel_async::{
     pooled_connection::{deadpool::Pool, AsyncDieselConnectionManager},
     AsyncPgConnection,
 };
 use errors::ApplicationError;
-use graphql_schema::Query;
+use graphql_schema::{Mutation, Query};
 use meilisearch_sdk::Client as SearchClient;
+use validator::Validate;
 
-pub type ApplicationSchema = Schema<Query, EmptyMutation, EmptySubscription>;
+pub type ApplicationSchema = Schema<Query, Mutation, EmptySubscription>;
 
-//Represents application data passed to graphql resolvers
+/// Represents application data passed to graphql resolvers
 pub struct GraphQlData {
     pub pool: Pool<AsyncPgConnection>,
     pub client: SearchClient,
@@ -36,7 +39,7 @@ pub async fn index(schema: web::Data<ApplicationSchema>, req: GraphQLRequest) ->
     schema.execute(req_inner).await.into()
 }
 
-//We build the graphql schema and any data required to be passed to all resolvers
+/// We build the graphql schema and any data required to be passed to all resolvers
 pub fn build_schema(app_env_vars: &AppEnvVars) -> Result<ApplicationSchema, ApplicationError> {
     let client = SearchClient::new(
         &app_env_vars.meilisearch_host,
@@ -49,8 +52,19 @@ pub fn build_schema(app_env_vars: &AppEnvVars) -> Result<ApplicationSchema, Appl
     let schema_data = GraphQlData { pool, client };
 
     Ok(
-        Schema::build(Query::default(), EmptyMutation, EmptySubscription)
+        Schema::build(Query::default(), Mutation::default(), EmptySubscription)
             .data(schema_data)
             .finish(),
     )
 }
+
+/// Helper function for returning an error if inputs do not match the set conditions
+pub fn validate_input<T: Validate>(input: &T) -> GraphqlResult<()> {
+    if let Err(e) = input.validate() {
+        log::error!("Validation error: {}", e);
+        let err = serde_json::to_string(&e).unwrap();
+        let err = Error::from(err);
+        return Err(err);
+    }
+    Ok(())
+}

examples/web_app_graphql/src/graphql_schema/users/search.rs renamed to examples/web_app_graphql/src/graphql_schema/users/query/search.rs

@@ -1,5 +1,5 @@
 use async_graphql::SimpleObject;
-use diesel::{Queryable, Selectable};
+use diesel::{prelude::Insertable, Queryable, Selectable};
 use serde::{Deserialize, Serialize};
 
 use crate::schema::users;
@@ -13,3 +13,11 @@ pub struct User {
     pub last_name: String,
     pub email: String,
 }
+
+#[derive(Insertable, Debug)]
+#[diesel(table_name = users)]
+pub struct NewUser {
+    pub first_name: String,
+    pub last_name: String,
+    pub email: String,
+}