fixed using serde skip serialize if attribute

Author: simzzz

adview-manager/src/lib.rs

@@ -411,7 +411,6 @@ impl Manager {
             .collect::<Vec<_>>()
             .join("&");
 
-
         // Url adds a trailing `/`
         let url = format!(
             "{}units-for-slot/{}?pubPrefix={}&{}",

primitives/src/sentry.rs

@@ -133,15 +133,12 @@ pub struct ChannelListResponse {
 #[serde(rename_all = "camelCase")]
 pub struct LastApprovedResponse {
     pub last_approved: Option<LastApproved>,
+    /// None -> withHeartbeat=true wasn't passed
+    /// Some(vec![]) (empty vec) or Some(heartbeats) - withHeartbeats=true was passed
+    #[serde(default, skip_serializing_if = "Option::is_none")]
     pub heartbeats: Option<Vec<HeartbeatValidatorMessage>>,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
-#[serde(rename_all = "camelCase")]
-pub struct LastApprovedResponseNoHeartbeats {
-    pub last_approved: Option<LastApproved>,
-}
-
 #[derive(Serialize, Deserialize, Debug)]
 pub struct SuccessResponse {
     pub success: bool,

primitives/src/targeting/eval.rs

@@ -130,8 +130,10 @@ impl Into<SerdeValue> for Value {
             Value::Bool(bool) => SerdeValue::Bool(bool),
             Value::Number(number) => SerdeValue::Number(number),
             Value::String(string) => SerdeValue::String(string),
-            Value::Array(array) => SerdeValue::Array(array.into_iter().map(|value| value.into()).collect()),
-            Value::BigNum(bignum) => SerdeValue::String(bignum.to_string())
+            Value::Array(array) => {
+                SerdeValue::Array(array.into_iter().map(|value| value.into()).collect())
+            }
+            Value::BigNum(bignum) => SerdeValue::String(bignum.to_string()),
         }
     }
 }

sentry/src/routes/channel.rs

@@ -10,7 +10,7 @@ use primitives::{
     adapter::Adapter,
     sentry::{
         channel_list::{ChannelListQuery, LastApprovedQuery},
-        Event, LastApproved, LastApprovedResponse, SuccessResponse, LastApprovedResponseNoHeartbeats,
+        Event, LastApproved, LastApprovedResponse, SuccessResponse,
     },
     validator::MessageTypes,
     Channel, ChannelId,
@@ -151,34 +151,28 @@ pub async fn last_approved<A: Adapter>(
     let query = serde_urlencoded::from_str::<LastApprovedQuery>(&req.uri().query().unwrap_or(""))?;
     let validators = channel.spec.validators;
     let channel_id = channel.id;
-    let response_body = if query.with_heartbeat.is_some() {
+    let heartbeats = if query.with_heartbeat.is_some() {
         let result = try_join_all(
             validators
                 .iter()
                 .map(|validator| latest_heartbeats(&app.pool, &channel_id, &validator.id)),
         )
         .await?;
-        let heartbeats = Some(result.into_iter().flatten().collect::<Vec<_>>());
-        serde_json::to_string(&LastApprovedResponse {
-            last_approved: Some(LastApproved {
-                new_state,
-                approve_state: Some(approve_state),
-            }),
-            heartbeats,
-        })?
+        Some(result.into_iter().flatten().collect::<Vec<_>>())
     } else {
-        serde_json::to_string(&LastApprovedResponseNoHeartbeats {
-            last_approved: Some(LastApproved {
-                new_state,
-                approve_state: Some(approve_state),
-            })
-        })?
+        None
     };
 
     Ok(Response::builder()
         .header("Content-type", "application/json")
         .body(
-            response_body
+            serde_json::to_string(&LastApprovedResponse {
+                last_approved: Some(LastApproved {
+                    new_state,
+                    approve_state: Some(approve_state),
+                }),
+                heartbeats,
+            })?
             .into(),
         )
         .unwrap())