1 files changed, 28 insertions, 4 deletions
diff --git a/src/channel/app.rs b/src/channel/app.rs
index 2f37878..8ae0c3c 100644
--- a/src/channel/app.rs
+++ b/src/channel/app.rs
@@ -31,13 +31,17 @@ impl<'a> Channels<'a> {
         Self { db, broadcaster }
     }
 
-    pub async fn create(&self, name: &str) -> Result<(), InternalError> {
+    pub async fn create(&self, name: &str) -> Result<Channel, CreateError> {
         let mut tx = self.db.begin().await?;
-        let channel = tx.channels().create(name).await?;
-        self.broadcaster.register_channel(&channel);
+        let channel = tx
+            .channels()
+            .create(name)
+            .await
+            .map_err(|err| CreateError::from_duplicate_name(err, name))?;
+        self.broadcaster.register_channel(&channel.id);
         tx.commit().await?;
 
-        Ok(())
+        Ok(channel)
     }
 
     pub async fn all(&self) -> Result<Vec<Channel>, InternalError> {
@@ -122,6 +126,26 @@ impl<'a> Channels<'a> {
 }
 
 #[derive(Debug, thiserror::Error)]
+pub enum CreateError {
+    #[error("channel named {0} already exists")]
+    DuplicateName(String),
+    #[error(transparent)]
+    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)]
     DatabaseError(#[from] sqlx::Error),