Refactor to clean-up axum server implementation

Cargo.toml

@@ -6,6 +6,7 @@ edition = "2024"
 [dependencies]
 axum = "0.8"
 serde = { version = "1", features = ["derive"] }
+sqlx = { version = "0.8.6", features = ["runtime-tokio", "postgres", "macros"] }
 tokio = { version = "1", features = ["full"] }
 tower = "0.5"
 tower-http = { version = "0.6", features = ["trace"] }

src/env.rs

@@ -0,0 +1,17 @@
+use std::env;
+
+#[derive(Clone)]
+pub struct Env {
+    pub postgres_connection_string: String,
+}
+
+impl Env {
+    pub fn parse_env() -> Env {
+        let postgres_connection_string = env::var("POSTGRES_CONNECTION_STRING")
+            .expect("Missing POSTGRES_CONNECTION_STRING as an environment variable");
+
+        Env {
+            postgres_connection_string,
+        }
+    }
+}

src/lib.rs

@@ -1,9 +1,12 @@
+pub mod env;
 pub mod routes;
+pub mod state;
 pub mod votes;
 
 use axum::Router;
+use state::AppState;
 use tower_http::trace::TraceLayer;
 
-pub fn app() -> Router {
+pub fn app(state: AppState) -> Router {
-    routes::router().layer(TraceLayer::new_for_http())
+    routes::router(state).layer(TraceLayer::new_for_http())
 }

src/main.rs

@@ -1,4 +1,5 @@
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
+use uprs::state::AppState;
 
 #[tokio::main]
 async fn main() {
@@ -13,5 +14,7 @@ async fn main() {
 
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
     tracing::info!("listening on {}", listener.local_addr().unwrap());
-    axum::serve(listener, uprs::app()).await.unwrap();
+    axum::serve(listener, uprs::app(AppState::new().await))
+        .await
+        .unwrap();
 }

src/routes.rs

@@ -1,15 +1,12 @@
-use std::sync::Arc;
-
 use axum::{Router, routing::get};
 
-use crate::votes::{repository::VoteRepository, service::VoteService};
+use crate::state::AppState;
-
-pub fn router() -> Router {
-    let vote_service = Arc::new(VoteService::new(VoteRepository::new()));
 
+pub fn router(state: AppState) -> Router {
     Router::new()
         .route("/health", get(health))
-        .merge(crate::votes::handlers::router(vote_service))
+        .merge(crate::votes::handlers::router())
+        .with_state(state)
 }
 
 async fn health() -> &'static str {

src/state.rs

@@ -0,0 +1,19 @@
+use sqlx::PgPool;
+
+use crate::env::Env;
+
+#[derive(Clone)]
+pub struct AppState {
+    pub db: PgPool,
+    pub env: Env,
+}
+
+impl AppState {
+    pub async fn new() -> Self {
+        let env = Env::parse_env();
+        let db = sqlx::PgPool::connect(&env.postgres_connection_string)
+            .await
+            .expect("Unable to connect to postgres db");
+        AppState { db, env }
+    }
+}

src/votes/handlers.rs

@@ -1,29 +1,13 @@
-use std::sync::Arc;
-
 use axum::{
     Router,
     extract::{Path, State},
     routing::{get, post},
 };
 
-use super::{dto::CreateVoteRequest, service::VoteService};
+use crate::state::AppState;
 
-pub fn router(service: Arc<VoteService>) -> Router {
+use super::dto::CreateVoteRequest;
+
+pub fn router() -> Router<AppState> {
     Router::new()
-        .route("/votes", get(list))
-        .route("/votes/{id}", get(get_by_id))
-        .route("/votes", post(create))
-        .with_state(service)
-}
-
-async fn list(State(service): State<Arc<VoteService>>) {
-    todo!()
-}
-
-async fn get_by_id(State(service): State<Arc<VoteService>>, Path(id): Path<u64>) {
-    todo!()
-}
-
-async fn create(State(service): State<Arc<VoteService>>, body: axum::Json<CreateVoteRequest>) {
-    todo!()
 }

src/votes/repository.rs

@@ -1,9 +1,3 @@
+use sqlx::PgPool;
+
 use super::model::Vote;
-
-pub struct VoteRepository {}
-
-impl VoteRepository {
-    pub fn new() -> Self {
-        Self {}
-    }
-}

src/votes/service.rs

@@ -1,14 +1,3 @@
-use super::{
+use crate::state::AppState;
-    dto::{CreateVoteRequest, VoteResponse},
-    repository::VoteRepository,
-};
 
-pub struct VoteService {
+use super::dto::{CreateVoteRequest, VoteResponse};
-    repository: VoteRepository,
-}
-
-impl VoteService {
-    pub fn new(repository: VoteRepository) -> Self {
-        Self { repository }
-    }
-}