summaryrefslogtreecommitdiff
path: root/src/channel
diff options
context:
space:
mode:
Diffstat (limited to 'src/channel')
-rw-r--r--src/channel/routes/channel/delete.rs23
-rw-r--r--src/channel/routes/channel/test/delete.rs7
2 files changed, 19 insertions, 11 deletions
diff --git a/src/channel/routes/channel/delete.rs b/src/channel/routes/channel/delete.rs
index 91eb506..2d2b5f1 100644
--- a/src/channel/routes/channel/delete.rs
+++ b/src/channel/routes/channel/delete.rs
@@ -1,12 +1,12 @@
use axum::{
- extract::{Path, State},
+ extract::{Json, Path, State},
http::StatusCode,
- response::{IntoResponse, Response},
+ response::{self, IntoResponse},
};
use crate::{
app::App,
- channel::app,
+ channel::{self, app},
clock::RequestedAt,
error::{Internal, NotFound},
token::extract::Identity,
@@ -17,10 +17,21 @@ pub async fn handler(
Path(channel): Path<super::PathInfo>,
RequestedAt(deleted_at): RequestedAt,
_: Identity,
-) -> Result<StatusCode, Error> {
+) -> Result<Response, Error> {
app.channels().delete(&channel, &deleted_at).await?;
- Ok(StatusCode::ACCEPTED)
+ Ok(Response { id: channel })
+}
+
+#[derive(Debug, serde::Serialize)]
+pub struct Response {
+ pub id: channel::Id,
+}
+
+impl IntoResponse for Response {
+ fn into_response(self) -> response::Response {
+ (StatusCode::ACCEPTED, Json(self)).into_response()
+ }
}
#[derive(Debug, thiserror::Error)]
@@ -28,7 +39,7 @@ pub async fn handler(
pub struct Error(#[from] pub app::Error);
impl IntoResponse for Error {
- fn into_response(self) -> Response {
+ fn into_response(self) -> response::Response {
let Self(error) = self;
#[allow(clippy::match_wildcard_for_single_variants)]
match error {
diff --git a/src/channel/routes/channel/test/delete.rs b/src/channel/routes/channel/test/delete.rs
index e1210fd..0371b0a 100644
--- a/src/channel/routes/channel/test/delete.rs
+++ b/src/channel/routes/channel/test/delete.rs
@@ -1,7 +1,4 @@
-use axum::{
- extract::{Path, State},
- http::StatusCode,
-};
+use axum::extract::{Path, State};
use crate::{
channel::{app, routes::channel::delete},
@@ -29,7 +26,7 @@ pub async fn valid_channel() {
// Verify the response
- assert_eq!(response, StatusCode::ACCEPTED);
+ assert_eq!(channel.id, response.id);
// Verify the semantics