fix: refactor analyticsquery error handling

Author: samparsky

primitives/src/analytics.rs

@@ -1,3 +1,4 @@
+use crate::DomainError;
 use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -34,26 +35,26 @@ pub struct AnalyticsQuery {
 }
 
 impl AnalyticsQuery {
-    pub fn is_valid(&self) -> Result<(), String> {
+    pub fn is_valid(&self) -> Result<(), DomainError> {
         let valid_event_types = ["IMPRESSION"];
         let valid_metric = ["eventPayouts", "eventCounts"];
         let valid_timeframe = ["year", "month", "week", "day", "hour"];
 
         if !valid_event_types.contains(&self.event_type.as_str()) {
-            Err(format!(
+            Err(DomainError::InvalidArgument(format!(
                 "invalid event_type, possible values are: {}",
                 valid_event_types.join(" ,")
-            ))
+            )))
         } else if !valid_metric.contains(&self.metric.as_str()) {
-            Err(format!(
+            Err(DomainError::InvalidArgument(format!(
                 "invalid metric, possible values are: {}",
                 valid_metric.join(" ,")
-            ))
+            )))
         } else if !valid_timeframe.contains(&self.timeframe.as_str()) {
-            Err(format!(
+            Err(DomainError::InvalidArgument(format!(
                 "invalid timeframe, possible values are: {}",
                 valid_timeframe.join(" ,")
-            ))
+            )))
         } else {
             Ok(())
         }

primitives/src/lib.rs

@@ -43,7 +43,10 @@ pub enum DomainError {
 
 impl fmt::Display for DomainError {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Domain error",)
+        match self {
+            DomainError::InvalidArgument(err) => write!(f, "{}", err),
+            DomainError::RuleViolation(err) => write!(f, "{}", err),
+        }
     }
 }