Merge pull request #342 from AdExNetwork/issue-339-no-heartbeats-in-response

no heartbeats in response when query param is not provided

Author: elpiel

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

@@ -135,6 +135,9 @@ 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>>,
 }
 

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()),
         }
     }
 }