Merge pull request #522 from AmbireTech/fix-campaign-active-de-serialization

Fix campaign active (de)serialization

Author: elpiel

primitives/examples/campaign_list_response.rs

@@ -69,7 +69,7 @@ fn main() {
           ],
           "targetingRules": [],
           "created": 1612162800000_u64,
-          "active_to": 4073414400000_u64
+          "activeTo": 4073414400000_u64
         },
         {
           "id": "0x127b98248f4e4b73af409d10f62daeaa",
@@ -136,7 +136,8 @@ fn main() {
           ],
           "targetingRules": [],
           "created": 1612162800000_u64,
-          "active_to": 4073414400000_u64
+          "activeFrom": 1656280800000_u64,
+          "activeTo": 4073414400000_u64
         },
         {
           "id": "0xa78f3492481b41a688488a7aa1ff17df",
@@ -203,7 +204,7 @@ fn main() {
           ],
           "targetingRules": [],
           "created": 1612162800000_u64,
-          "active_to": 4073414400000_u64
+          "activeTo": 4073414400000_u64
         }
       ],
       "totalPages": 1,

primitives/src/campaign.rs

@@ -8,7 +8,6 @@ use chrono::{
     DateTime, Utc,
 };
 use serde::{Deserialize, Serialize};
-use serde_with::with_prefix;
 
 #[doc(inline)]
 pub use {
@@ -17,8 +16,6 @@ pub use {
     validators::Validators,
 };
 
-with_prefix!(pub prefix_active "active_");
-
 mod campaign_id {
     use crate::ToHex;
     use hex::{FromHex, FromHexError};
@@ -197,7 +194,7 @@ pub struct Campaign {
     #[serde(with = "ts_milliseconds")]
     pub created: DateTime<Utc>,
     /// Used by the AdViewManager & Targeting AIP#31
-    #[serde(flatten, with = "prefix_active")]
+    #[serde(flatten)]
     pub active: Active,
 }
 
@@ -236,13 +233,14 @@ pub struct Active {
     #[serde(
         default,
         skip_serializing_if = "Option::is_none",
-        with = "ts_milliseconds_option"
+        with = "ts_milliseconds_option",
+        rename = "activeFrom"
     )]
     pub from: Option<DateTime<Utc>>,
     /// Campaign active to in a milliseconds timestamp
     ///
     /// The time at which you want this campaign to become inactive (mandatory)
-    #[serde(with = "ts_milliseconds")]
+    #[serde(with = "ts_milliseconds", rename = "activeTo")]
     pub to: DateTime<Utc>,
 }
 
@@ -291,15 +289,16 @@ mod pricing {
         }
     }
 }
+
 /// Campaign Validators
 pub mod validators {
     use std::ops::Index;
 
     use crate::{ValidatorDesc, ValidatorId};
     use serde::{Deserialize, Serialize};
 
-    #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     /// Unordered list of the validators representing the leader & follower
+    #[derive(Serialize, Deserialize, Debug, Clone, Eq, PartialEq)]
     pub struct Validators(ValidatorDesc, ValidatorDesc);
 
     impl Validators {
@@ -491,3 +490,15 @@ mod postgres {
         to_sql_checked!();
     }
 }
+
+#[cfg(test)]
+mod test {
+    use crate::test_util::DUMMY_CAMPAIGN;
+
+    #[test]
+    fn test_campaign_de_serialization() {
+        let campaign = DUMMY_CAMPAIGN.clone();
+
+        dbg!(serde_json::to_string_pretty(&campaign));
+    }
+}

primitives/src/sentry.rs

@@ -795,7 +795,7 @@ pub mod campaign_create {
     use serde::{Deserialize, Serialize};
 
     use crate::{
-        campaign::{prefix_active, Active, PricingBounds, Validators},
+        campaign::{Active, PricingBounds, Validators},
         targeting::Rules,
         AdUnit, Address, Campaign, CampaignId, Channel, EventSubmission, UnifiedNum,
     };
@@ -828,7 +828,7 @@ pub mod campaign_create {
         pub created: DateTime<Utc>,
         /// A millisecond timestamp representing the time you want this campaign to become active (optional)
         /// Used by the AdViewManager & Targeting AIP#31
-        #[serde(flatten, with = "prefix_active")]
+        #[serde(flatten)]
         pub active: Active,
     }
 

test_harness/src/lib.rs

@@ -355,8 +355,8 @@ mod tests {
             targeting_rules: Rules::new(),
             created: Utc.ymd(2021, 2, 1).and_hms(7, 0, 0),
             active: Active {
+                from: Some(Utc.ymd(2022, 6, 27).and_hms(0, 0, 0)),
                 to: Utc.ymd(2099, 1, 30).and_hms(0, 0, 0),
-                from: None,
             },
         }
     });
@@ -450,8 +450,8 @@ mod tests {
             targeting_rules: Rules::new(),
             created: Utc.ymd(2021, 2, 1).and_hms(7, 0, 0),
             active: Active {
-                to: Utc.ymd(2099, 1, 30).and_hms(0, 0, 0),
                 from: None,
+                to: Utc.ymd(2099, 1, 30).and_hms(0, 0, 0),
             },
         }
     });
@@ -537,8 +537,8 @@ mod tests {
             targeting_rules: Rules::new(),
             created: Utc.ymd(2021, 2, 1).and_hms(7, 0, 0),
             active: Active {
-                to: Utc.ymd(2099, 1, 30).and_hms(0, 0, 0),
                 from: None,
+                to: Utc.ymd(2099, 1, 30).and_hms(0, 0, 0),
             },
         }
     });