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

Author: Turbo87

src/controllers/krate/owners.rs

@@ -1,9 +1,10 @@
 //! All routes related to managing owners of a crate
 
 use crate::controllers::krate::CratePath;
+use crate::models::krate::OwnerRemoveError;
 use crate::models::{krate::NewOwnerInvite, token::EndpointScope};
 use crate::models::{Crate, Owner, Rights, Team, User};
-use crate::util::errors::{bad_request, crate_not_found, custom, AppResult};
+use crate::util::errors::{bad_request, crate_not_found, custom, AppResult, BoxedAppError};
 use crate::views::EncodableOwner;
 use crate::{app::AppState, models::krate::OwnerAddError};
 use crate::{auth::AuthCheck, email::Email};
@@ -274,6 +275,17 @@ async fn modify_owners(
     Ok(json!({ "msg": comma_sep_msg, "ok": true }))
 }
 
+impl From<OwnerRemoveError> for BoxedAppError {
+    fn from(error: OwnerRemoveError) -> Self {
+        match error {
+            OwnerRemoveError::Diesel(error) => error.into(),
+            OwnerRemoveError::NotFound { login } => {
+                bad_request(format!("could not find owner with login `{login}`"))
+            }
+        }
+    }
+}
+
 pub struct OwnerInviteEmail {
     /// The destination email address for this email.
     recipient_email_address: String,

src/models/krate.rs

@@ -16,7 +16,7 @@ use crate::models::{
     ReverseDependency, User, Version,
 };
 use crate::schema::*;
-use crate::util::errors::{bad_request, version_not_found, AppResult};
+use crate::util::errors::{version_not_found, AppResult};
 use crate::{app::App, util::errors::BoxedAppError};
 use crates_io_diesel_helpers::canon_crate_name;
 
@@ -441,7 +441,11 @@ impl Crate {
         }
     }
 
-    pub async fn owner_remove(&self, conn: &mut AsyncPgConnection, login: &str) -> AppResult<()> {
+    pub async fn owner_remove(
+        &self,
+        conn: &mut AsyncPgConnection,
+        login: &str,
+    ) -> Result<(), OwnerRemoveError> {
         let query = diesel::sql_query(
             r#"WITH crate_owners_with_login AS (
                 SELECT
@@ -477,8 +481,7 @@ impl Crate {
             .await?;
 
         if num_updated_rows == 0 {
-            let error = format!("could not find owner with login `{login}`");
-            return Err(bad_request(error));
+            return Err(OwnerRemoveError::not_found(login));
         }
 
         Ok(())
@@ -533,6 +536,21 @@ pub enum OwnerAddError {
     AlreadyInvited(Box<User>),
 }
 
+#[derive(Debug, Error)]
+pub enum OwnerRemoveError {
+    #[error(transparent)]
+    Diesel(#[from] diesel::result::Error),
+    #[error("Could not find owner with login `{login}`")]
+    NotFound { login: String },
+}
+
+impl OwnerRemoveError {
+    pub fn not_found(login: &str) -> Self {
+        let login = login.to_string();
+        Self::NotFound { login }
+    }
+}
+
 /// A [`BoxedAppError`] does not impl [`std::error::Error`] so it needs a manual
 /// [`From`] impl.
 impl From<BoxedAppError> for OwnerAddError {