From 5681b1dee3d6bda39079944795755fc9e3faaa90 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Sat, 3 Jun 2023 13:03:31 +0200 Subject: [PATCH] Use 'form_references' instead of 'fields' in profile --- README.md | 2 +- src/profile.rs | 31 +++++++++++++++++-------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 01655cd..06b708f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ In ihr sind die durchzuführenden Änderungen definiert. Eine Profildatei hat di ``` forms: - name: "ExampleForm" - fields: + form_references: - name: "ref_first_mtb" referenced_data_form: "Formularverweis.Variante" anzeige_auswahl: "Referenziertes Formular vom: {Datum}" diff --git a/src/profile.rs b/src/profile.rs index ef69994..193cfc9 100644 --- a/src/profile.rs +++ b/src/profile.rs @@ -44,11 +44,11 @@ impl FromStr for Profile { #[derive(Deserialize)] struct Form { name: String, - fields: Vec, + form_references: Vec, } #[derive(Deserialize)] -struct FieldChanges { +struct FormReference { name: String, referenced_data_form: Option, anzeige: Option, @@ -64,7 +64,7 @@ mod tests { fn should_deserialize_profile() { let content = "forms: - name: 'DNPM Therapieplan' - fields: + form_references: - name: ref_first_mtb referenced_data_form: 'OS.Tumorkonferenz.VarianteUKW' anzeige: 'Datum: {Datum}' @@ -75,18 +75,18 @@ mod tests { Ok(profile) => { assert_eq!(profile.forms.len(), 1); assert_eq!(profile.forms[0].name, "DNPM Therapieplan"); - assert_eq!(profile.forms[0].fields.len(), 1); - assert_eq!(profile.forms[0].fields[0].name, "ref_first_mtb"); + assert_eq!(profile.forms[0].form_references.len(), 1); + assert_eq!(profile.forms[0].form_references[0].name, "ref_first_mtb"); assert_eq!( - profile.forms[0].fields[0].referenced_data_form, + profile.forms[0].form_references[0].referenced_data_form, Some("OS.Tumorkonferenz.VarianteUKW".to_string()) ); assert_eq!( - profile.forms[0].fields[0].anzeige, + profile.forms[0].form_references[0].anzeige, Some("Datum: {Datum}".to_string()) ); assert_eq!( - profile.forms[0].fields[0].anzeige_auswahl, + profile.forms[0].form_references[0].anzeige_auswahl, Some("TK vom {Datum}".to_string()) ); } @@ -98,7 +98,7 @@ mod tests { fn should_deserialize_profile_with_no_changes() { let content = "forms: - name: 'DNPM Therapieplan' - fields: + form_references: - name: ref_first_mtb "; @@ -106,11 +106,14 @@ mod tests { Ok(profile) => { assert_eq!(profile.forms.len(), 1); assert_eq!(profile.forms[0].name, "DNPM Therapieplan"); - assert_eq!(profile.forms[0].fields.len(), 1); - assert_eq!(profile.forms[0].fields[0].name, "ref_first_mtb"); - assert_eq!(profile.forms[0].fields[0].referenced_data_form, None); - assert_eq!(profile.forms[0].fields[0].anzeige, None); - assert_eq!(profile.forms[0].fields[0].anzeige_auswahl, None); + assert_eq!(profile.forms[0].form_references.len(), 1); + assert_eq!(profile.forms[0].form_references[0].name, "ref_first_mtb"); + assert_eq!( + profile.forms[0].form_references[0].referenced_data_form, + None + ); + assert_eq!(profile.forms[0].form_references[0].anzeige, None); + assert_eq!(profile.forms[0].form_references[0].anzeige_auswahl, None); } Err(e) => panic!("Cannot deserialize profile: {}", e), }