feat: add initial wisdoms and way to retrieve it

Wisdomia · Apr 21, 2024 · 4e8720e · 4e8720e
1 parent a9cb02a
commit 4e8720e
Show file tree

Hide file tree

Showing 14 changed files with 124 additions and 31 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
diff --git a/migrations/0002_initial-wisdoms-population.down.sql b/migrations/0002_initial-wisdoms-population.down.sql
@@ -0,0 +1,5 @@
+BEGIN TRANSACTION;
+
+DELETE FROM wisdoms WHERE id IN (1, 2, 3);
+
+COMMIT;
diff --git a/migrations/0002_initial-wisdoms-population.up.sql b/migrations/0002_initial-wisdoms-population.up.sql
@@ -0,0 +1,7 @@
+BEGIN TRANSACTION;
+
+INSERT INTO wisdoms (id, description) VALUES (1, 'Patience is a virtue.');
+INSERT INTO wisdoms (id, description) VALUES (2, 'Knowledge is power.');
+INSERT INTO wisdoms (id, description) VALUES (3, 'Time is money.');
+
+COMMIT;
diff --git a/src/db/connect.rs b/src/db/connect.rs
@@ -0,0 +1,31 @@
+pub type Result<T> = core::result::Result<T, Error>;
+
+use sqlx::postgres::PgPoolOptions;
+use tracing_fast_dev::tfd;
+
+pub type Database = sqlx::Pool<sqlx::Postgres>;
+
+
+#[derive(Debug)]
+pub enum Error {
+    FailedConnectingToDatabase { error: String },
+}
+
+impl From<sqlx::Error> for Error {
+    fn from(value: sqlx::Error) -> Self {
+        Self::FailedConnectingToDatabase {
+            error: value.to_string(),
+        }
+    }
+}
+
+pub async fn connect(db_url: &str) -> Result<Database> {
+    let pool: Database = PgPoolOptions::new()
+        // TODO: Max connections! Dynamic?
+        .max_connections(5)
+        .connect(db_url)
+        .await?;
+    tfd().info("CONNECTED", "DATABASE");
+
+    Ok(pool)
+}
diff --git a/src/db/mod.rs b/src/db/mod.rs
@@ -1,31 +1,5 @@
-pub type Result<T> = core::result::Result<T, Error>;
+mod queries;
+mod connect;
 
-
-use sqlx::postgres::PgPoolOptions;
-use tracing_fast_dev::tfd;
-
-pub type Database = sqlx::Pool<sqlx::Postgres>;
-
-#[derive(Debug)]
-pub enum Error {
-    FailedConnectingToDatabase { error: String },
-}
-
-impl From<sqlx::Error> for Error {
-    fn from(value: sqlx::Error) -> Self {
-        Self::FailedConnectingToDatabase {
-            error: value.to_string(),
-        }
-    }
-}
-
-pub async fn connect(db_url: &str) -> Result<Database> {
-    let pool: Database = PgPoolOptions::new()
-        // TODO: Max connections! Dynamic?
-        .max_connections(5)
-        .connect(db_url)
-        .await?;
-    tfd().info("CONNECTED", "DATABASE");
-
-    Ok(pool)
-}
+pub use queries::*;
+pub use connect::*;
diff --git a/src/db/queries.rs b/src/db/queries.rs
@@ -0,0 +1,10 @@
+use crate::models::Wisdom;
+use super::connect::Database;
+
+pub async fn _get_wisdoms(db: &Database) -> Result<Vec<Wisdom>, sqlx::Error> {
+    tracing_fast_dev::tfd().info("GET_WISDOMS_INTERNAL", "QUERY");
+    let wisdoms: Vec<Wisdom> = sqlx::query_as("SELECT * from wisdoms")
+        .fetch_all(db)
+        .await?;
+    Ok(wisdoms)
+}
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -0,0 +1,10 @@
+use axum::{
+    body::Body,
+    http::{Response, StatusCode},
+    response::IntoResponse,
+};
+pub fn default_handle_error<E: std::fmt::Display>(e: E) -> Response<Body> {
+    let mut response = (StatusCode::INTERNAL_SERVER_ERROR).into_response();
+    response.extensions_mut().insert(e.to_string());
+    response
+}
diff --git a/src/main.rs b/src/main.rs
@@ -2,7 +2,9 @@ mod constants;
 mod state;
 mod db;
 mod routes;
+mod models;
 mod middlewares;
+mod helpers;
 
 use state::AppState;
 use std::{env, sync::Arc};

diff --git a/src/models/dto.rs b/src/models/dto.rs
@@ -0,0 +1,12 @@
+use serde::Deserialize;
+
+#[derive(Debug, Deserialize)]
+pub struct CreateWisdomDTO {
+    pub description: String,
+}
+
+#[derive(Debug, Deserialize)]
+pub struct UpdateWisdomDTO {
+    pub id: i32,
+    pub description: String,
+}
diff --git a/src/models/mod.rs b/src/models/mod.rs
@@ -0,0 +1,5 @@
+mod dto;
+mod wisdom;
+
+pub use dto::*;
+pub use wisdom::*;
diff --git a/src/models/wisdom.rs b/src/models/wisdom.rs
@@ -0,0 +1,8 @@
+use serde::Serialize;
+use sqlx::prelude::FromRow;
+
+#[derive(Debug, FromRow, Serialize)]
+pub struct Wisdom {
+    pub id: i32,
+    pub description: String,
+}
diff --git a/src/routes/mod.rs b/src/routes/mod.rs
@@ -1,4 +1,5 @@
 mod dbg;
+mod wisdoms;
 
 use axum::Router;
 
@@ -9,6 +10,8 @@ pub fn routes() -> Router {
 
 fn _routes() -> Router {
     let mut router = Router::new();
-        router = router.merge(dbg::routes());
+        router = router
+                 .merge(dbg::routes())
+                 .merge(wisdoms::routes());
     router
 }
diff --git a/src/routes/wisdoms.rs b/src/routes/wisdoms.rs
@@ -0,0 +1,25 @@
+use std::sync::Arc;
+
+use axum::{http::StatusCode, response::IntoResponse, routing::get, Extension, Json, Router};
+
+use crate::{db::_get_wisdoms, helpers::default_handle_error, state::AppState};
+
+use serde_json::json;
+
+pub fn routes() -> Router {
+    Router::new().nest("/wisdoms", _routes())
+}
+
+fn _routes() -> Router {
+    Router::new()
+        .route("/", get(get_wisdoms))
+}
+
+
+async fn get_wisdoms(Extension(state): Extension<Arc<AppState>>) -> impl IntoResponse {
+    tracing_fast_dev::tfd().info("GET_WISDOM", "FUNCTION");
+    match _get_wisdoms(&state.db).await {
+        Ok(wisdoms) => (StatusCode::OK, Json(json!({ "wisdoms": wisdoms }))).into_response(),
+        Err(e) => default_handle_error(e),
+    }
+}
diff --git a/src/state.rs b/src/state.rs
@@ -1,5 +1,6 @@
 use crate::db::Database;
 
+
 #[derive(Clone)]
 pub struct AppState {
     pub db: Database,