refactor

src/actions/home.rs → src/app/actions/home.rs

@@ -2,7 +2,7 @@ use actix_web::web::Json;
 use diesel::prelude::*;
 use uuid::Uuid;
 
-use crate::model::home;
+use crate::app::models::home;
 
 type DbError = Box<dyn std::error::Error + Send + Sync>;
 

src/api/home.rs → src/app/api/home.rs

@@ -2,8 +2,8 @@ use actix_web::{web, get, post, Result, Responder, error, HttpResponse};
 use diesel::{SqliteConnection, r2d2};
 use uuid::Uuid;
 
-use crate::actions;
-use crate::model;
+use crate::app::actions;
+use crate::app::models;
 
 type DbPool = r2d2::Pool<r2d2::ConnectionManager<SqliteConnection>>;
 
@@ -38,7 +38,7 @@ async fn find_home(pool: web::Data<DbPool>, home_id: web::Path<Uuid>) -> Result<
 #[post("/home")]
 async fn add_home(
   pool: web::Data<DbPool>,
-  form: web::Json<model::home::NewHome>,
+  form: web::Json<models::home::NewHome>,
 ) -> Result<impl Responder> {
   let home = web::block(move || {
     let mut conn = pool.get()?;

src/app/db/mod.rs

@@ -0,0 +1,28 @@
+use std::error::Error;
+
+use diesel::{r2d2, SqliteConnection, sqlite::Sqlite, Connection};
+use diesel_migrations::{EmbeddedMigrations, embed_migrations, MigrationHarness};
+
+
+pub type DbPool = r2d2::Pool<r2d2::ConnectionManager<SqliteConnection>>;
+
+pub fn initialize_db_pool() -> DbPool {
+  let conn_spec = std::env::var("DATABASE_URL").expect("DATABASE_URL should be set");
+  let manager = r2d2::ConnectionManager::<SqliteConnection>::new(conn_spec);
+  r2d2::Pool::builder()
+      .build(manager)
+      .expect("database URL should be valid path to SQLite DB file")
+}
+
+pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("./migrations");
+
+pub fn run_migrations(connection: &mut impl MigrationHarness<Sqlite>) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
+  connection.run_pending_migrations(MIGRATIONS)?;
+  Ok(())
+}
+
+pub fn initial_migration() {
+  let sqlite_spec = std::env::var("DATABASE_URL").expect("DATABASE_URL should be set");
+  let mut connection = SqliteConnection::establish(&sqlite_spec).expect("Failed to establish connection");
+  let _ = run_migrations(&mut connection);
+}

src/app/mod.rs

@@ -0,0 +1,7 @@
+pub mod api;
+pub mod actions;
+pub mod db;
+
+pub mod models {
+  pub mod home;
+}

src/main.rs

@@ -1,35 +1,19 @@
-use std::error::Error;
-
 use actix_web::{middleware::Logger, web::{self, ServiceConfig}, App, HttpServer};
-use diesel::{prelude::*, r2d2, sqlite::Sqlite};
 use shuttle_actix_web::ShuttleActixWeb;
-use diesel_migrations::{EmbeddedMigrations, embed_migrations, MigrationHarness};
 
-mod api;
-mod actions;
-mod model;
-mod schema;
+pub mod app;
+pub mod schema;
 
-use api::home::{
+use app::api::home::{
   all_homes,
   add_home,
   find_home
 };
 
-type DbPool = r2d2::Pool<r2d2::ConnectionManager<SqliteConnection>>;
-
-pub const MIGRATIONS: EmbeddedMigrations = embed_migrations!("./migrations");
-
-fn run_migrations(connection: &mut impl MigrationHarness<Sqlite>) -> Result<(), Box<dyn Error + Send + Sync + 'static>> {
-  connection.run_pending_migrations(MIGRATIONS)?;
-  Ok(())
-}
-
-fn initial_migration() {
-  let sqlite_spec = std::env::var("DATABASE_URL").expect("DATABASE_URL should be set");
-  let mut connection = SqliteConnection::establish(&sqlite_spec).expect("Failed to establish connection");
-  let _ = run_migrations(&mut connection);
-}
+use app::db::{
+  initialize_db_pool,
+  initial_migration
+};
 
 #[cfg(debug_assertions)]
 #[actix_web::main]
@@ -74,14 +58,3 @@ async fn main() -> ShuttleActixWeb<impl FnOnce(&mut ServiceConfig) + Send + Clon
   };
   Ok(config.into())
 }
-
-/// Initialize database connection pool based on `DATABASE_URL` environment variable.
-///
-/// See more: <https://docs.rs/diesel/latest/diesel/r2d2/index.html>.
-fn initialize_db_pool() -> DbPool {
-    let conn_spec = std::env::var("DATABASE_URL").expect("DATABASE_URL should be set");
-    let manager = r2d2::ConnectionManager::<SqliteConnection>::new(conn_spec);
-    r2d2::Pool::builder()
-        .build(manager)
-        .expect("database URL should be valid path to SQLite DB file")
-}