Merge pull request #314 from AdExNetwork/supermarket-changes

Supermarket changes

Author: elpiel

Cargo.lock

@@ -1,14 +1,12 @@
 [package]
-name = "adview-manager"
-version = "0.1.0"
 authors = ["Lachezar Lechev <[email protected]>"]
 edition = "2018"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+name = "adview-manager"
+version = "0.1.0"
 
 [dependencies]
 adex_primitives = {path = "../primitives", package = "primitives"}
-num-bigint = { version = "0.2", features = ["serde"] }
-serde =  {version = "^1.0", features = ['derive']}
+chrono = "0.4"
+num-bigint = {version = "0.3", features = ["serde"]}
+serde = {version = "^1.0", features = ['derive']}
 serde_json = "^1.0"
-chrono = "0.4"

adview-manager/Cargo.toml

@@ -27,6 +27,7 @@ hex = "0.3.2"
 merkletree = "0.10.0"
 tiny-keccak = "1.5"
 rust-crypto = "0.2"
+url = { version = "2.1", features = ["serde"]}
 # Numbers - BigNum, Numbers, Traits and Derives
 num-bigint = { version = "0.2", features = ["serde"] }
 num = "0.2.0"

primitives/Cargo.toml

@@ -1,5 +1,4 @@
-use crate::{BigNum, TargetingTag, ValidatorId};
-use chrono::serde::{ts_milliseconds, ts_milliseconds_option};
+use crate::{targeting::Rule, BigNum, TargetingTag, ValidatorId};
 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>,
@@ -44,13 +33,15 @@ pub struct AdSlot {
     pub tags: Vec<TargetingTag>,
     #[serde(default)]
     pub auto_tags: Vec<TargetingTag>,
+    /// Targeting rules
+    #[serde(default)]
+    pub rules: Vec<Rule>,
     /// Valid ipfs hash for Ad Unit object. It will be used as fallback data (optional)
     #[serde(default)]
     pub fallback_unit: Option<String>,
     /// 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")]
     pub created: DateTime<Utc>,
     /// the name of the unit used in platform UI
     #[serde(default)]
@@ -64,6 +55,5 @@ 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")]
     pub modified: Option<DateTime<Utc>>,
 }

primitives/src/ad_slot.rs

@@ -39,3 +39,110 @@ pub enum Finalized {
     Exhausted,
     Withdraw,
 }
+pub mod units_for_slot {
+    pub mod response {
+        use crate::{targeting::Rule, BigNum, ChannelId, ChannelSpec, SpecValidators, ValidatorId};
+        use chrono::{
+            serde::{ts_milliseconds, ts_milliseconds_option},
+            DateTime, Utc,
+        };
+        use serde::{Deserialize, Serialize};
+        use url::Url;
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Response {
+            // TODO: This should be Input, however, we only need the fields and not the Global: Channel, Status & BalancesMap
+            pub targeting_input_base: (),
+            pub accepted_referrers: Vec<Url>,
+            pub fallback_unit: AdUnit,
+            pub campaigns: Vec<Campaign>,
+        }
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct UnitsWithPrice {
+            pub unit: AdUnit,
+            pub price: BigNum,
+        }
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Campaign {
+            #[serde(flatten)]
+            pub channel: Channel,
+            pub targeting_rules: Vec<Rule>,
+            pub units_with_price: Vec<UnitsWithPrice>,
+        }
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Channel {
+            pub id: ChannelId,
+            pub creator: ValidatorId,
+            pub deposit_asset: String,
+            pub deposit_amount: BigNum,
+            pub spec: Spec,
+        }
+
+        impl From<crate::Channel> for Channel {
+            fn from(channel: crate::Channel) -> Self {
+                Self {
+                    id: channel.id,
+                    creator: channel.creator,
+                    deposit_asset: channel.deposit_asset,
+                    deposit_amount: channel.deposit_amount,
+                    spec: channel.spec.into(),
+                }
+            }
+        }
+
+        #[derive(Debug, Serialize, Deserialize)]
+        #[serde(rename_all = "camelCase")]
+        pub struct Spec {
+            #[serde(with = "ts_milliseconds")]
+            pub withdraw_period_start: DateTime<Utc>,
+            #[serde(
+                default,
+                skip_serializing_if = "Option::is_none",
+                with = "ts_milliseconds_option"
+            )]
+            pub active_from: Option<DateTime<Utc>>,
+            #[serde(with = "ts_milliseconds")]
+            pub created: DateTime<Utc>,
+            pub validators: SpecValidators,
+        }
+
+        impl From<ChannelSpec> for Spec {
+            fn from(channel_spec: ChannelSpec) -> Self {
+                Self {
+                    withdraw_period_start: channel_spec.withdraw_period_start,
+                    active_from: channel_spec.active_from,
+                    created: channel_spec.created,
+                    validators: channel_spec.validators,
+                }
+            }
+        }
+
+        #[derive(Debug, Serialize, Deserialize, Clone)]
+        #[serde(rename_all = "camelCase")]
+        pub struct AdUnit {
+            /// Same as `ipfs`
+            pub id: String,
+            pub media_url: String,
+            pub media_mime: String,
+            pub target_url: String,
+        }
+
+        impl From<&crate::AdUnit> for AdUnit {
+            fn from(ad_unit: &crate::AdUnit) -> Self {
+                Self {
+                    id: ad_unit.ipfs.clone(),
+                    media_url: ad_unit.media_url.clone(),
+                    media_mime: ad_unit.media_mime.clone(),
+                    target_url: ad_unit.target_url.clone(),
+                }
+            }
+        }
+    }
+}

primitives/src/supermarket.rs

@@ -159,7 +159,7 @@ impl Input {
     }
 }
 
-fn get_pricing_bounds(channel: &Channel, event_type: &str) -> Pricing {
+pub fn get_pricing_bounds(channel: &Channel, event_type: &str) -> Pricing {
     channel
         .spec
         .pricing_bounds

primitives/src/targeting.rs

@@ -99,7 +99,6 @@ pub struct Application<A: Adapter> {
     pub pool: DbPool,
     pub config: Config,
     pub event_aggregator: EventAggregator,
-    __secret: (),
 }
 
 impl<A: Adapter + 'static> Application<A> {
@@ -117,7 +116,6 @@ impl<A: Adapter + 'static> Application<A> {
             redis,
             pool,
             event_aggregator: Default::default(),
-            __secret: (),
         }
     }