Merge pull request #345 from AdExNetwork/issue-340-re-think-targeting-input

Issue #340 re-think targeting input

Author: elpiel

Cargo.lock

@@ -4,7 +4,7 @@
 use adex_primitives::{
     supermarket::units_for_slot,
     supermarket::units_for_slot::response::{AdUnit, Campaign},
-    targeting::{self, input, Value},
+    targeting::{self, input},
     BigNum, ChannelId, SpecValidators, ValidatorId, IPFS,
 };
 use async_std::{sync::RwLock, task::block_on};
@@ -323,10 +323,9 @@ impl Manager {
             })
             .unwrap_or(u64::MAX);
 
-        input.set_ad_view(input::AdView {
+        input.ad_view = Some(input::AdView {
             seconds_since_campaign_impression,
             has_custom_preferences: false,
-            // TODO: Check this empty default!
             navigator_language: self.options.navigator_language.clone().unwrap_or_default(),
         });
 
@@ -435,17 +434,12 @@ impl Manager {
         let units_for_slot = self.get_market_demand_resp().await?;
         let campaigns = &units_for_slot.campaigns;
         let fallback_unit = units_for_slot.fallback_unit;
-        let targeting_input = input::Getter {
-            base: units_for_slot.targeting_input_base,
-            ad_unit: None,
-            channel: None,
-            last_approved: None,
-            deposit_asset: None,
-        };
+        let targeting_input = units_for_slot.targeting_input_base;
 
         let hostname = targeting_input
-            .try_get("adSlot.hostname")
-            .and_then(Value::try_string)
+            .ad_slot
+            .as_ref()
+            .map(|ad_slot| ad_slot.hostname.clone())
             .unwrap_or_default();
 
         // Stickiness is when we keep showing an ad unit for a slot for some time in order to achieve fair impression value
@@ -474,15 +468,16 @@ impl Manager {
                 if block_on(self.is_campaign_sticky(campaign.channel.id)) {
                     return vec![];
                 }
-                let mut campaign_input = targeting_input.clone();
+
                 let campaign_id = campaign.channel.id;
-                campaign_input.channel = Some(campaign.channel.clone());
+
+                let mut unit_input = targeting_input.clone().with_market_channel(campaign.channel.clone());
 
                 campaign
                     .units_with_price
                     .iter()
                     .filter(|unit_with_price| {
-                        campaign_input.ad_unit = Some(unit_with_price.unit.clone());
+                        unit_input.ad_unit_id = Some(unit_with_price.unit.id.clone());
 
                         let mut output = targeting::Output {
                             show: true,
@@ -496,7 +491,7 @@ impl Manager {
 
                         targeting::eval_with_callback(
                             &campaign.targeting_rules,
-                            &input::Input::Getter(campaign_input.clone()),
+                            &unit_input,
                             &mut output,
                             Some(on_type_error)
                         );

adview-manager/src/lib.rs

@@ -13,6 +13,8 @@ serde = { version = "^1.0", features = ['derive'] }
 serde_json = "1.0"
 serde-hex = "0.1.0"
 serde_millis = "0.1.1"
+# Used prefixes on field for targeting::Input
+serde_with = "1.5"
 # Configuration
 toml = "0.5"
 # Logging
@@ -23,6 +25,8 @@ slog-async = "^2.3.0"
 thiserror = "^1.0"
 chrono = { version = "0.4", features = ["serde"] }
 time = "0.1.42"
+# Macro for easier derive of Display & FromStr
+parse-display = "^0.3"
 # CID & multihash / multibase
 cid = "0.5"
 hex = "0.4"
@@ -47,3 +51,6 @@ futures = "0.3"
 async-trait = "0.1.40"
 # Other
 lazy_static = "1.4.0"
+
+[dev-dependencies]
+pretty_assertions = "^0.6"

primitives/Cargo.toml

@@ -18,7 +18,6 @@ pub mod merkle_tree;
 pub mod sentry;
 pub mod supermarket;
 pub mod targeting;
-pub mod targeting_tag;
 
 pub mod util {
     pub mod tests {
@@ -48,7 +47,6 @@ pub use self::channel::{Channel, ChannelId, ChannelSpec, SpecValidator, SpecVali
 pub use self::config::Config;
 pub use self::event_submission::EventSubmission;
 pub use self::ipfs::IPFS;
-pub use self::targeting_tag::TargetingTag;
 pub use self::validator::{ValidatorDesc, ValidatorId};
 
 #[derive(Debug, PartialEq, Eq)]

primitives/src/lib.rs

@@ -44,7 +44,7 @@ pub mod units_for_slot {
     pub mod response {
 
         use crate::{
-            targeting::{Map, Rule},
+            targeting::{Input, Rule},
             BigNum, ChannelId, ChannelSpec, SpecValidators, ValidatorId, IPFS,
         };
         use chrono::{
@@ -57,7 +57,7 @@ pub mod units_for_slot {
         #[derive(Debug, Serialize, Deserialize, PartialEq)]
         #[serde(rename_all = "camelCase")]
         pub struct Response {
-            pub targeting_input_base: Map,
+            pub targeting_input_base: Input,
             pub accepted_referrers: Vec<Url>,
             pub fallback_unit: Option<AdUnit>,
             pub campaigns: Vec<Campaign>,