Deserialise empty strings as None

DanNixon · Apr 23, 2024 · c4ccb3e · c4ccb3e
1 parent 4f08952
commit c4ccb3e
Show file tree

Hide file tree

Showing 4 changed files with 158 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,6 +20,7 @@ clap = { version = "~4.4.0", features = ["derive", "env"] }
 emfcamp-schedule-api = { path = "./client/" }
 reqwest = { version = "0.11.27", default-features = false, features = ["json", "rustls-tls"] }
 serde = { version = "1.0.198", features = ["derive"] }
+serde_with = "3.7.0"
 tokio = { version = "1.37.0", features = ["rt-multi-thread", "macros"] }
 tracing = "0.1.40"
 tracing-subscriber = "0.3.18"

diff --git a/client/Cargo.toml b/client/Cargo.toml
@@ -8,4 +8,5 @@ edition.workspace = true
 chrono.workspace = true
 reqwest.workspace = true
 serde.workspace = true
+serde_with.workspace = true
 url.workspace = true
diff --git a/client/src/schedule/event/mod.rs b/client/src/schedule/event/mod.rs
@@ -3,11 +3,13 @@ mod timestamp;
 
 use chrono::{DateTime, FixedOffset};
 use serde::{Deserialize, Serialize};
+use serde_with::{serde_as, NoneAsEmptyString};
 use std::cmp::Ordering;
 use url::Url;
 
 pub use self::kind::{Kind, Workshop};
 
+#[serde_as]
 #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize)]
 pub struct Event {
     pub id: u32,
@@ -22,12 +24,14 @@ pub struct Event {
 
     pub venue: String,
 
+    #[serde_as(as = "NoneAsEmptyString")]
     pub map_link: Option<String>,
 
     pub title: String,
 
     pub speaker: String,
 
+    #[serde_as(as = "NoneAsEmptyString")]
     pub pronouns: Option<String>,
 
     pub description: String,