chore(tests): fix all tests

Author: joelwurtz

src/api/explain_request.rs

@@ -15,13 +15,6 @@ use serde::{Deserialize, Serialize};
 pub struct ExplainRequestInput {
     pub router_config: RouterConfig,
     pub example: Example,
-    pub rules: TmpRules,
-}
-// FIXME: find a way to avoid creating this structure.
-// It would be more convenient to inline the structure
-#[derive(Deserialize, Debug, Clone)]
-pub struct TmpRules {
-    #[serde(rename = "hydra:member")]
     pub rules: Vec<Rule>,
 }
 
@@ -72,7 +65,7 @@ impl ExplainRequestOutput {
     ) -> Result<ExplainRequestOutput, ExplainRequestOutputError> {
         let mut router = Router::<Rule>::from_config(explain_request_input.router_config);
 
-        for rule in explain_request_input.rules.rules.iter() {
+        for rule in explain_request_input.rules.iter() {
             router.insert(rule.clone());
         }
 

src/api/impact.rs

@@ -19,7 +19,7 @@ pub struct ImpactInput {
     pub with_redirection_loop: bool,
     pub rule: Rule,
     pub action: String,
-    pub rules: TmpRules,
+    pub rules: Vec<Rule>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
@@ -31,14 +31,6 @@ pub struct ImpactProjectInput {
     pub change_set: RuleChangeSet,
 }
 
-// FIXME: find a way to avoid creating this structure.
-// It would be more convenient to inline the structure
-#[derive(Deserialize, Debug, Clone)]
-pub struct TmpRules {
-    #[serde(rename = "hydra:member")]
-    pub rules: Vec<Rule>,
-}
-
 // Output
 
 #[derive(Serialize, Debug, Clone, Default)]
@@ -129,7 +121,7 @@ impl ImpactOutput {
         let mut router = Router::<Rule>::from_config(impact_input.router_config.clone());
         let mut trace_unique_router = Router::<Rule>::from_config(impact_input.router_config.clone());
 
-        for rule in impact_input.rules.rules.iter() {
+        for rule in impact_input.rules.iter() {
             // Even for a "add" action, we remove a potential previous version
             // of the rule. This occurs when adding a rule (still in draft) and
             // then editing it (still in add / draft). But we want the very last

src/api/test_examples.rs

@@ -17,23 +17,14 @@ use serde::{Deserialize, Serialize};
 #[derive(Deserialize, Debug, Clone)]
 pub struct TestExamplesInput {
     pub router_config: RouterConfig,
-    pub rules: TmpRules,
+    pub rules: Vec<Rule>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
 pub struct TestExamplesProjectInput {
     pub change_set: RuleChangeSet,
 }
 
-// FIXME: find a way to avoid creating this structure.
-// It would be more convenient to inline the structure
-#[derive(Deserialize, Debug, Clone)]
-pub struct TmpRules {
-    #[serde(rename = "hydra:member")]
-    pub rules: Vec<Rule>,
-}
-// Output
-
 #[derive(Serialize, Debug, Clone, Default)]
 pub struct TestExamplesOutput {
     pub example_count: u32,
@@ -156,15 +147,15 @@ impl TestExamplesOutput {
     pub fn create_result(test_examples_input: TestExamplesInput) -> TestExamplesOutput {
         let mut router = Router::<Rule>::from_config(test_examples_input.router_config.clone());
 
-        for rule in test_examples_input.rules.rules.iter() {
+        for rule in test_examples_input.rules.iter() {
             router.insert(rule.clone());
         }
 
         router.cache(10000);
 
         let mut results = TestExamplesOutput::default();
 
-        for rule in test_examples_input.rules.rules.iter() {
+        for rule in test_examples_input.rules.iter() {
             if rule.examples.is_none() {
                 continue;
             }

src/api/unit_ids.rs

@@ -13,22 +13,14 @@ use serde::{Deserialize, Serialize};
 #[derive(Deserialize, Debug, Clone)]
 pub struct UnitIdsInput {
     pub router_config: RouterConfig,
-    pub rules: TmpRules,
+    pub rules: Vec<Rule>,
 }
 
 #[derive(Deserialize, Debug, Clone)]
 pub struct UnitIdsProjectInput {
     pub change_set: RuleChangeSet,
 }
 
-// FIXME: find a way to avoid creating this structure.
-// It would be more convenient to inline the structure
-#[derive(Deserialize, Debug, Clone)]
-pub struct TmpRules {
-    #[serde(rename = "hydra:member")]
-    pub rules: Vec<Rule>,
-}
-
 // Output
 
 #[derive(Serialize, Debug, Clone, Default)]
@@ -114,15 +106,15 @@ impl UnitIdsOutput {
         let mut router = Router::<Rule>::from_config(unit_ids_input.router_config.clone());
         let router_config = router.config.clone();
 
-        for rule in unit_ids_input.rules.rules.iter() {
+        for rule in unit_ids_input.rules.iter() {
             router.insert(rule.clone());
         }
 
         router.cache(10000);
 
         let mut rules = HashMap::new();
 
-        for rule in unit_ids_input.rules.rules {
+        for rule in unit_ids_input.rules {
             if rule.examples.is_none() {
                 continue;
             }