Skip to content

controllers/user/me: Pipeline SQL queries #10706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 27, 2025
Merged

controllers/user/me: Pipeline SQL queries #10706

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/controllers/user/me.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use axum_extra::json;
use axum_extra::response::ErasedJson;
use diesel::prelude::*;
use diesel_async::RunQueryDsl;
use futures_util::FutureExt;
use http::request::Parts;

use crate::app::AppState;
Expand All @@ -29,7 +30,8 @@ pub async fn get_authenticated_user(app: AppState, req: Parts) -> AppResult<Json
.check(&req, &mut conn)
.await?
.user_id();
let (user, verified, email, verification_sent): (User, Option<bool>, Option<String>, bool) =

let ((user, verified, email, verification_sent), owned_crates) = tokio::try_join!(
users::table
.find(user_id)
.left_join(emails::table)
Expand All @@ -39,16 +41,18 @@ pub async fn get_authenticated_user(app: AppState, req: Parts) -> AppResult<Json
emails::email.nullable(),
emails::token_generated_at.nullable().is_not_null(),
))
.first(&mut conn)
.await?;
.first::<(User, Option<bool>, Option<String>, bool)>(&mut conn)
.boxed(),
CrateOwner::by_owner_kind(OwnerKind::User)
.inner_join(crates::table)
.filter(crate_owners::owner_id.eq(user_id))
.select((crates::id, crates::name, crate_owners::email_notifications))
.order(crates::name.asc())
.load(&mut conn)
.boxed()
)?;

let owned_crates = CrateOwner::by_owner_kind(OwnerKind::User)
.inner_join(crates::table)
.filter(crate_owners::owner_id.eq(user_id))
.select((crates::id, crates::name, crate_owners::email_notifications))
.order(crates::name.asc())
.load(&mut conn)
.await?
let owned_crates = owned_crates
.into_iter()
.map(|(id, name, email_notifications)| OwnedCrate {
id,
Expand Down