Merge pull request #709 from patochectp/default_transfer_time

[feature] default value for transfer time

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Kisio Digital <[email protected]>", "Guillaume Pinot <[email protected]>"]
 name = "transit_model"
-version = "0.31.3"
+version = "0.31.4"
 license = "AGPL-3.0-only"
 description = "Transit data management"
 repository = "https://github.com/CanalTP/transit_model"

src/ntfs/mod.rs

@@ -768,7 +768,7 @@ mod tests {
 
     #[test]
     fn transfers_serialization_deserialization() {
-        test_serialize_deserialize_collection(vec![
+        let transfers = vec![
             Transfer {
                 from_stop_id: "st_1".to_string(),
                 to_stop_id: "st_1".to_string(),
@@ -783,7 +783,30 @@ mod tests {
                 real_min_transfer_time: None,
                 equipment_id: Some("eq_1".to_string()),
             },
-        ]);
+        ];
+        let expected_transfers = vec![
+            Transfer {
+                from_stop_id: "st_1".to_string(),
+                to_stop_id: "st_1".to_string(),
+                min_transfer_time: Some(20),
+                real_min_transfer_time: Some(30),
+                equipment_id: Some("eq_1".to_string()),
+            },
+            Transfer {
+                from_stop_id: "st_1".to_string(),
+                to_stop_id: "st_2".to_string(),
+                min_transfer_time: Some(0),
+                real_min_transfer_time: Some(0),
+                equipment_id: Some("eq_1".to_string()),
+            },
+        ];
+        let collection = Collection::new(transfers);
+        let expected_collection = Collection::new(expected_transfers);
+        test_in_tmp_dir(|path| {
+            write_collection(path, "file.txt", &collection).unwrap();
+            let des_collection = make_opt_collection(path, "file.txt").unwrap();
+            assert_eq!(expected_collection, des_collection);
+        });
     }
 
     #[test]

src/objects.rs

@@ -1430,7 +1430,9 @@ impl Equipment {
 pub struct Transfer {
     pub from_stop_id: String,
     pub to_stop_id: String,
+    #[serde(serialize_with = "ser_option_u32_with_default")]
     pub min_transfer_time: Option<u32>,
+    #[serde(serialize_with = "ser_option_u32_with_default")]
     pub real_min_transfer_time: Option<u32>,
     pub equipment_id: Option<String>,
 }

src/utils.rs

@@ -120,6 +120,13 @@ where
     Option::<T>::deserialize(de).map(|opt| opt.unwrap_or_else(Default::default))
 }
 
+pub fn ser_option_u32_with_default<S>(value: &Option<u32>, serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    serializer.serialize_u32(value.unwrap_or_default())
+}
+
 pub fn de_with_invalid_option<'de, D, T>(de: D) -> Result<Option<T>, D::Error>
 where
     D: serde::Deserializer<'de>,