diff options
Diffstat (limited to 'src/channel')
| -rw-r--r-- | src/channel/app.rs | 16 | ||||
| -rw-r--r-- | src/channel/routes.rs | 2 |
2 files changed, 3 insertions, 15 deletions
diff --git a/src/channel/app.rs b/src/channel/app.rs index 7c0b107..5d6cada 100644 --- a/src/channel/app.rs +++ b/src/channel/app.rs @@ -5,7 +5,7 @@ use sqlx::sqlite::SqlitePool; use super::{repo::Provider as _, Channel, History, Id}; use crate::{ clock::DateTime, - db::NotFound, + db::{Duplicate as _, NotFound as _}, event::{repo::Provider as _, Broadcaster, Event, Sequence}, message::repo::Provider as _, }; @@ -27,7 +27,7 @@ impl<'a> Channels<'a> { .channels() .create(name, &created) .await - .map_err(|err| CreateError::from_duplicate_name(err, name))?; + .duplicate(|| CreateError::DuplicateName(name.into()))?; tx.commit().await?; self.events @@ -133,18 +133,6 @@ pub enum Error { DatabaseError(#[from] sqlx::Error), } -impl CreateError { - fn from_duplicate_name(error: sqlx::Error, name: &str) -> Self { - if let Some(error) = error.as_database_error() { - if error.is_unique_violation() { - return Self::DuplicateName(name.into()); - } - } - - Self::from(error) - } -} - #[derive(Debug, thiserror::Error)] pub enum InternalError { #[error(transparent)] diff --git a/src/channel/routes.rs b/src/channel/routes.rs index e97c447..eaf7962 100644 --- a/src/channel/routes.rs +++ b/src/channel/routes.rs @@ -53,7 +53,7 @@ impl IntoResponse for CreateError { let Self(error) = self; match error { duplicate @ app::CreateError::DuplicateName(_) => { - (StatusCode::BAD_REQUEST, duplicate.to_string()).into_response() + (StatusCode::CONFLICT, duplicate.to_string()).into_response() } other => Internal::from(other).into_response(), } |