diff --git a/backend/src/lib.rs b/backend/src/lib.rs index cefb467..0f685f1 100644 --- a/backend/src/lib.rs +++ b/backend/src/lib.rs @@ -150,7 +150,7 @@ pub async fn create_app(db: DatabaseConnection) -> Result { let admin_family_routes = Router::new() .route("/families", post(routes::family::create_family)) - .route("/families/:id", delete(routes::family::delete_family)) + .route("/families/{id}", delete(routes::family::delete_family)) .route_layer(axum_middleware::from_fn(middleware::require_admin)) .layer(auth_layer.clone()) .with_state(db.clone()); @@ -174,42 +174,42 @@ pub async fn create_app(db: DatabaseConnection) -> Result { let invite_link_routes = Router::new() .route("/my-family/invite-links", post(routes::invite_link::create_invite_link)) .route("/my-family/invite-links", get(routes::invite_link::get_my_invite_links)) - .route("/my-family/invite-links/:token", delete(routes::invite_link::delete_invite_link)) - .route("/invite/:token/join", post(routes::invite_link::join_family_via_invite)) + .route("/my-family/invite-links/{token}", delete(routes::invite_link::delete_invite_link)) + .route("/invite/{token}/join", post(routes::invite_link::join_family_via_invite)) .layer(auth_layer.clone()) .with_state(db.clone()); let family_protected_routes = Router::new() - .route("/families/:family_id/categories", post(routes::category::create_category)) - .route("/families/:family_id/categories", get(routes::category::get_categories_by_family)) - .route("/families/:family_id/categories/:category_id", get(routes::category::get_category)) - .route("/families/:family_id/categories/:category_id", put(routes::category::update_category)) - .route("/families/:family_id/categories/:category_id", delete(routes::category::delete_category)) - .route("/families/:family_id/categories/:category_id/expenses", post(routes::expense::create_expense)) - .route("/families/:family_id/categories/:category_id/expenses", get(routes::expense::get_expenses_by_category)) - .route("/families/:family_id/categories/:category_id/expenses/:expense_id", get(routes::expense::get_expense)) - .route("/families/:family_id/categories/:category_id/expenses/:expense_id", put(routes::expense::update_expense)) - .route("/families/:family_id/categories/:category_id/expenses/:expense_id", delete(routes::expense::delete_expense)) - .route("/families/:family_id/categories/:category_id/remaining", get(routes::expense::get_remaining_limit)) - .route("/families/:family_id/shopping-items", post(routes::shopping_item::create_shopping_item)) - .route("/families/:family_id/shopping-items", get(routes::shopping_item::get_shopping_items_by_family)) - .route("/families/:family_id/shopping-items/:id", get(routes::shopping_item::get_shopping_item)) - .route("/families/:family_id/shopping-items/:id", put(routes::shopping_item::update_shopping_item)) - .route("/families/:family_id/shopping-items/:id", delete(routes::shopping_item::delete_shopping_item)) - .route("/families/:family_id/shopping-items/:id/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased)) - .route("/families/:family_id/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased)) - .route("/families/:family_id/shopping-items/clear-all", delete(routes::shopping_item::clear_all)) - .route("/families/:family_id/members", get(routes::user::get_family_members)) + .route("/families/{family_id}/categories", post(routes::category::create_category)) + .route("/families/{family_id}/categories", get(routes::category::get_categories_by_family)) + .route("/families/{family_id}/categories/{category_id}", get(routes::category::get_category)) + .route("/families/{family_id}/categories/{category_id}", put(routes::category::update_category)) + .route("/families/{family_id}/categories/{category_id}", delete(routes::category::delete_category)) + .route("/families/{family_id}/categories/{category_id}/expenses", post(routes::expense::create_expense)) + .route("/families/{family_id}/categories/{category_id}/expenses", get(routes::expense::get_expenses_by_category)) + .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", get(routes::expense::get_expense)) + .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", put(routes::expense::update_expense)) + .route("/families/{family_id}/categories/{category_id}/expenses/{expense_id}", delete(routes::expense::delete_expense)) + .route("/families/{family_id}/categories/{category_id}/remaining", get(routes::expense::get_remaining_limit)) + .route("/families/{family_id}/shopping-items", post(routes::shopping_item::create_shopping_item)) + .route("/families/{family_id}/shopping-items", get(routes::shopping_item::get_shopping_items_by_family)) + .route("/families/{family_id}/shopping-items/{id}", get(routes::shopping_item::get_shopping_item)) + .route("/families/{family_id}/shopping-items/{id}", put(routes::shopping_item::update_shopping_item)) + .route("/families/{family_id}/shopping-items/{id}", delete(routes::shopping_item::delete_shopping_item)) + .route("/families/{family_id}/shopping-items/{id}/purchased", axum::routing::patch(routes::shopping_item::mark_as_purchased)) + .route("/families/{family_id}/shopping-items/mark-all-purchased", post(routes::shopping_item::mark_all_as_purchased)) + .route("/families/{family_id}/shopping-items/clear-all", delete(routes::shopping_item::clear_all)) + .route("/families/{family_id}/members", get(routes::user::get_family_members)) .route_layer(axum_middleware::from_fn(middleware::require_family_access)) .layer(auth_layer.clone()) .with_state(db.clone()); let public_routes = Router::new() .route("/families", get(routes::family::get_all_families)) - .route("/families/:id", get(routes::family::get_family)) - .route("/families/:id", put(routes::family::update_family)) - .route("/families/:id/verify", post(routes::family::verify_family_password)) - .route("/invite/:token", get(routes::invite_link::validate_invite_link)) + .route("/families/{id}", get(routes::family::get_family)) + .route("/families/{id}", put(routes::family::update_family)) + .route("/families/{id}/verify", post(routes::family::verify_family_password)) + .route("/invite/{token}", get(routes::invite_link::validate_invite_link)) .layer(session_layer) .with_state(db);