Organizational pass on endpoints and routes.

4 files changed, 54 insertions, 48 deletions

diff --git a/src/message/app.rs b/src/message/app.rs
index 3385af2..c1bcde6 100644
--- a/src/message/app.rs
+++ b/src/message/app.rs
@@ -98,7 +98,7 @@ pub enum SendError {
     #[error("channel {0} not found")]
     ChannelNotFound(channel::Id),
     #[error(transparent)]
-    DatabaseError(#[from] sqlx::Error),
+    Database(#[from] sqlx::Error),
 }
 
 #[derive(Debug, thiserror::Error)]
@@ -108,5 +108,5 @@ pub enum DeleteError {
     #[error("message {0} not found")]
     NotFound(Id),
     #[error(transparent)]
-    DatabaseError(#[from] sqlx::Error),
+    Database(#[from] sqlx::Error),
 }
diff --git a/src/message/routes.rs b/src/message/routes.rs
deleted file mode 100644
index e21c674..0000000
--- a/src/message/routes.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use axum::{
-    extract::{Path, State},
-    http::StatusCode,
-    response::{IntoResponse, Response},
-    routing::delete,
-    Router,
-};
-
-use crate::{
-    app::App,
-    clock::RequestedAt,
-    error::{Internal, NotFound},
-    login::Login,
-    message::{self, app::DeleteError},
-};
-
-pub fn router() -> Router<App> {
-    Router::new().route("/api/messages/:message", delete(on_delete))
-}
-
-async fn on_delete(
-    State(app): State<App>,
-    Path(message): Path<message::Id>,
-    RequestedAt(deleted_at): RequestedAt,
-    _: Login,
-) -> Result<StatusCode, ErrorResponse> {
-    app.messages().delete(&message, &deleted_at).await?;
-
-    Ok(StatusCode::ACCEPTED)
-}
-
-#[derive(Debug, thiserror::Error)]
-#[error(transparent)]
-struct ErrorResponse(#[from] DeleteError);
-
-impl IntoResponse for ErrorResponse {
-    fn into_response(self) -> Response {
-        let Self(error) = self;
-        match error {
-            not_found @ (DeleteError::ChannelNotFound(_) | DeleteError::NotFound(_)) => {
-                NotFound(not_found).into_response()
-            }
-            other => Internal::from(other).into_response(),
-        }
-    }
-}
diff --git a/src/message/routes/message.rs b/src/message/routes/message.rs
new file mode 100644
index 0000000..059b8c1
--- /dev/null
+++ b/src/message/routes/message.rs
@@ -0,0 +1,43 @@
+pub mod delete {
+    use axum::{
+        extract::{Path, State},
+        http::StatusCode,
+        response::{IntoResponse, Response},
+    };
+
+    use crate::{
+        app::App,
+        clock::RequestedAt,
+        error::{Internal, NotFound},
+        login::Login,
+        message::{self, app::DeleteError},
+    };
+
+    pub async fn handler(
+        State(app): State<App>,
+        Path(message): Path<message::Id>,
+        RequestedAt(deleted_at): RequestedAt,
+        _: Login,
+    ) -> Result<StatusCode, Error> {
+        app.messages().delete(&message, &deleted_at).await?;
+
+        Ok(StatusCode::ACCEPTED)
+    }
+
+    #[derive(Debug, thiserror::Error)]
+    #[error(transparent)]
+    pub struct Error(#[from] pub DeleteError);
+
+    impl IntoResponse for Error {
+        fn into_response(self) -> Response {
+            let Self(error) = self;
+            #[allow(clippy::match_wildcard_for_single_variants)]
+            match error {
+                DeleteError::ChannelNotFound(_) | DeleteError::NotFound(_) => {
+                    NotFound(error).into_response()
+                }
+                other => Internal::from(other).into_response(),
+            }
+        }
+    }
+}
diff --git a/src/message/routes/mod.rs b/src/message/routes/mod.rs
new file mode 100644
index 0000000..dfe8628
--- /dev/null
+++ b/src/message/routes/mod.rs
@@ -0,0 +1,9 @@
+use axum::{routing::delete, Router};
+
+use crate::app::App;
+
+mod message;
+
+pub fn router() -> Router<App> {
+    Router::new().route("/api/messages/:message", delete(message::delete::handler))
+}