committing progress

Author: simzzz

primitives/src/ad_slot.rs

@@ -1,5 +1,4 @@
 use crate::{BigNum, TargetingTag, ValidatorId, targeting::Rule};
-use chrono::serde::{ts_milliseconds, ts_milliseconds_option};
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -22,16 +21,6 @@ pub struct AdSlot {
     /// see IAB ad unit guidelines and iab_flex_{adUnitName} (see IAB's new ad portfolio and PDF)
     #[serde(rename = "type")]
     pub ad_type: String,
-    /// A URL to the resource (usually PNG)
-    /// * must use the ipfs:// protocol, to guarantee data immutability
-    pub media_url: String,
-    /// MIME type of the media.
-    // Possible values at the moment are:
-    /// * image/jpeg
-    /// * image/png
-    pub media_mime: String,
-    /// Advertised URL
-    pub target_url: String,
     /// Array of TargetingTag
     #[serde(default)]
     pub targeting: Vec<TargetingTag>,
@@ -53,7 +42,7 @@ pub struct AdSlot {
     /// User address from the session
     pub owner: ValidatorId,
     /// UTC timestamp in milliseconds, used as nonce for escaping duplicated spec ipfs hashes
-    #[serde(with = "ts_milliseconds")]
+    #[serde(deserialize_with = "from_timestamp")]
     pub created: DateTime<Utc>,
     /// the name of the unit used in platform UI
     #[serde(default)]
@@ -67,6 +56,17 @@ pub struct AdSlot {
     #[serde(default)]
     pub archived: bool,
     /// UTC timestamp in milliseconds, changed every time modifiable property is changed
-    #[serde(default, with = "ts_milliseconds_option")]
+    #[serde(deserialize_with = "from_timestamp_option")]
     pub modified: Option<DateTime<Utc>>,
 }
+
+fn from_timestamp(time: &String) -> DateTime<Utc> {
+    DateTime::parse_from_str(time, "%Y-%m-%dT%H:%M:%S.%f").unwrap()
+}
+
+fn from_timestamp_option(time: &String) -> Option<DateTime<Utc>> {
+    match DateTime::parse_from_str(time, "%Y-%m-%dT%H:%M:%S.%f") {
+        Ok(t) => Some(t),
+        Err(_) => None,
+    }
+}