Code refactoring
catapult PR / Clippy (pull_request) Successful in 1m27s
catapult PR / Rustfmt (pull_request) Successful in 1m33s
catapult PR / Check (pull_request) Successful in 1m41s

This commit is contained in:
2026-07-07 14:50:39 -04:00
parent 71ba4a9c56
commit 41b7b78b74
+17 -11
View File
@@ -20,13 +20,13 @@ pub fn load_app() -> Result<App, std::io::Error> {
let service_passphrase_env = envy::environment::get_env("SERVICE_PASSPHRASE"); let service_passphrase_env = envy::environment::get_env("SERVICE_PASSPHRASE");
let envs = vec![ let envs = vec![
api_url_env, &api_url_env,
auth_url_env, &auth_url_env,
service_username_env, &service_username_env,
service_passphrase_env, &service_passphrase_env,
]; ];
let check_envs = |vs: &Vec<envy::EnvVar>| -> (bool, Option<String>) { let check_envs = |vs: &Vec<&envy::EnvVar>| -> (bool, Option<String>) {
for env in vs { for env in vs {
if env.value.is_empty() { if env.value.is_empty() {
return (false, Some(format!("Key {} is not provided", env.key))); return (false, Some(format!("Key {} is not provided", env.key)));
@@ -36,19 +36,25 @@ pub fn load_app() -> Result<App, std::io::Error> {
}; };
let (envs_valid, reason) = check_envs(&envs); let (envs_valid, reason) = check_envs(&envs);
if envs_valid { if envs_valid {
let auth_url: String = auth_url_env.value;
let api_url: String = api_url_env.value;
let service_username: String = service_username_env.value;
let service_passphrase: String = service_passphrase_env.value;
match textsender_models::config::auxiliary::load_config() { match textsender_models::config::auxiliary::load_config() {
Ok(twilio_config) => Ok(App { Ok(twilio_config) => Ok(App {
api_url: envs[0].value.clone(), api_url,
auth_url: envs[1].value.clone(), auth_url,
service_username: envs[2].value.clone(), service_username,
service_passphrase: envs[3].value.clone(), service_passphrase,
twilio_config, twilio_config,
}), }),
Err(err) => Err(err), Err(err) => Err(err),
} }
} else { } else {
Err(std::io::Error::other(reason.unwrap())) match reason {
Some(reason) => Err(std::io::Error::other(reason)),
None => Err(std::io::Error::other("No reason found")),
}
} }
} }