feat: persist with sqlx

4 files changed, 131 insertions, 22 deletions

diff --git a/src/server/routes/users.rs b/src/server/routes/users.rs
index 2ef49b2..d3ce446 100644
--- a/src/server/routes/users.rs
+++ b/src/server/routes/users.rs
@@ -1,3 +1,4 @@
+pub mod get_outbox;
 pub mod get_user;
 pub mod webfinger;
 
@@ -5,6 +6,7 @@ use axum::{Router, routing::get};
 
 pub fn users_router() -> Router {
     Router::new()
-        .route("/users/{usernme}", get(get_user::http_get_user))
+        .route("/users/{username}", get(get_user::http_get_user))
+        .route("/users/{username}/outbox", get(get_outbox::http_get_outbox))
         .route("/.well-known/webfinger", get(webfinger::webfinger))
 }
diff --git a/src/server/routes/users/get_outbox.rs b/src/server/routes/users/get_outbox.rs
new file mode 100644
index 0000000..d5a4af5
--- /dev/null
+++ b/src/server/routes/users/get_outbox.rs
@@ -0,0 +1,77 @@
+use activitypub_federation::{
+    axum::json::FederationJson, config::Data, protocol::context::WithContext, traits::Object,
+};
+use axum::{debug_handler, extract::Path, http::StatusCode, response::IntoResponse};
+
+use crate::{error::AppError, state::AppHandle};
+
+#[debug_handler]
+pub async fn http_get_outbox(
+    Path(name): Path<String>,
+    data: Data<AppHandle>,
+) -> Result<impl IntoResponse, AppError> {
+    if let Some(a) = super::get_user::read_user(&name, &data).await? {
+        let json_user = a.into_json(&data).await?;
+        Ok((
+            StatusCode::OK,
+            FederationJson(WithContext::new_default(json_user)),
+        )
+            .into_response())
+    } else {
+        Ok((StatusCode::NOT_FOUND, "").into_response())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use axum::{
+        body::Body,
+        http::{Request, StatusCode},
+    };
+    use sqlx::PgPool;
+    use stack_up::Services;
+    use tower::ServiceExt;
+
+    use crate::{
+        server::{self, test_config},
+        state::AppState,
+    };
+
+    #[sqlx::test]
+    async fn get_user(pool: PgPool) {
+        let services = Services { postgres: pool };
+        let state = AppState::new(services, &test_config()).await.unwrap();
+        let app = server::router(state);
+
+        let response = app
+            .oneshot(
+                Request::builder()
+                    .uri("/users/sellershut")
+                    .body(Body::empty())
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+
+        assert_eq!(response.status(), StatusCode::OK);
+    }
+
+    #[sqlx::test]
+    async fn get_user_not_found(pool: PgPool) {
+        let services = Services { postgres: pool };
+        let state = AppState::new(services, &test_config()).await.unwrap();
+        let app = server::router(state);
+
+        let response = app
+            .oneshot(
+                Request::builder()
+                    .uri("/users/selut")
+                    .body(Body::empty())
+                    .unwrap(),
+            )
+            .await
+            .unwrap();
+
+        assert_eq!(response.status(), StatusCode::NOT_FOUND);
+    }
+}
diff --git a/src/server/routes/users/get_user.rs b/src/server/routes/users/get_user.rs
index d86cc26..4079731 100644
--- a/src/server/routes/users/get_user.rs
+++ b/src/server/routes/users/get_user.rs
@@ -2,6 +2,7 @@ use activitypub_federation::{
     axum::json::FederationJson, config::Data, protocol::context::WithContext, traits::Object,
 };
 use axum::{debug_handler, extract::Path, http::StatusCode, response::IntoResponse};
+use tracing::trace;
 
 use crate::{error::AppError, state::AppHandle};
 
@@ -10,7 +11,7 @@ pub async fn http_get_user(
     Path(name): Path<String>,
     data: Data<AppHandle>,
 ) -> Result<impl IntoResponse, AppError> {
-    if let Some(a) = read_user(&name, &data).await {
+    if let Some(a) = read_user(&name, &data).await? {
         let json_user = a.into_json(&data).await?;
         Ok((
             StatusCode::OK,
@@ -22,11 +23,26 @@ pub async fn http_get_user(
     }
 }
 
-pub async fn read_user(name: &str, data: &Data<AppHandle>) -> Option<crate::entity::user::User> {
-    let read = data.users.read().await;
-    read.iter()
-        .find(|value| value.username.eq(&name))
-        .map(ToOwned::to_owned)
+pub async fn read_user(
+    name: &str,
+    data: &Data<AppHandle>,
+) -> Result<Option<crate::entity::user::User>, AppError> {
+    trace!(username = name, "getting user");
+    let read = sqlx::query_as!(
+        crate::entity::user::DbUser,
+        "select * from account where username = $1 and local = $2",
+        name,
+        true
+    )
+    .fetch_optional(&data.services.postgres)
+    .await?;
+
+    let user = read.into_iter().find(|value| value.username.eq(&name));
+    let user = match user {
+        Some(user) => Some(crate::entity::user::User::try_from(user)?),
+        None => None,
+    };
+    Ok(user)
 }
 
 #[cfg(test)]
@@ -35,13 +51,19 @@ mod tests {
         body::Body,
         http::{Request, StatusCode},
     };
+    use sqlx::PgPool;
+    use stack_up::Services;
     use tower::ServiceExt;
 
-    use crate::{server, state::AppState};
+    use crate::{
+        server::{self, test_config},
+        state::AppState,
+    };
 
-    #[tokio::test]
-    async fn get_user() {
-        let state = AppState::new().await.unwrap();
+    #[sqlx::test]
+    async fn get_user(pool: PgPool) {
+        let services = Services { postgres: pool };
+        let state = AppState::new(services, &test_config()).await.unwrap();
         let app = server::router(state);
 
         let response = app
@@ -57,9 +79,10 @@ mod tests {
         assert_eq!(response.status(), StatusCode::OK);
     }
 
-    #[tokio::test]
-    async fn get_user_not_found() {
-        let state = AppState::new().await.unwrap();
+    #[sqlx::test]
+    async fn get_user_not_found(pool: PgPool) {
+        let services = Services { postgres: pool };
+        let state = AppState::new(services, &test_config()).await.unwrap();
         let app = server::router(state);
 
         let response = app
diff --git a/src/server/routes/users/webfinger.rs b/src/server/routes/users/webfinger.rs
index 22975c2..8efeda6 100644
--- a/src/server/routes/users/webfinger.rs
+++ b/src/server/routes/users/webfinger.rs
@@ -17,7 +17,7 @@ pub async fn webfinger(
     data: Data<AppHandle>,
 ) -> Result<impl IntoResponse, AppError> {
     let name = extract_webfinger_name(&query.resource, &data)?;
-    if let Some(db_user) = read_user(name, &data).await {
+    if let Some(db_user) = read_user(name, &data).await? {
         Ok((
             StatusCode::OK,
             Json(build_webfinger_response(
@@ -37,13 +37,19 @@ mod tests {
         body::Body,
         http::{Request, StatusCode},
     };
+    use sqlx::PgPool;
+    use stack_up::Services;
     use tower::ServiceExt;
 
-    use crate::{server, state::AppState};
+    use crate::{
+        server::{self, test_config},
+        state::AppState,
+    };
 
-    #[tokio::test]
-    async fn webfinger_ok() {
-        let state = AppState::new().await.unwrap();
+    #[sqlx::test]
+    async fn webfinger_ok(pool: PgPool) {
+        let services = Services { postgres: pool };
+        let state = AppState::new(services, &test_config()).await.unwrap();
         let app = server::router(state);
 
         let response = app
@@ -59,9 +65,10 @@ mod tests {
         assert_eq!(response.status(), StatusCode::OK);
     }
 
-    #[tokio::test]
-    async fn webfinger_err() {
-        let state = AppState::new().await.unwrap();
+    #[sqlx::test]
+    async fn webfinger_err(pool: PgPool) {
+        let services = Services { postgres: pool };
+        let state = AppState::new(services, &test_config()).await.unwrap();
         let app = server::router(state);
 
         let response = app