Merge pull request #554 from AmbireTech/remove_alexa_rank

removed alexa_rank

Author: elpiel

primitives/src/targeting/eval_test.rs

@@ -136,7 +136,6 @@ mod dsl_test {
         input.ad_slot = Some(input::AdSlot {
             categories: vec!["Bitcoin".to_string(), "Ethereum".to_string()],
             hostname: Default::default(),
-            alexa_rank: Some(0.0),
         });
 
         let mut output = Output {
@@ -163,7 +162,6 @@ mod dsl_test {
         input.ad_slot = Some(input::AdSlot {
             categories: vec!["Advertisement".to_string(), "Programming".to_string()],
             hostname: Default::default(),
-            alexa_rank: Some(0.0),
         });
 
         let result = rules.eval(&input, &mut output).expect("Should eval rules");

primitives/src/targeting/input.rs

@@ -176,13 +176,12 @@ impl GetField for Global {
     }
 }
 
-#[derive(Debug, Clone, Serialize, Deserialize, PartialEq)]
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
 #[serde(rename_all = "camelCase")]
 /// AdSlot scope, accessible on Supermarket and AdView
 pub struct AdSlot {
     pub categories: Vec<String>,
     pub hostname: String,
-    pub alexa_rank: Option<f64>,
 }
 
 impl GetField for AdSlot {
@@ -198,10 +197,6 @@ impl GetField for AdSlot {
                     .collect(),
             )),
             field::AdSlot::Hostname => Some(Value::String(self.hostname.clone())),
-            field::AdSlot::AlexaRank => self
-                .alexa_rank
-                .and_then(serde_json::Number::from_f64)
-                .map(Value::Number),
         }
     }
 }
@@ -413,7 +408,6 @@ mod test {
             // adSlot scope, accessible on Supermarket and AdView
             "adSlot.categories": ["IAB3", "IAB13-7", "IAB5"],
             "adSlot.hostname": "adex.network",
-            "adSlot.alexaRank": 2.0,
         });
 
         let actual_date = Utc.ymd(2020, 6, 6).and_hms(12, 0, 0);
@@ -466,7 +460,6 @@ mod test {
             ad_slot: Some(AdSlot {
                 categories: vec!["IAB3".into(), "IAB13-7".into(), "IAB5".into()],
                 hostname: "adex.network".into(),
-                alexa_rank: Some(2.0),
             }),
         };
 

primitives/src/targeting/input/field.rs

@@ -4,7 +4,7 @@ use std::str::FromStr;
 
 use crate::targeting::Error;
 
-pub const FIELDS: [Field; 24] = [
+pub const FIELDS: [Field; 23] = [
     // AdView scope, accessible only on the AdView
     Field::AdView(AdView::SecondsSinceCampaignImpression),
     Field::AdView(AdView::HasCustomPreferences),
@@ -35,7 +35,6 @@ pub const FIELDS: [Field; 24] = [
     // AdSlot scope, accessible on Supermarket and AdView
     Field::AdSlot(AdSlot::Categories),
     Field::AdSlot(AdSlot::Hostname),
-    Field::AdSlot(AdSlot::AlexaRank),
 ];
 
 #[derive(
@@ -174,7 +173,6 @@ impl From<Balances> for String {
 pub enum AdSlot {
     Categories,
     Hostname,
-    AlexaRank,
 }
 
 impl TryFrom<String> for AdSlot {

sentry/src/routes/units_for_slot.rs

@@ -80,7 +80,6 @@ where
 
     // TODO: remove once we know how/where we will be fetching the rest of the information!
     let accepted_referrers: Vec<Url> = vec!["TODO".parse().unwrap()];
-    let alexa_rank = Some(1.0_f64);
     let categories: Vec<String> = vec!["TODO".into()];
 
     let units = match app
@@ -189,7 +188,6 @@ where
     let targeting_input_ad_slot = Some(input::AdSlot {
         categories: categories.clone(),
         hostname,
-        alexa_rank,
     });
 
     let mut targeting_input_base = Input {