Skip to content

Commit

Permalink
refactor(backend): Rename Parameters struct to ParameterSet to avoid …
Browse files Browse the repository at this point in the history
…confusion

Refs: #2
  • Loading branch information
maikbasel committed Jul 24, 2024
1 parent 8e55b33 commit 73b44ac
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 21 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::sync::Arc;

use crate::parameters::core::api::ParameterDataAPI;
use crate::parameters::core::domain::Parameters;
use crate::parameters::core::domain::ParameterSet;
use crate::parameters::core::error::ParameterDataError;

#[tauri::command]
Expand All @@ -10,7 +10,7 @@ pub async fn get_parameters(
api: tauri::State<'_, Arc<dyn ParameterDataAPI>>,
profile_name: String,
page_size: u32,
) -> Result<Parameters, ParameterDataError> {
) -> Result<ParameterSet, ParameterDataError> {
let result = api.get_parameters(profile_name.as_str(), page_size).await;

result.map_err(ParameterDataError::from)
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/src/parameters/core/api.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use async_trait::async_trait;
#[cfg(test)]
use mockall::automock;

use crate::parameters::core::domain::Parameters;
use crate::parameters::core::domain::ParameterSet;
use crate::parameters::core::error::ParameterDataError;

#[cfg_attr(test, automock)]
Expand All @@ -12,5 +12,5 @@ pub trait ParameterDataAPI: Send + Sync {
&self,
profile_name: &str,
page_size: u32,
) -> error_stack::Result<Parameters, ParameterDataError>;
) -> error_stack::Result<ParameterSet, ParameterDataError>;
}
18 changes: 9 additions & 9 deletions src-tauri/src/parameters/core/domain.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ impl Parameter {
}

#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)]
pub struct Parameters {
pub struct ParameterSet {
#[serde(rename = "parameters")]
values: Vec<Parameter>,
}

impl Parameters {
impl ParameterSet {
pub fn new() -> Self {
Self { values: Vec::new() }
}
Expand Down Expand Up @@ -73,20 +73,20 @@ mod tests {
use fake::Fake;
use spectral::prelude::*;

use crate::parameters::core::domain::{Parameter, ParameterValue, Parameters};
use crate::parameters::core::domain::{Parameter, ParameterSet, ParameterValue};

#[test]
fn should_create_empty_parameters() {
let expected = Parameters::new();
let expected = ParameterSet::new();

let actual = Parameters::default();
let actual = ParameterSet::default();

assert_that(&actual).is_equal_to(expected)
}

#[test]
fn should_add_parameter() {
let mut cut: Parameters = Parameters::new();
let mut cut: ParameterSet = ParameterSet::new();
let input_parameter_name: String = Word().fake();
let input_parameter: Parameter = Parameter::new(
input_parameter_name.clone(),
Expand All @@ -107,7 +107,7 @@ mod tests {

#[test]
fn should_add_all_parameters() {
let mut cut: Parameters = Parameters::new();
let mut cut: ParameterSet = ParameterSet::new();
let input_parameter_name: String = Word().fake();
let input_parameter_1: Parameter = Parameter::new(
input_parameter_name.clone(),
Expand All @@ -133,7 +133,7 @@ mod tests {

#[test]
fn should_return_parameters() {
let mut cut: Parameters = Parameters::new();
let mut cut: ParameterSet = ParameterSet::new();
let input_parameter_name: String = Word().fake();
let input_parameter: Parameter = Parameter::new(
input_parameter_name.clone(),
Expand All @@ -151,7 +151,7 @@ mod tests {

#[test]
fn should_sort_parameters_asc() {
let mut cut: Parameters = Parameters::new();
let mut cut: ParameterSet = ParameterSet::new();
let input_parameter_1: Parameter = Parameter::new(
"c".to_string(),
ParameterValue::String("c".to_string()),
Expand Down
6 changes: 3 additions & 3 deletions src-tauri/src/parameters/core/parameter_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use mockall::predicate::*;

use crate::parameters::core::api::ParameterDataAPI;
#[allow(unused_imports)] // false-positive
use crate::parameters::core::domain::{Parameter, Parameters};
use crate::parameters::core::domain::{Parameter, ParameterSet};
use crate::parameters::core::error::ParameterDataError;
use crate::parameters::core::spi::ParameterDataSPI;

Expand All @@ -24,7 +24,7 @@ impl ParameterDataAPI for ParameterService {
&self,
profile_name: &str,
page_size: u32,
) -> error_stack::Result<Parameters, ParameterDataError> {
) -> error_stack::Result<ParameterSet, ParameterDataError> {
let parameter_names = self
.parameter_data_spi
.load_available_parameter_names(profile_name, page_size)
Expand Down Expand Up @@ -69,7 +69,7 @@ mod tests {
eq(vec![output_param_name.to_string()]),
)
.returning(move |_, _| {
let mut parameters = Parameters::new();
let mut parameters = ParameterSet::new();
parameters.add_all_parameters(vec![output_param.clone()]);
Ok(parameters)
});
Expand Down
4 changes: 2 additions & 2 deletions src-tauri/src/parameters/core/spi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use async_trait::async_trait;
#[cfg(test)]
use mockall::automock;

use crate::parameters::core::domain::Parameters;
use crate::parameters::core::domain::ParameterSet;
use crate::parameters::core::error::ParameterDataError;

#[cfg_attr(test, automock)]
Expand All @@ -18,5 +18,5 @@ pub trait ParameterDataSPI: Send + Sync {
&self,
profile_name: &str,
parameter_names: Vec<String>,
) -> error_stack::Result<Parameters, ParameterDataError>;
) -> error_stack::Result<ParameterSet, ParameterDataError>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use error_stack::Report;

use crate::common::aws::{localstack_endpoint, shared_config_loader, ssm_client};
use crate::common::secure_string::SecureString;
use crate::parameters::core::domain::{Parameter, ParameterValue, Parameters};
use crate::parameters::core::domain::{Parameter, ParameterSet, ParameterValue};
use crate::parameters::core::error::ParameterDataError;
use crate::parameters::core::spi::ParameterDataSPI;

Expand Down Expand Up @@ -59,7 +59,7 @@ impl ParameterDataSPI for ParameterStoreAdapter {
&self,
profile_name: &str,
parameter_names: Vec<String>,
) -> error_stack::Result<Parameters, ParameterDataError> {
) -> error_stack::Result<ParameterSet, ParameterDataError> {
let client = Self::get_ssm_client(profile_name).await;

let result = client
Expand All @@ -70,7 +70,7 @@ impl ParameterDataSPI for ParameterStoreAdapter {

match result {
Ok(response) => {
let mut parameters = Parameters::new();
let mut parameters = ParameterSet::new();
parameters.add_all_parameters(
response
.parameters()
Expand Down

0 comments on commit 73b44ac

Please sign in to comment.