Fix Input.ad_slot_hostname & derive(Serialize) for ChannelListQuery

Author: elpiel

primitives/src/sentry.rs

@@ -217,18 +217,17 @@ impl fmt::Display for ChannelReport {
 
 pub mod channel_list {
     use crate::ValidatorId;
-    use chrono::serde::ts_seconds::deserialize as ts_seconds;
-    use chrono::{DateTime, Utc};
+    use chrono::{DateTime, Utc, serde::ts_seconds};
     use serde::Deserialize;
 
-    #[derive(Debug, Deserialize)]
+    #[derive(Debug, Serialize, Deserialize)]
     pub struct ChannelListQuery {
         #[serde(default = "default_page")]
         pub page: u64,
         /// filters the list on `valid_until >= valid_until_ge`
         /// It should be the same timestamp format as the `Channel.valid_until`: **seconds**
         #[serde(
-            deserialize_with = "ts_seconds",
+            with = "ts_seconds",
             default = "Utc::now",
             rename = "validUntil"
         )]

primitives/src/targeting.rs

@@ -83,7 +83,7 @@ impl Input {
             "adSlot.hostname" => self
                 .ad_slot
                 .as_ref()
-                .map(|ad_slot| Value::String(ad_slot.hostname.clone().unwrap_or_default()))
+                .map(|ad_slot| Value::String(ad_slot.hostname.clone()))
                 .ok_or(Error::UnknownVariable),
             "adSlot.alexaRank" => {
                 // @TODO: Decide how to handle Alexa rank values
@@ -137,7 +137,7 @@ pub struct Global {
 #[cfg_attr(test, derive(Default))]
 pub struct AdSlot {
     pub categories: Vec<String>,
-    pub hostname: Option<String>,
+    pub hostname: String,
     pub alexa_rank: Option<f64>,
 }