refactor: add Provider::from_config

Author: Defelo

academy/src/commands/admin/coin.rs

@@ -5,10 +5,7 @@ use academy_persistence_contracts::{Database, Transaction};
 use clap::Subcommand;
 use uuid::Uuid;
 
-use crate::{
-    cache, database, email,
-    environment::{ConfigProvider, Provider, types},
-};
+use crate::environment::{Provider, types};
 
 #[derive(Debug, Subcommand)]
 pub enum AdminCoinCommand {
@@ -62,11 +59,7 @@ async fn add(
     description: Option<String>,
     no_credit_note: bool,
 ) -> anyhow::Result<()> {
-    let database = database::connect(&config.database).await?;
-    let cache = cache::connect(&config.cache).await?;
-    let email_service = email::connect(&config.email).await?;
-    let config_provider = ConfigProvider::new(&config)?;
-    let mut provider = Provider::new(config_provider, database, cache, email_service);
+    let mut provider = Provider::from_config(&config).await?;
 
     let db: types::Database = provider.provide();
     let mut txn = db.begin_transaction().await?;

academy/src/commands/admin/invoice.rs

@@ -6,10 +6,7 @@ use clap::Subcommand;
 use futures::TryStreamExt;
 use indicatif::ProgressBar;
 
-use crate::{
-    cache, database, email,
-    environment::{ConfigProvider, Provider, types},
-};
+use crate::environment::{Provider, types};
 
 #[derive(Debug, Subcommand)]
 pub enum AdminInvoiceCommand {
@@ -27,11 +24,7 @@ impl AdminInvoiceCommand {
 }
 
 async fn generate(config: Config) -> anyhow::Result<()> {
-    let database = database::connect(&config.database).await?;
-    let cache = cache::connect(&config.cache).await?;
-    let email_service = email::connect(&config.email).await?;
-    let config_provider = ConfigProvider::new(&config)?;
-    let mut provider = Provider::new(config_provider, database, cache, email_service);
+    let mut provider = Provider::from_config(&config).await?;
 
     let db: types::Database = provider.provide();
     let mut txn = db.begin_transaction().await?;

academy/src/commands/admin/user.rs

@@ -6,12 +6,9 @@ use anyhow::Context;
 use clap::Subcommand;
 use tracing::info;
 
-use crate::{
-    cache, database, email,
-    environment::{
-        ConfigProvider, Provider,
-        types::{self, Database},
-    },
+use crate::environment::{
+    Provider,
+    types::{self, Database},
 };
 
 #[derive(Debug, Subcommand)]
@@ -61,11 +58,7 @@ async fn create(
     enabled: bool,
     email_verified: bool,
 ) -> anyhow::Result<()> {
-    let database = database::connect(&config.database).await?;
-    let cache = cache::connect(&config.cache).await?;
-    let email_service = email::connect(&config.email).await?;
-    let config_provider = ConfigProvider::new(&config)?;
-    let mut provider = Provider::new(config_provider, database, cache, email_service);
+    let mut provider = Provider::from_config(&config).await?;
 
     let db: Database = provider.provide();
     let mut txn = db.begin_transaction().await?;

academy/src/commands/tasks/mod.rs

@@ -11,8 +11,8 @@ use clap::Subcommand;
 use tracing::info;
 
 use crate::{
-    cache, database, email,
-    environment::{ConfigProvider, Provider, types},
+    database,
+    environment::{Provider, types},
 };
 
 #[derive(Debug, Subcommand)]
@@ -50,11 +50,7 @@ async fn prune_database(config: Config) -> anyhow::Result<()> {
 }
 
 async fn refresh_premium(config: Config) -> anyhow::Result<()> {
-    let database = database::connect(&config.database).await?;
-    let cache = cache::connect(&config.cache).await?;
-    let email_service = email::connect(&config.email).await?;
-    let config_provider = ConfigProvider::new(&config)?;
-    let mut provider = Provider::new(config_provider, database, cache, email_service);
+    let mut provider = Provider::from_config(&config).await?;
 
     let db: types::Database = provider.provide();
     let mut txn = db.begin_transaction().await?;

academy/src/environment/mod.rs

@@ -23,6 +23,7 @@ use academy_shared_impl::{
     jwt::JwtServiceConfig,
     totp::TotpServiceConfig,
 };
+use anyhow::Context;
 use types::{Cache, Database, Email};
 
 pub mod types;
@@ -75,6 +76,22 @@ impl Provider {
             config,
         }
     }
+
+    pub async fn from_config(config: &Config) -> anyhow::Result<Self> {
+        let config_provider =
+            ConfigProvider::new(config).context("Failed to build config provider")?;
+        let database = crate::database::connect(&config.database)
+            .await
+            .context("Failed to connect to database")?;
+        let cache = crate::cache::connect(&config.cache)
+            .await
+            .context("Failed to connect to cache")?;
+        let email = crate::email::connect(&config.email)
+            .await
+            .context("Failed to connect to email server")?;
+
+        Ok(Self::new(config_provider, database, cache, email))
+    }
 }
 
 provider! {