From af51f3f38f7cde751c66bb58370bc45394385ca2 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Sat, 1 Jun 2024 15:54:43 -0400 Subject: [PATCH] format --- src/bin/admin.rs | 10 ++-------- src/handler.rs | 5 ++++- src/handler/documents.rs | 15 ++++++++++----- src/models.rs | 6 +++--- src/models/documents.rs | 21 +++++++++++++++------ src/models/project_memberships.rs | 4 ++-- src/models/projects.rs | 2 +- src/models/types.rs | 1 + src/models/users.rs | 9 ++++++--- src/schema.rs | 7 +------ src/session.rs | 6 +++++- src/templates.rs | 7 +++++-- 12 files changed, 55 insertions(+), 38 deletions(-) diff --git a/src/bin/admin.rs b/src/bin/admin.rs index 3d6c7c9..1320e59 100644 --- a/src/bin/admin.rs +++ b/src/bin/admin.rs @@ -1,7 +1,7 @@ use anyhow::Result; use clap::{Parser, Subcommand}; -use pique::models::users::{self, NewUser}; use pique::db::establish_connection; +use pique::models::users::{self, NewUser}; use rand::distributions::Alphanumeric; use rand::{distributions::DistString, thread_rng}; @@ -27,13 +27,7 @@ pub async fn main() -> Result<()> { password } }; - handle_create_user(&db_url, NewUser::new( - name, - username, - email, - password, - )) - .await? + handle_create_user(&db_url, NewUser::new(name, username, email, password)).await? } AdminCommand::ListUsers => handle_list_users(&db_url).await?, }; diff --git a/src/handler.rs b/src/handler.rs index d67acb3..3fc6bc2 100644 --- a/src/handler.rs +++ b/src/handler.rs @@ -21,5 +21,8 @@ where E: std::error::Error, { error!(?err, "internal error"); - (StatusCode::INTERNAL_SERVER_ERROR, "Internal Server Error".into()) + ( + StatusCode::INTERNAL_SERVER_ERROR, + "Internal Server Error".into(), + ) } diff --git a/src/handler/documents.rs b/src/handler/documents.rs index b66bb0b..ac46dd2 100644 --- a/src/handler/documents.rs +++ b/src/handler/documents.rs @@ -26,7 +26,8 @@ async fn render_documents_page(ctx: Context, user: User) -> Result user, @@ -117,14 +118,16 @@ pub async fn edit_document_page( &user.id, &id.to_string(), Permission::Write, - ).map_err(internal_error)?; + ) + .map_err(internal_error)?; if !document_allowed { return Err((StatusCode::FORBIDDEN, "permission denied".to_owned())); } let document = documents::query::by_id(&mut db, &id.to_string()).map_err(internal_error)?; - let projects = permissions::query::accessible_projects(&mut db, &user.id).map_err(internal_error)?; + let projects = + permissions::query::accessible_projects(&mut db, &user.id).map_err(internal_error)?; let values = context! { user => user, @@ -159,7 +162,8 @@ pub async fn edit_document_submit( &user.id, &document_id.to_string(), Permission::Write, - ).map_err(internal_error)?; + ) + .map_err(internal_error)?; if !document_allowed { return Err((StatusCode::FORBIDDEN, "permission denied".to_owned())); @@ -170,7 +174,8 @@ pub async fn edit_document_submit( &document_id.to_string(), form.title.to_owned(), form.content.to_owned(), - ).map_err(internal_error)?; + ) + .map_err(internal_error)?; Ok(Redirect::to("/documents").into_response()) } diff --git a/src/models.rs b/src/models.rs index 3c3c7ab..b7f9c23 100644 --- a/src/models.rs +++ b/src/models.rs @@ -1,10 +1,10 @@ use thiserror::Error; -pub mod users; +pub mod documents; +pub mod project_memberships; pub mod projects; pub mod types; -pub mod project_memberships; -pub mod documents; +pub mod users; #[derive(Error, Debug)] pub enum DbError { diff --git a/src/models/documents.rs b/src/models/documents.rs index 5b2f3c0..5a710f3 100644 --- a/src/models/documents.rs +++ b/src/models/documents.rs @@ -42,7 +42,10 @@ impl NewDocument { pub mod query { use super::*; - pub fn create(db: &mut SqliteConnection, new_document: NewDocument) -> Result { + pub fn create( + db: &mut SqliteConnection, + new_document: NewDocument, + ) -> Result { diesel::insert_into(dsl::documents) .values(&new_document) .execute(db)?; @@ -54,19 +57,25 @@ pub mod query { Ok(document) } - pub fn update(db: &mut SqliteConnection, document_id: &str, title: String, content: String) -> Result { + pub fn update( + db: &mut SqliteConnection, + document_id: &str, + title: String, + content: String, + ) -> Result { diesel::update(dsl::documents.filter(dsl::id.eq(document_id))) .set((dsl::title.eq(title), dsl::content.eq(content))) .execute(db)?; - let document = dsl::documents - .filter(dsl::id.eq(document_id)) - .first(db)?; + let document = dsl::documents.filter(dsl::id.eq(document_id)).first(db)?; Ok(document) } - pub fn by_id(db: &mut SqliteConnection, document_id: &str) -> Result, DbError> { + pub fn by_id( + db: &mut SqliteConnection, + document_id: &str, + ) -> Result, DbError> { let document = dsl::documents .filter(dsl::id.eq(document_id)) .first::(db) diff --git a/src/models/project_memberships.rs b/src/models/project_memberships.rs index 21a8def..bb3b231 100644 --- a/src/models/project_memberships.rs +++ b/src/models/project_memberships.rs @@ -63,10 +63,10 @@ pub struct NewProjectMembership { } pub mod query { - use diesel::SqliteConnection; use super::*; + use diesel::SqliteConnection; - pub fn create ( + pub fn create( db: &mut SqliteConnection, user_id: &str, project_id: &str, diff --git a/src/models/projects.rs b/src/models/projects.rs index 285c4db..c7ba9cd 100644 --- a/src/models/projects.rs +++ b/src/models/projects.rs @@ -1,5 +1,5 @@ use diesel::prelude::*; -use serde::{Serialize}; +use serde::Serialize; use crate::schema::projects::dsl; use uuid::Uuid; diff --git a/src/models/types.rs b/src/models/types.rs index e69de29..8b13789 100644 --- a/src/models/types.rs +++ b/src/models/types.rs @@ -0,0 +1 @@ + diff --git a/src/models/users.rs b/src/models/users.rs index 1d4da0a..8669887 100644 --- a/src/models/users.rs +++ b/src/models/users.rs @@ -51,7 +51,6 @@ impl<'a> Query<'a> { } pub fn all(&mut self) -> Result, DbError> { - let user_list = dsl::users.load::(self.db)?; Ok(user_list) } @@ -62,7 +61,9 @@ impl<'a> Query<'a> { } pub fn by_username(&mut self, username: &str) -> Result { - let user = dsl::users.filter(dsl::username.eq(username)).first::(self.db)?; + let user = dsl::users + .filter(dsl::username.eq(username)) + .first::(self.db)?; Ok(user) } @@ -71,7 +72,9 @@ impl<'a> Query<'a> { .values(&new_user) .execute(self.db)?; - let new_user = dsl::users.filter(dsl::id.eq(&new_user.id)).first::(self.db)?; + let new_user = dsl::users + .filter(dsl::id.eq(&new_user.id)) + .first::(self.db)?; Ok(new_user) } diff --git a/src/schema.rs b/src/schema.rs index 0cbe886..9df8c05 100644 --- a/src/schema.rs +++ b/src/schema.rs @@ -39,9 +39,4 @@ diesel::table! { } } -diesel::allow_tables_to_appear_in_same_query!( - documents, - project_memberships, - projects, - users, -); +diesel::allow_tables_to_appear_in_same_query!(documents, project_memberships, projects, users,); diff --git a/src/session.rs b/src/session.rs index 2587c46..dfce60d 100644 --- a/src/session.rs +++ b/src/session.rs @@ -1,7 +1,11 @@ use async_trait::async_trait; use axum_login::{AuthUser, AuthnBackend, UserId}; -use crate::{models::{self, users, DbError}, password, prelude::*}; +use crate::{ + models::{self, users, DbError}, + password, + prelude::*, +}; #[derive(Serialize, Deserialize)] pub struct Credentials { diff --git a/src/templates.rs b/src/templates.rs index 9090c7f..bd18de7 100644 --- a/src/templates.rs +++ b/src/templates.rs @@ -1,6 +1,6 @@ -use minijinja::{Error, ErrorKind}; use free_icons::IconAttrs; use minijinja::{path_loader, Environment}; +use minijinja::{Error, ErrorKind}; use minijinja_autoreload::AutoReloader; pub fn make_template_loader(auto_reload: bool) -> AutoReloader { @@ -30,5 +30,8 @@ pub fn heroicon_filter(name: String, classes: Option) -> Result