fixup! editoast: add schema for train schedule v2

Author: flomonster

editoast/src/schema/v2/trainschedule.rs

@@ -222,7 +222,7 @@ pub struct PathItem {
 pub struct Margins {
     #[schema(inline)]
     pub boundaries: Vec<NonBlankString>,
-    #[derivative(Default(value = "vec![MarginValue::Zero]"))]
+    #[derivative(Default(value = "vec![MarginValue::None]"))]
     /// The values of the margins. Must contains one more element than the boundaries
     /// Can be a percentage `X%`, a time in minutes per kilometer `Xmin/km` or `0`
     #[schema(value_type = Vec<String>, example = json!(["0", "5%", "2min/km"]))]
@@ -253,7 +253,7 @@ impl<'de> Deserialize<'de> for Margins {
 #[derive(Debug, Copy, Clone, Default, PartialEq)]
 pub enum MarginValue {
     #[default]
-    Zero,
+    None,
     Percentage(f64),
     MinPerKm(f64),
 }
@@ -264,8 +264,8 @@ impl<'de> Deserialize<'de> for MarginValue {
         D: serde::Deserializer<'de>,
     {
         let value = String::deserialize(deserializer)?;
-        if value == "0" {
-            return Ok(Self::Zero);
+        if value.to_lowercase() == "none" {
+            return Ok(Self::None);
         }
         if value.ends_with('%') {
             let float_value = f64::from_str(value[0..value.len() - 1].trim()).map_err(|_| {
@@ -274,15 +274,12 @@ impl<'de> Deserialize<'de> for MarginValue {
                     &"a valid float",
                 )
             })?;
-            if float_value < 0.0 {
+            if float_value <= 0.0 {
                 return Err(serde::de::Error::invalid_value(
                     serde::de::Unexpected::Str(&value),
-                    &"a positive float",
+                    &"a strictly positive number",
                 ));
             }
-            if float_value == 0. {
-                return Ok(Self::Zero);
-            }
             return Ok(Self::Percentage(float_value));
         }
         if value.ends_with("min/km") {
@@ -293,15 +290,12 @@ impl<'de> Deserialize<'de> for MarginValue {
                         &"a valid float",
                     )
                 })?;
-            if float_value < 0.0 {
+            if float_value <= 0.0 {
                 return Err(serde::de::Error::invalid_value(
                     serde::de::Unexpected::Str(&value),
-                    &"a positive float",
+                    &"a strictly positive float",
                 ));
             }
-            if float_value == 0. {
-                return Ok(Self::Zero);
-            }
             return Ok(Self::MinPerKm(float_value));
         }
         Err(serde::de::Error::custom("Margin type not recognized"))
@@ -314,7 +308,7 @@ impl Serialize for MarginValue {
         S: serde::Serializer,
     {
         match self {
-            MarginValue::Zero => serializer.serialize_str("0"),
+            MarginValue::None => serializer.serialize_str("none"),
             MarginValue::Percentage(value) => serializer.serialize_str(&format!("{}%", value)),
             MarginValue::MinPerKm(value) => serializer.serialize_str(&format!("{}min/km", value)),
         }
@@ -349,12 +343,8 @@ mod tests {
     /// Test that the `MarginValue` enum can be deserialized from a string
     #[test]
     fn deserialize_margin_value() {
-        let zero: MarginValue = from_str(r#""0""#).unwrap();
-        assert_eq!(zero, MarginValue::Zero);
-        let percentage: MarginValue = from_str(r#""0%""#).unwrap();
-        assert_eq!(percentage, MarginValue::Zero);
-        let min_per_km: MarginValue = from_str(r#""0min/km""#).unwrap();
-        assert_eq!(min_per_km, MarginValue::Zero);
+        let none: MarginValue = from_str(r#""none""#).unwrap();
+        assert_eq!(none, MarginValue::None);
 
         let percentage: MarginValue = from_str(r#""10%""#).unwrap();
         assert_eq!(percentage, MarginValue::Percentage(10.0));
@@ -374,8 +364,8 @@ mod tests {
     /// Test that the `MarginValue` enum can be serialized to a string
     #[test]
     fn serialize_margin_value() {
-        let zero = to_string(&MarginValue::Zero).unwrap();
-        assert_eq!(zero, r#""0""#);
+        let none = to_string(&MarginValue::None).unwrap();
+        assert_eq!(none, r#""none""#);
 
         let percentage = to_string(&MarginValue::Percentage(10.0)).unwrap();
         assert_eq!(percentage, r#""10%""#);

editoast/src/tests/train_schedules/simple.json

@@ -51,11 +51,13 @@
   ],
   "margins": {
     "boundaries": [
-      "b"
+      "b",
+      "c"
     ],
     "values": [
       "5%",
-      "3%"
+      "3min/km",
+      "none"
     ]
   },
   "initial_speed": 2.5,