Merge pull request #31 from filecoin-project/separate-db-and-http-server

add database crate

Cargo.toml

@@ -3,7 +3,8 @@
 members = [
   "lib",
   "http-server",
-  "fplus"
+  "fplus",
+  "database"
 ]
 
 resolver = "2"

database/Cargo.toml

@@ -0,0 +1,13 @@
+[package]
+name = "database"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+actix-web = "4.4.0"
+anyhow = "1.0.75"
+dotenv = "0.15.0"
+mongodb = "2.7.0"
+serde = "1.0.188"

http-server/src/db/collections/logs.rs → database/src/core/collections/logs.rs

@@ -4,7 +4,7 @@ use serde::{Serialize, Deserialize};
 use std::sync::Mutex;
 use anyhow::Result;
 
-use crate::db::common::get_collection;
+use crate::core::common::get_collection;
 
 const COLLECTION_NAME: &str = "logs";
 

http-server/src/db/collections/notary.rs → database/src/core/collections/notary.rs

@@ -4,7 +4,7 @@ use serde::{Serialize, Deserialize};
 use std::sync::Mutex;
 use anyhow::Result;
 
-use crate::db::common::get_collection;
+use crate::core::common::get_collection;
 
 const COLLECTION_NAME: &str = "notary";
 

http-server/src/db/collections/rkh.rs → database/src/core/collections/rkh.rs

@@ -4,7 +4,7 @@ use serde::{Serialize, Deserialize};
 use std::sync::Mutex;
 use anyhow::Result;
 
-use crate::db::common::get_collection;
+use crate::core::common::get_collection;
 
 const COLLECTION_NAME: &str = "rkh";
 

database/src/lib.rs

@@ -0,0 +1 @@
+pub mod core;

http-server/Cargo.toml

@@ -19,6 +19,7 @@ reqwest = { version = "0.11.18", features = ["json"] }
 futures = "0.3.28"
 mongodb = "2.6.1"
 lib = { path = "../lib" }
+database = { path = "../database" }
 anyhow = "1.0.75"
 async-trait = "0.1.73"
 

http-server/src/main.rs

@@ -1,9 +1,8 @@
 use actix_web::middleware::Logger;
-use actix_web::{App, HttpServer, web};
-use std::sync::Mutex;
+use actix_web::{web, App, HttpServer};
 use env_logger;
+use std::sync::Mutex;
 
-pub(crate) mod db;
 pub(crate) mod router;
 
 /// Http Server Setup
@@ -23,7 +22,7 @@ pub(crate) mod router;
 #[tokio::main]
 async fn main() -> std::io::Result<()> {
     env_logger::init_from_env(env_logger::Env::new().default_filter_or("debug"));
-    let client =match  db::setup::setup().await {
+    let client = match database::core::setup::setup().await {
         Ok(client) => client,
         Err(e) => panic!("Error setting up database: {}", e),
     };

http-server/src/router/logs.rs

@@ -1,11 +1,10 @@
-use crate::db;
 use actix_web::{get, http::header::ContentType, web, HttpResponse, post};
 use mongodb::Client;
 use std::sync::Mutex;
 
 #[get("/logs")]
 pub async fn get(db_connection: web::Data<Mutex<Client>>) -> HttpResponse {
-    match db::collections::logs::find(db_connection).await {
+    match database::core::collections::logs::find(db_connection).await {
         Ok(i) => HttpResponse::Ok()
             .content_type(ContentType::json())
             .body(serde_json::to_string(&i).unwrap()),
@@ -16,9 +15,9 @@ pub async fn get(db_connection: web::Data<Mutex<Client>>) -> HttpResponse {
 #[post("/logs")]
 pub async fn post(
     db_connection: web::Data<Mutex<Client>>,
-    rkh: web::Json<db::collections::logs::Log>,
+    rkh: web::Json<database::core::collections::logs::Log>,
 ) -> HttpResponse {
-    match db::collections::logs::insert(db_connection, rkh.into_inner()).await {
+    match database::core::collections::logs::insert(db_connection, rkh.into_inner()).await {
         Ok(_) => HttpResponse::Ok().finish(),
         Err(_) => HttpResponse::InternalServerError().finish(),
     }

http-server/src/router/mod.rs

@@ -12,7 +12,7 @@ pub mod rkh;
 #[get("/health")]
 pub async fn health(client: actix_web::web::Data<Mutex<mongodb::Client>>) -> impl Responder {
     let client = client.lock().unwrap();
-    match crate::db::setup::db_health_check(client.clone()).await {
+    match database::core::setup::db_health_check(client.clone()).await {
         Ok(_) => HttpResponse::Ok().body("OK"),
         Err(e) => HttpResponse::InternalServerError().body(format!("Error: {}", e)),
     }

http-server/src/router/notary.rs

@@ -1,11 +1,10 @@
-use crate::db;
 use actix_web::{get, http::header::ContentType, web, HttpResponse, post};
 use mongodb::Client;
 use std::sync::Mutex;
 
 #[get("/notary")]
 pub async fn get(db_connection: web::Data<Mutex<Client>>) -> HttpResponse {
-    match db::collections::notary::find(db_connection).await {
+    match database::core::collections::notary::find(db_connection).await {
         Ok(i) => HttpResponse::Ok()
             .content_type(ContentType::json())
             .body(serde_json::to_string(&i).unwrap()),
@@ -16,9 +15,9 @@ pub async fn get(db_connection: web::Data<Mutex<Client>>) -> HttpResponse {
 #[post("/notary")]
 pub async fn post(
     db_connection: web::Data<Mutex<Client>>,
-    rkh: web::Json<db::collections::notary::Notary>,
+    rkh: web::Json<database::core::collections::notary::Notary>,
 ) -> HttpResponse {
-    match db::collections::notary::insert(db_connection, rkh.into_inner()).await {
+    match database::core::collections::notary::insert(db_connection, rkh.into_inner()).await {
         Ok(_) => HttpResponse::Ok().finish(),
         Err(_) => HttpResponse::InternalServerError().finish(),
     }

http-server/src/router/rkh.rs

@@ -1,11 +1,10 @@
-use crate::db;
 use actix_web::{get, http::header::ContentType, web, HttpResponse, post};
 use mongodb::Client;
 use std::sync::Mutex;
 
 #[get("/rkh")]
 pub async fn get(db_connection: web::Data<Mutex<Client>>) -> HttpResponse {
-    match db::collections::rkh::find(db_connection).await {
+    match database::core::collections::rkh::find(db_connection).await {
         Ok(i) => HttpResponse::Ok()
             .content_type(ContentType::json())
             .body(serde_json::to_string(&i).unwrap()),
@@ -16,9 +15,9 @@ pub async fn get(db_connection: web::Data<Mutex<Client>>) -> HttpResponse {
 #[post("/rkh")]
 pub async fn post(
     db_connection: web::Data<Mutex<Client>>,
-    rkh: web::Json<db::collections::rkh::RootKeyHolder>,
+    rkh: web::Json<database::core::collections::rkh::RootKeyHolder>,
 ) -> HttpResponse {
-    match db::collections::rkh::insert(db_connection, rkh.into_inner()).await {
+    match database::core::collections::rkh::insert(db_connection, rkh.into_inner()).await {
         Ok(_) => HttpResponse::Ok().finish(),
         Err(_) => HttpResponse::InternalServerError().finish(),
     }