models/krate: Remove errors::version_not_found() dependency

Author: Turbo87

src/controllers/krate/metadata.rs

@@ -11,7 +11,9 @@ use crate::models::{
     Version, VersionOwnerAction,
 };
 use crate::schema::*;
-use crate::util::errors::{bad_request, crate_not_found, AppResult, BoxedAppError};
+use crate::util::errors::{
+    bad_request, crate_not_found, version_not_found, AppResult, BoxedAppError,
+};
 use crate::views::{EncodableCategory, EncodableCrate, EncodableKeyword, EncodableVersion};
 use axum::extract::{FromRequestParts, Query};
 use axum_extra::json;
@@ -123,6 +125,8 @@ pub async fn find_crate(
         .filter(|_| include.default_version && !include.versions)
     {
         let version = krate.find_version(&mut conn, default_version).await?;
+        let version = version.ok_or_else(|| version_not_found(&krate.name, default_version))?;
+
         let (actions, published_by) = tokio::try_join!(
             VersionOwnerAction::by_version(&mut conn, &version),
             version.published_by(&mut conn),

src/controllers/version.rs

@@ -14,7 +14,7 @@ use utoipa::IntoParams;
 
 use crate::controllers::krate::load_crate;
 use crate::models::{Crate, Version};
-use crate::util::errors::AppResult;
+use crate::util::errors::{version_not_found, AppResult};
 
 #[derive(Deserialize, FromRequestParts, IntoParams)]
 #[into_params(parameter_in = Path)]
@@ -47,7 +47,10 @@ async fn version_and_crate(
     semver: &str,
 ) -> AppResult<(Version, Crate)> {
     let krate = load_crate(conn, crate_name).await?;
-    let version = krate.find_version(conn, semver).await?;
+    let version = krate
+        .find_version(conn, semver)
+        .await?
+        .ok_or_else(|| version_not_found(crate_name, semver))?;
 
     Ok((version, krate))
 }

src/models/krate.rs

@@ -16,7 +16,6 @@ use crate::models::{
     ReverseDependency, User, Version,
 };
 use crate::schema::*;
-use crate::util::errors::{version_not_found, AppResult};
 use crate::{app::App, util::errors::BoxedAppError};
 use crates_io_diesel_helpers::canon_crate_name;
 
@@ -208,14 +207,13 @@ impl Crate {
         &self,
         conn: &mut AsyncPgConnection,
         version: &str,
-    ) -> AppResult<Version> {
+    ) -> QueryResult<Option<Version>> {
         Version::belonging_to(self)
             .filter(versions::num.eq(version))
             .select(Version::as_select())
             .first(conn)
             .await
-            .optional()?
-            .ok_or_else(|| version_not_found(&self.name, version))
+            .optional()
     }
 
     // Validates the name is a valid crate name.