controllers/krate: Extract CratePath::load_crate() and load_crate_id() fns

Author: Turbo87

src/controllers/krate.rs

@@ -1,4 +1,9 @@
+use crate::models::Crate;
+use crate::util::errors::{crate_not_found, AppResult};
 use axum::extract::{FromRequestParts, Path};
+use crates_io_database::schema::crates;
+use diesel::{OptionalExtension, QueryDsl};
+use diesel_async::{AsyncPgConnection, RunQueryDsl};
 
 pub mod delete;
 pub mod downloads;
@@ -15,3 +20,30 @@ pub struct CratePath {
     /// Name of the crate
     pub name: String,
 }
+
+impl CratePath {
+    pub async fn load_crate(&self, conn: &mut AsyncPgConnection) -> AppResult<Crate> {
+        load_crate(conn, &self.name).await
+    }
+
+    pub async fn load_crate_id(&self, conn: &mut AsyncPgConnection) -> AppResult<i32> {
+        load_crate_id(conn, &self.name).await
+    }
+}
+
+pub async fn load_crate(conn: &mut AsyncPgConnection, name: &str) -> AppResult<Crate> {
+    Crate::by_name(name)
+        .first(conn)
+        .await
+        .optional()?
+        .ok_or_else(|| crate_not_found(name))
+}
+
+pub async fn load_crate_id(conn: &mut AsyncPgConnection, name: &str) -> AppResult<i32> {
+    Crate::by_name(name)
+        .select(crates::id)
+        .first(conn)
+        .await
+        .optional()?
+        .ok_or_else(|| crate_not_found(name))
+}

src/controllers/krate/delete.rs

@@ -1,9 +1,9 @@
 use crate::app::AppState;
 use crate::auth::AuthCheck;
 use crate::controllers::krate::CratePath;
-use crate::models::{Crate, NewDeletedCrate, Rights};
+use crate::models::{NewDeletedCrate, Rights};
 use crate::schema::{crate_downloads, crates, dependencies};
-use crate::util::errors::{crate_not_found, custom, AppResult, BoxedAppError};
+use crate::util::errors::{custom, AppResult, BoxedAppError};
 use crate::worker::jobs;
 use bigdecimal::ToPrimitive;
 use chrono::{TimeDelta, Utc};
@@ -40,8 +40,7 @@ pub async fn delete_crate(path: CratePath, parts: Parts, app: AppState) -> AppRe
     let auth = AuthCheck::only_cookie().check(&parts, &mut conn).await?;
 
     // Check that the crate exists
-    let krate = find_crate(&mut conn, &path.name).await?;
-    let krate = krate.ok_or_else(|| crate_not_found(&path.name))?;
+    let krate = path.load_crate(&mut conn).await?;
 
     // Check that the user is an owner of the crate (team owners are not allowed to delete crates)
     let user = auth.user();
@@ -119,10 +118,6 @@ pub async fn delete_crate(path: CratePath, parts: Parts, app: AppState) -> AppRe
     Ok(StatusCode::NO_CONTENT)
 }
 
