Added functionality to select article.

server/src/main.rs

@@ -4,17 +4,17 @@ use axum::{
     http::StatusCode,
     Json, Router,
 };
-use axum::extract::State;
+use axum::extract::{Path, State};
 use dotenv::dotenv;
 use env_logger::fmt::style::Reset;
 use http::{header, Method};
-use common::models::article::{insert_article, Article};
+use common::models::article::{insert_article, load_article, load_articles, Article};
 use common::models::origin::Origin;
 use sqlx::{ postgres::PgPoolOptions, PgPool };
 use tower_http::cors::{AllowOrigin, Any, CorsLayer};
 use tracing::info;
 use http::header::{AUTHORIZATION, ACCEPT, ACCESS_CONTROL_ALLOW_ORIGIN, CONTENT_TYPE, ACCESS_CONTROL_ALLOW_CREDENTIALS};
-
+use common::models::article;
 
 #[tokio::main]
 async fn main() {
@@ -51,7 +51,9 @@ async fn main() {
     let app = Router::new()
         // `GET /` goes to `root`
         .route("/", get(root))
+        .route("/articles", get(get_articles))
         .route("/article", post(create_article))
+        .route("/article/{id}", get(get_article))
         .with_state(pool)
         .layer(cors);
 
@@ -66,6 +68,53 @@ async fn root() -> &'static str {
     "Hello, World!"
 }
 
+#[tracing::instrument(ret)]
+async fn get_articles(
+    State(pool): State<PgPool>,
+) -> (StatusCode, Json<Vec<Article>>) {
+    info!("Get all articles");
+
+    let result_articles: Option<Vec<Article>> = load_articles(pool).await;
+
+    match result_articles {
+        Some(articles) => {
+            (StatusCode::OK, Json(articles))
+        }
+        None => {
+            (StatusCode::INTERNAL_SERVER_ERROR, Json(vec![]))
+        }
+    }
+}
+
+#[tracing::instrument(ret)]
+async fn get_article(
+    Path(id): Path<i64>,
+    State(pool): State<PgPool>,
+) -> (StatusCode, Json<Article>) {
+    info!("Get article with id: {}", id);
+
+    let result_article: Option<Article> = load_article(id, pool).await;
+
+    match result_article {
+        Some(article) => {
+            (StatusCode::OK, Json(article))
+        }
+        None => {
+            let article = Article {
+                id,
+                name: "".to_string(),
+                bio: false,
+                origin: Origin::EU,
+                description: None,
+                ingredients: None,
+                variants: vec![],
+            };
+
+            (StatusCode::INTERNAL_SERVER_ERROR, Json(article))
+        }
+    }
+}
+
 #[tracing::instrument(ret)]
 async fn create_article(
     State(pool): State<PgPool>,