Fix all router endpoint integration tests

entity_api/src/user.rs

@@ -20,10 +20,12 @@ pub struct Credentials {
 }
 
 impl Backend {
-    pub fn new(db: &DatabaseConnection) -> Self {
+    pub fn new(db: &Arc<DatabaseConnection>) -> Self {
         info!("** Backend::new()");
         Self {
-            db: Arc::new(db.clone()),
+            // Arc is cloned, but the inner DatabaseConnection refers to the same instance
+            // as the one passed in to new() (see the Arc documentation for more info)
+            db: Arc::clone(db),
         }
     }
 }

service/src/lib.rs

@@ -31,9 +31,9 @@ pub struct AppState {
 }
 
 impl AppState {
-    pub fn new(app_config: Config, db: DatabaseConnection) -> Self {
+    pub fn new(app_config: Config, db: &Arc<DatabaseConnection>) -> Self {
         Self {
-            database_connection: Arc::new(db),
+            database_connection: Arc::clone(db),
             config: app_config,
         }
     }

src/main.rs

@@ -25,6 +25,7 @@
 
 use log::*;
 use service::{config::Config, logging::Logger, AppState};
+use std::sync::Arc;
 
 #[tokio::main]
 async fn main() {
@@ -33,9 +34,9 @@ async fn main() {
 
     info!("Starting up...");
 
-    let db = service::init_database(config.database_uri()).await.unwrap();
+    let db = Arc::new(service::init_database(config.database_uri()).await.unwrap());
 
-    let app_state = AppState::new(config, db);
+    let app_state = AppState::new(config, &db);
 
     entity_api::seed_database(app_state.db_conn_ref()).await;
 

web/Cargo.toml

@@ -36,4 +36,6 @@ mock = ["sea-orm/mock"]
 
 [dev-dependencies]
 anyhow = "1.0.76"
-reqwest = { version = "0.11.23", features = ["json"] }
+chrono = { version = "0.4.34", features = ["serde"] }
+password-auth = "1.0.0"
+reqwest = { version = "0.11.23", features = ["json", "cookies"] }

web/src/lib.rs

@@ -44,7 +44,7 @@ pub async fn init_server(app_state: AppState) -> Result<()> {
         .with_expiry(Expiry::OnInactivity(Duration::days(1)));
 
     // Auth service
-    let backend = Backend::new(app_state.db_conn_ref());
+    let backend = Backend::new(&app_state.database_connection);
     let auth_layer = AuthManagerLayerBuilder::new(backend, session_layer).build();
 
     // These will probably come from app_state.config (command line)