Move newsletters endpoint to admin module

src/routes/admin/mod.rs

@@ -5,10 +5,12 @@ use axum::{
 };
 use dashboard::admin_dashboard;
 use logout::log_out;
+use newsletters::publish_newsletter;
 use password::{change_password, change_password_form};
 
 mod dashboard;
 mod logout;
+mod newsletters;
 mod password;
 
 pub fn router() -> Router<AppState> {
@@ -17,6 +19,7 @@ pub fn router() -> Router<AppState> {
             "/admin",
             Router::new()
                 .route("/dashboard", get(admin_dashboard))
+                .route("/newsletters", post(publish_newsletter))
                 .route("/password", get(change_password_form))
                 .route("/password", post(change_password))
                 .route("/logout", post(log_out)),

src/routes/admin/newsletters/mod.rs

@@ -0,0 +1,3 @@
+mod post;
+
+pub(super) use post::publish_newsletter;

src/routes/newsletters.rs → src/routes/admin/newsletters/post.rs

@@ -1,22 +1,15 @@
 use crate::{
     app_state::AppState,
-    authentication::middleware::AuthorizedSessionLayer,
     domain::{SubscriberEmail, SubscriptionStatus},
     utils::{e500, HttpError},
 };
 use anyhow::Context;
-use axum::{extract::State, routing::post, Json, Router};
+use axum::{extract::State, Json};
 use serde::Deserialize;
 use sqlx::PgPool;
 
-pub fn router() -> Router<AppState> {
-    Router::new()
-        .route("/newsletters", post(publish_newsletter))
-        .layer(AuthorizedSessionLayer)
-}
-
 #[tracing::instrument(name = "Publish newsletter", skip(app_state, body))]
-async fn publish_newsletter(
+pub(in crate::routes::admin) async fn publish_newsletter(
     State(app_state): State<AppState>,
     Json(body): Json<BodyData>,
 ) -> Result<(), HttpError<anyhow::Error>> {
@@ -75,7 +68,7 @@ async fn get_confirmed_subscribers(
 }
 
 #[derive(Deserialize)]
-struct BodyData {
+pub(in crate::routes::admin) struct BodyData {
     title: String,
     content: Content,
 }

src/routes/mod.rs

@@ -2,6 +2,5 @@ pub mod admin;
 pub mod health_check;
 pub mod home;
 pub mod login;
-pub mod newsletters;
 pub mod subscriptions;
 pub mod subscriptions_confirm;

src/startup.rs

@@ -3,7 +3,7 @@ use crate::{
     configuration::{ApplicationSettings, DatabaseSettings, Settings},
     email_client::EmailClient,
     request_id::RequestUuid,
-    routes::{admin, health_check, home, login, newsletters, subscriptions, subscriptions_confirm},
+    routes::{admin, health_check, home, login, subscriptions, subscriptions_confirm},
     telemetry::request_span,
 };
 use anyhow::anyhow;
@@ -131,7 +131,6 @@ async fn run(
         .merge(health_check::router())
         .merge(subscriptions::router())
         .merge(subscriptions_confirm::router())
-        .merge(newsletters::router())
         .merge(home::router())
         .merge(login::router())
         .merge(admin::router())

tests/api/helpers.rs

@@ -109,15 +109,6 @@ impl TestApp {
             .expect(Self::FAILED_TO_EXECUTE_REQUEST)
     }
 
-    pub async fn post_newsletters(&self, body: &serde_json::Value) -> reqwest::Response {
-        self.client
-            .post(self.url("/newsletters"))
-            .json(body)
-            .send()
-            .await
-            .expect(Self::FAILED_TO_EXECUTE_REQUEST)
-    }
-
     pub fn get_confirmation_links(&self, request: &wiremock::Request) -> ConfirmationLinks {
         let body: serde_json::Value = serde_json::from_slice(&request.body).unwrap();
 
@@ -177,6 +168,15 @@ impl TestApp {
         self.get_admin_dashboard().await.text().await.unwrap()
     }
 
+    pub async fn post_newsletters(&self, body: &serde_json::Value) -> reqwest::Response {
+        self.client
+            .post(self.url("/admin/newsletters"))
+            .json(body)
+            .send()
+            .await
+            .expect(Self::FAILED_TO_EXECUTE_REQUEST)
+    }
+
     pub async fn get_change_password_form(&self) -> Response {
         self.client
             .get(self.url("/admin/password"))