-async fn find_crate(conn: &mut AsyncPgConnection, name: &str) -> QueryResult<Option<Crate>> {
-    Crate::by_name(name).first(conn).await.optional()
-}
-
 async fn get_crate_downloads(conn: &mut AsyncPgConnection, crate_id: i32) -> QueryResult<u64> {
     let downloads = crate_downloads::table
         .find(crate_id)

src/controllers/krate/downloads.rs

@@ -5,10 +5,10 @@
 
 use crate::app::AppState;
 use crate::controllers::krate::CratePath;
-use crate::models::{Crate, Version, VersionDownload};
-use crate::schema::{crates, version_downloads, versions};
+use crate::models::{Version, VersionDownload};
+use crate::schema::{version_downloads, versions};
 use crate::sql::to_char;
-use crate::util::errors::{crate_not_found, AppResult};
+use crate::util::errors::AppResult;
 use crate::views::EncodableVersionDownload;
 use axum_extra::json;
 use axum_extra::response::ErasedJson;
@@ -33,12 +33,7 @@ pub async fn get_crate_downloads(state: AppState, path: CratePath) -> AppResult<
     use diesel::dsl::*;
     use diesel::sql_types::BigInt;
 
-    let crate_id: i32 = Crate::by_name(&path.name)
-        .select(crates::id)
-        .first(&mut conn)
-        .await
-        .optional()?
-        .ok_or_else(|| crate_not_found(&path.name))?;
+    let crate_id: i32 = path.load_crate_id(&mut conn).await?;
 
     let mut versions: Vec<Version> = versions::table
         .filter(versions::crate_id.eq(crate_id))

src/controllers/krate/metadata.rs

@@ -276,11 +276,7 @@ pub async fn list_reverse_dependencies(
 
     let pagination_options = PaginationOptions::builder().gather(&req)?;
 
-    let krate: Crate = Crate::by_name(&path.name)
-        .first(&mut conn)
-        .await
-        .optional()?
-        .ok_or_else(|| crate_not_found(&path.name))?;
+    let krate = path.load_crate(&mut conn).await?;
 
     let (rev_deps, total) = krate
         .reverse_dependencies(&mut conn, pagination_options)

src/controllers/krate/owners.rs

@@ -27,11 +27,7 @@ use secrecy::{ExposeSecret, SecretString};
 pub async fn list_owners(state: AppState, path: CratePath) -> AppResult<ErasedJson> {
     let mut conn = state.db_read().await?;
 
-    let krate: Crate = Crate::by_name(&path.name)
-        .first(&mut conn)
-        .await
-        .optional()?
-        .ok_or_else(|| crate_not_found(&path.name))?;
+    let krate = path.load_crate(&mut conn).await?;
 
     let owners = krate
         .owners(&mut conn)
@@ -52,11 +48,7 @@ pub async fn list_owners(state: AppState, path: CratePath) -> AppResult<ErasedJs
 )]
 pub async fn get_team_owners(state: AppState, path: CratePath) -> AppResult<ErasedJson> {
     let mut conn = state.db_read().await?;
-    let krate: Crate = Crate::by_name(&path.name)
-        .first(&mut conn)
-        .await
-        .optional()?
-        .ok_or_else(|| crate_not_found(&path.name))?;
+    let krate = path.load_crate(&mut conn).await?;
 
     let owners = Team::owning(&krate, &mut conn)
         .await?
@@ -77,11 +69,7 @@ pub async fn get_team_owners(state: AppState, path: CratePath) -> AppResult<Eras
 pub async fn get_user_owners(state: AppState, path: CratePath) -> AppResult<ErasedJson> {
     let mut conn = state.db_read().await?;
 
-    let krate: Crate = Crate::by_name(&path.name)
-        .first(&mut conn)
-        .await
-        .optional()?
-        .ok_or_else(|| crate_not_found(&path.name))?;
+    let krate = path.load_crate(&mut conn).await?;
 
     let owners = User::owning(&krate, &mut conn)
         .await?

src/controllers/krate/versions.rs

@@ -14,9 +14,9 @@ use std::str::FromStr;
 use crate::app::AppState;
 use crate::controllers::helpers::pagination::{encode_seek, Page, PaginationOptions};
 use crate::controllers::krate::CratePath;
-use crate::models::{Crate, User, Version, VersionOwnerAction};
-use crate::schema::{crates, users, versions};
-use crate::util::errors::{bad_request, crate_not_found, AppResult, BoxedAppError};
+use crate::models::{User, Version, VersionOwnerAction};
+use crate::schema::{users, versions};
+use crate::util::errors::{bad_request, AppResult, BoxedAppError};
 use crate::util::RequestUtils;
 use crate::views::EncodableVersion;
 
@@ -30,12 +30,7 @@ use crate::views::EncodableVersion;
 pub async fn list_versions(state: AppState, path: CratePath, req: Parts) -> AppResult<ErasedJson> {
     let mut conn = state.db_read().await?;
 
-    let crate_id: i32 = Crate::by_name(&path.name)
-        .select(crates::id)
-        .first(&mut conn)
-        .await
-        .optional()?
-        .ok_or_else(|| crate_not_found(&path.name))?;
+    let crate_id = path.load_crate_id(&mut conn).await?;
 
     let mut pagination = None;
     let params = req.query();