primitives:

- sentry - Add Borrow<str> for EventTyep
- targeting - Output - use EventType for price

Author: elpiel

primitives/src/sentry.rs

@@ -175,6 +175,12 @@ mod event {
         }
     }
 
+    impl std::borrow::Borrow<str> for EventType {
+        fn borrow(&self) -> &str {
+            &self.as_str()
+        }
+    }
+
     impl From<EventType> for String {
         fn from(event_type: EventType) -> Self {
             event_type.to_string()

primitives/src/targeting.rs

@@ -34,7 +34,7 @@ pub struct Output {
     /// For example: price.IMPRESSION
     /// The default is the min of the bound of event type:
     /// Default: pricingBounds.IMPRESSION.min
-    pub price: HashMap<String, UnifiedNum>,
+    pub price: HashMap<EventType, UnifiedNum>,
 }
 
 impl Output {
@@ -62,7 +62,7 @@ impl From<&Campaign> for Output {
         let price = campaign
             .pricing_bounds
             .iter()
-            .map(|(key, price)| (key.to_string(), price.min))
+            .map(|(key, price)| (*key, price.min))
             .collect();
 
         Self {
@@ -84,7 +84,7 @@ mod test {
         let output = Output {
             show: false,
             boost: 5.5,
-            price: vec![("one".to_string(), 100.into())].into_iter().collect(),
+            price: vec![(IMPRESSION, 100.into())].into_iter().collect(),
         };
 
         assert_eq!(Ok(Value::Bool(false)), output.try_get("show"));
@@ -96,7 +96,7 @@ mod test {
         );
         assert_eq!(
             Ok(Value::UnifiedNum(100.into())),
-            output.try_get("price.one")
+            output.try_get("price.IMPRESSION")
         );
         assert_eq!(Err(Error::UnknownVariable), output.try_get("price.unknown"));
         assert_eq!(Err(Error::UnknownVariable), output.try_get("unknown"));

primitives/src/targeting/eval.rs

@@ -1,4 +1,8 @@
-use crate::{unified_num::FromWhole, UnifiedNum};
+use crate::{
+    sentry::{CLICK, IMPRESSION},
+    unified_num::FromWhole,
+    UnifiedNum,
+};
 use serde::{Deserialize, Serialize};
 use serde_json::{value::Value as SerdeValue, Number};
 use std::{
@@ -1004,7 +1008,7 @@ fn eval(input: &Input, output: &mut Output, rule: &Rule) -> Result<Option<Value>
                         .try_unified()?;
 
                     // we do not care about any other old value
-                    output.price.insert("IMPRESSION".to_string(), price);
+                    output.price.insert(IMPRESSION, price);
                 }
                 "price.CLICK" => {
                     let price = rule
@@ -1013,7 +1017,7 @@ fn eval(input: &Input, output: &mut Output, rule: &Rule) -> Result<Option<Value>
                         .try_unified()?;
 
                     // we do not care about any other old value
-                    output.price.insert("CLICK".to_string(), price);
+                    output.price.insert(CLICK, price);
                 }
                 _ => return Err(Error::UnknownVariable),
             }