Restructured code organization so that there are router and service

layers.
Also added create expense to the data api.

src/data/mod.rs

@@ -0,0 +1,2 @@
+pub mod router;
+pub mod service;

src/data/router.rs

@@ -0,0 +1,24 @@
+use axum::{routing::get, Json};
+use std::sync::Arc;
+
+use askama_axum::IntoResponse;
+use axum::{extract::State, Router};
+
+use crate::{schema::UpdateExpense, AppState};
+
+pub fn data_router() -> Router<Arc<AppState>> {
+    Router::new().route("/api/expenses", get(get_expenses).post(create_expense))
+}
+
+pub async fn get_expenses(
+    State(shared_state): State<Arc<AppState>>,
+) -> Result<impl IntoResponse, impl IntoResponse> {
+    super::service::get_expenses(&shared_state.pool).await
+}
+
+pub async fn create_expense(
+    State(shared_state): State<Arc<AppState>>,
+    Json(create_expense): Json<UpdateExpense>,
+) -> Result<impl IntoResponse, impl IntoResponse> {
+    super::service::create_expense(&shared_state.pool, Json(create_expense)).await
+}

src/data/service.rs

@@ -0,0 +1,48 @@
+use askama_axum::IntoResponse;
+use axum::{http::StatusCode, Json};
+use sqlx::{Pool, Postgres};
+
+use crate::schema::{Expense, ExpenseType, UpdateExpense};
+
+pub async fn get_expenses(
+    db_pool: &Pool<Postgres>,
+) -> Result<impl IntoResponse, impl IntoResponse> {
+    match sqlx::query_as!(
+        Expense,
+        r#"SELECT id, description, price, expense_type as "expense_type: ExpenseType", is_essencial, date
+        FROM expenses
+        ORDER BY date ASC"#,
+    )
+    .fetch_all(db_pool)
+    .await
+    {
+        Ok(expenses) => Ok((StatusCode::CREATED, Json(expenses))),
+        Err(e) => Err((StatusCode::INTERNAL_SERVER_ERROR, e.to_string())),
+    }
+}
+
+pub async fn create_expense(
+    db_pool: &Pool<Postgres>,
+    Json(create_expense): Json<UpdateExpense>,
+) -> Result<impl IntoResponse, impl IntoResponse> {
+    match sqlx::query_as!(
+        Expense,
+        r#"
+        INSERT INTO expenses
+        (description, price, expense_type, is_essencial, date)
+        VALUES ($1, $2, $3 :: expense_type, $4, $5)
+        RETURNING id, description, price, expense_type as "expense_type: ExpenseType", is_essencial, date
+        "#,
+        create_expense.description,
+        create_expense.price,
+        create_expense.expense_type as Option<ExpenseType>,
+        create_expense.is_essencial,
+        create_expense.date
+    )
+    .fetch_one(db_pool)
+    .await
+    {
+        Ok(expense) => Ok((StatusCode::CREATED, Json(expense))),
+        Err(e) => Err((StatusCode::INTERNAL_SERVER_ERROR, e.to_string())),
+    }
+}

src/hypermedia/mod.rs

@@ -0,0 +1,2 @@
+pub mod router;
+pub mod service;

src/hypermedia/router.rs

@@ -0,0 +1,55 @@
+use crate::{
+    schema::{GetExpense, UpdateExpense},
+    AppState, ExpensesTemplate,
+};
+use std::sync::Arc;
+
+use askama_axum::IntoResponse;
+use axum::{
+    extract::{Path, Query, State},
+    routing::get,
+    Json, Router,
+};
+
+pub fn hypermedia_router() -> Router<Arc<AppState>> {
+    Router::new()
+        .route("/", get(expenses_index))
+        .route("/expenses", get(get_expenses))
+        .route("/expenses/:id/edit", get(edit_expense))
+        .route("/expenses/:id", get(get_expense).put(update_expense))
+}
+
+pub async fn expenses_index() -> impl IntoResponse {
+    ExpensesTemplate {
+        ..Default::default()
+    }
+}
+
+pub async fn get_expenses(
+    State(shared_state): State<Arc<AppState>>,
+    Query(get_expense_input): Query<GetExpense>,
+) -> impl IntoResponse {
+    super::service::get_expenses(&shared_state.pool, Query(get_expense_input)).await
+}
+
+pub async fn edit_expense(
+    Path(id): Path<i32>,
+    State(shared_state): State<Arc<AppState>>,
+) -> impl IntoResponse {
+    super::service::edit_expense(&shared_state.pool, Path(id)).await
+}
+
+pub async fn get_expense(
+    Path(id): Path<i32>,
+    State(shared_state): State<Arc<AppState>>,
+) -> impl IntoResponse {
+    super::service::get_expense(&shared_state.pool, Path(id)).await
+}
+
+pub async fn update_expense(
+    Path(id): Path<i32>,
+    State(shared_state): State<Arc<AppState>>,
+    Json(update_expense): Json<UpdateExpense>,
+) -> impl IntoResponse {
+    super::service::update_expense(&shared_state.pool, Path(id), Json(update_expense)).await
+}