Skip to content

Commit

Permalink
chore: fix clippy
Browse files Browse the repository at this point in the history
  • Loading branch information
cptrodgers committed May 24, 2024
1 parent 99c1157 commit 8d466b5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
1 change: 0 additions & 1 deletion graphql_server/src/db/submission.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use diesel::result::Error;
use diesel::{AsChangeset, ExpressionMethods, PgConnection, QueryDsl, RunQueryDsl};
use itertools::Itertools;
use uuid::Uuid;

use super::schema::assignment_submissions;
Expand Down
16 changes: 12 additions & 4 deletions graphql_server/src/graphql/assignment_action/assignment_query.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use async_graphql::*;
use crate::authorization::{DocumentActionPermission, SpaceActionPermission};
use async_graphql::*;

use crate::db::*;
use crate::error::IkigaiErrorExt;
Expand Down Expand Up @@ -27,9 +27,16 @@ impl AssignmentQuery {
let document = Document::find_by_id(&mut conn, assignment.document_id).format_err()?;
(assignment, document)
};
document_quick_authorize(ctx, assignment.document_id, DocumentActionPermission::ViewDocument).await?;
document_quick_authorize(
ctx,
assignment.document_id,
DocumentActionPermission::ViewDocument,
)
.await?;
let view_all = if let Some(space_id) = document.space_id {
space_quick_authorize(ctx, space_id, SpaceActionPermission::ManageSpaceContent).await.is_ok()
space_quick_authorize(ctx, space_id, SpaceActionPermission::ManageSpaceContent)
.await
.is_ok()
} else {
false
};
Expand All @@ -39,7 +46,8 @@ impl AssignmentQuery {
Submission::find_all_by_assignment(&mut conn, assignment_id).format_err()?
} else {
let user_id = get_user_id_from_ctx(ctx).await?;
Submission::find_all_by_assignment_and_user(&mut conn, user_id, assignment_id).format_err()?
Submission::find_all_by_assignment_and_user(&mut conn, user_id, assignment_id)
.format_err()?
};

Ok(submissions)
Expand Down
1 change: 0 additions & 1 deletion graphql_server/src/graphql/user_action/user_query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use crate::helper::{
create_default_space, document_authorize, get_conn_from_ctx, get_user_from_ctx,
get_user_id_from_ctx,
};
use crate::util::get_now_as_secs;
use async_graphql::*;
use diesel::Connection;
use uuid::Uuid;
Expand Down

0 comments on commit 8d466b5

Please sign in to comment.