almost done

Author: cameron1024

catalyst-toolbox/src/bin/cli/advisor_reviews/mod.rs

@@ -1,30 +1,14 @@
 use catalyst_toolbox::utils;
-use catalyst_toolbox::vca_reviews::{read_vca_reviews_aggregated_file, Error as ReviewsError};
+use catalyst_toolbox::vca_reviews::read_vca_reviews_aggregated_file;
 
+use color_eyre::eyre::bail;
+use color_eyre::Report;
 use jcli_lib::utils::io::open_file_write;
 use std::fmt;
 use std::path::PathBuf;
 use std::str::FromStr;
 use structopt::StructOpt;
 
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error(transparent)]
-    Review(#[from] ReviewsError),
-
-    #[error("Error while serializing reviews to json")]
-    SerializeToJson(#[from] serde_json::Error),
-
-    #[error("Error while serializing reviews to csv")]
-    SerializeToCsv(#[from] csv::Error),
-
-    #[error("Invalid output format {0}. Only 'csv' and 'json' are supported")]
-    InvalidFormat(String),
-
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-}
-
 #[derive(Debug)]
 pub enum OutputFormat {
     Csv,
@@ -50,13 +34,13 @@ pub struct Export {
 }
 
 impl FromStr for OutputFormat {
-    type Err = Error;
+    type Err = Report;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         match s.to_lowercase().as_str() {
             "csv" => Ok(Self::Csv),
             "json" => Ok(Self::Json),
-            other => Err(Error::InvalidFormat(other.to_string())),
+            other => bail!("invalid format: {other}"),
         }
     }
 }
@@ -68,7 +52,7 @@ impl fmt::Display for OutputFormat {
 }
 
 impl Reviews {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         match self {
             Reviews::Export(transform) => transform.exec()?,
         };
@@ -77,7 +61,7 @@ impl Reviews {
 }
 
 impl Export {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         let Self { from, to, format } = self;
 
         let reviews = read_vca_reviews_aggregated_file(&from)?;

catalyst-toolbox/src/bin/cli/logs/compare.rs

@@ -1,7 +1,7 @@
 use catalyst_toolbox::logs::compare::{compare_logs, LogCmpStats};
-use catalyst_toolbox::logs::sentry;
 use catalyst_toolbox::logs::sentry::{RawLog, SentryFragmentLog};
 use chain_core::property::Fragment;
+use color_eyre::Report;
 use jcli_lib::utils::io;
 use jormungandr_lib::interfaces::{
     load_persistent_fragments_logs_from_folder_path, PersistentFragmentLog,
@@ -10,24 +10,6 @@ use serde::de::DeserializeOwned;
 use std::path::PathBuf;
 use structopt::StructOpt;
 
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error("api-token parameter must be provided if sentry-url is set")]
-    MissingTokenParameter,
-
-    #[error(transparent)]
-    SentryLogs(#[from] sentry::Error),
-
-    #[error(transparent)]
-    Io(#[from] std::io::Error),
-
-    #[error("error deserializing logs from: {path}")]
-    Deserialize {
-        path: PathBuf,
-        source: serde_json::Error,
-    },
-}
-
 #[derive(StructOpt)]
 #[structopt(rename_all = "kebab-case")]
 pub struct Compare {
@@ -39,7 +21,7 @@ pub struct Compare {
 }
 
 impl Compare {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         let Self {
             sentry_logs,
             permanent_logs,
@@ -95,9 +77,9 @@ impl Compare {
     }
 }
 
-pub fn load_logs_from_file<L: DeserializeOwned>(path: PathBuf) -> Result<Vec<L>, Error> {
-    let reader = io::open_file_read(&Some(path.clone()))?;
-    serde_json::from_reader(reader).map_err(|e| Error::Deserialize { path, source: e })
+pub fn load_logs_from_file<L: DeserializeOwned>(path: PathBuf) -> Result<Vec<L>, Report> {
+    let reader = io::open_file_read(&Some(path))?;
+    Ok(serde_json::from_reader(reader)?)
 }
 
 pub fn print_results(results: &LogCmpStats) {

catalyst-toolbox/src/bin/cli/notifications/send.rs

@@ -7,8 +7,8 @@ use catalyst_toolbox::notifications::{
         Request, RequestData,
     },
     send::send_create_message,
-    Error,
 };
+use color_eyre::Report;
 use jcli_lib::utils::io;
 
 use reqwest::Url;
@@ -82,7 +82,7 @@ pub enum SendNotification {
 }
 
 impl Args {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         let url = self.api_params.api_url.join("createMessage").unwrap();
         let message = self.build_create_message()?;
         let request = Request::new(RequestData::CreateMessageRequest(message));
@@ -92,7 +92,7 @@ impl Args {
         Ok(())
     }
 
-    pub fn build_create_message(&self) -> Result<CreateMessage, Error> {
+    pub fn build_create_message(&self) -> Result<CreateMessage, Report> {
         let content: ContentType = serde_json::from_str(&self.content_path.get_content()?)?;
         let mut content_builder = ContentSettingsBuilder::new()
             .with_timezone(self.timezone.clone())
@@ -115,7 +115,7 @@ impl Args {
 }
 
 impl Json {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         let url = self.api_url.join("createMessage").unwrap();
         let message_data: RequestData = serde_json::from_str(&self.json_path.get_content()?)?;
         let request: Request = Request::new(message_data);
@@ -127,7 +127,7 @@ impl Json {
 }
 
 impl SendNotification {
-    pub fn exec(self) -> Result<(), Error> {
+    pub fn exec(self) -> Result<(), Report> {
         match self {
             SendNotification::FromArgs(args) => args.exec(),
             SendNotification::FromJson(json) => json.exec(),
@@ -136,8 +136,8 @@ impl SendNotification {
 }
 
 impl Content {
-    pub fn get_content(&self) -> Result<String, Error> {
-        let mut reader = io::open_file_read(&self.content_path).map_err(Error::FileError)?;
+    pub fn get_content(&self) -> Result<String, Report> {
+        let mut reader = io::open_file_read(&self.content_path)?;
         let mut result = String::new();
         reader.read_to_string(&mut result)?;
         Ok(result)

catalyst-toolbox/src/notifications/mod.rs

@@ -2,26 +2,3 @@ pub mod requests;
 pub mod responses;
 pub mod send;
 
-use thiserror::Error;
-
-#[allow(clippy::large_enum_variant)]
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error(transparent)]
-    CreateMessageError(#[from] requests::create_message::Error),
-
-    #[error(transparent)]
-    SerdeError(#[from] serde_json::Error),
-
-    #[error(transparent)]
-    RequestError(#[from] reqwest::Error),
-
-    #[error("error reading file, source: {0}")]
-    FileError(#[from] std::io::Error),
-
-    #[error("sent data is invalid:\n {request}")]
-    BadDataSent { request: String },
-
-    #[error("request was unsuccessful, feedback:\n {response}")]
-    UnsuccessfulRequest { response: String },
-}

catalyst-toolbox/src/notifications/requests/create_message.rs

@@ -1,25 +1,14 @@
+use color_eyre::{
+    eyre::{bail, eyre},
+    Report,
+};
 use serde::{Deserialize, Serialize};
 
 use std::collections::HashMap;
 use time::{format_description::FormatItem, macros::format_description, OffsetDateTime};
 
-use thiserror::Error;
-
 pub const DATETIME_FMT: &[FormatItem] = format_description!("[year]-[month]-[day] [hour]:[minute]");
 
-#[allow(clippy::large_enum_variant)]
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("could not build {object_name:?}, missing field {field_name:?}")]
-    MissingFieldOnBuilderError {
-        object_name: String,
-        field_name: String,
-    },
-
-    #[error("CreateMessage should contain at least one ContentSettings entry")]
-    EmptyContentSettingsError,
-}
-
 pub type MultiLanguageContent = HashMap<String, String>;
 
 #[derive(Serialize, Deserialize)]
@@ -123,13 +112,12 @@ impl ContentSettingsBuilder {
         self
     }
 
-    pub fn build(self) -> Result<ContentSettings, Error> {
+    pub fn build(self) -> Result<ContentSettings, Report> {
+        let content = self.content.ok_or_else(|| eyre!("missing field content"))?;
+
         Ok(ContentSettings {
             send_date: self.send_date,
-            content: self.content.ok_or(Error::MissingFieldOnBuilderError {
-                object_name: "ContentSettings".to_string(),
-                field_name: "content".to_string(),
-            })?,
+            content,
             ignore_user_timezones: self.ignore_user_timezones,
             timezone: self.timezone,
             campaign: self.campaign,
@@ -167,19 +155,19 @@ impl CreateMessageBuilder {
         self
     }
 
-    pub fn build(self) -> Result<CreateMessage, Error> {
+    pub fn build(self) -> Result<CreateMessage, Report> {
         if self.notifications.is_empty() {
-            return Err(Error::EmptyContentSettingsError);
+            bail!("empty content settings");
         }
+
+        let auth = self.auth.ok_or_else(|| eyre!("missing field auth"))?;
+        let application = self
+            .application
+            .ok_or_else(|| eyre!("missing field application"))?;
+
         Ok(CreateMessage {
-            auth: self.auth.ok_or(Error::MissingFieldOnBuilderError {
-                object_name: "CreateMessage".to_string(),
-                field_name: "auth".to_string(),
-            })?,
-            application: self.application.ok_or(Error::MissingFieldOnBuilderError {
-                object_name: "CreateMessage".to_string(),
-                field_name: "application".to_string(),
-            })?,
+            auth,
+            application,
             notifications: self.notifications,
         })
     }

catalyst-toolbox/src/notifications/send.rs

@@ -1,13 +1,12 @@
+use color_eyre::{Report, eyre::bail};
 use reqwest::{blocking::Client, StatusCode, Url};
 
-use crate::notifications::{
-    requests::Request, responses::create_message::CreateMessageResponse, Error,
-};
+use crate::notifications::{requests::Request, responses::create_message::CreateMessageResponse};
 
 pub fn send_create_message(
     url: Url,
     notification: &Request,
-) -> Result<CreateMessageResponse, Error> {
+) -> Result<CreateMessageResponse, Report> {
     let client = Client::new();
     let response = client
         .post(url)
@@ -16,14 +15,12 @@ pub fn send_create_message(
     match response.status() {
         StatusCode::OK => {}
         StatusCode::BAD_REQUEST => {
-            return Err(Error::BadDataSent {
-                request: serde_json::to_string_pretty(&notification)?,
-            })
+            let request = serde_json::to_string_pretty(&notification)?;
+            bail!("bad request: {request:?}")
         }
         _ => {
-            return Err(Error::UnsuccessfulRequest {
-                response: response.text()?,
-            })
+            let response = response.text()?;
+            bail!("unsuccessful request: {response}");
         }
     };
     let response_message = response.json()?;

catalyst-toolbox/src/vca_reviews/mod.rs

@@ -1,18 +1,9 @@
 use crate::community_advisors::models::AdvisorReviewRow;
 use crate::utils;
+use color_eyre::Report;
 use vit_servicing_station_lib::db::models::community_advisors_reviews::AdvisorReview;
 
 use std::path::Path;
-
-#[derive(thiserror::Error, Debug)]
-pub enum Error {
-    #[error(transparent)]
-    CouldNotReadCsv(#[from] csv::Error),
-
-    #[error("Couldn't parse advisor review tag for question: {0}")]
-    CouldntParseTag(String),
-}
-
 impl AdvisorReviewRow {
     fn as_advisor_review(&self) -> AdvisorReview {
         AdvisorReview {
@@ -30,7 +21,7 @@ impl AdvisorReviewRow {
     }
 }
 
-pub fn read_vca_reviews_aggregated_file(filepath: &Path) -> Result<Vec<AdvisorReview>, Error> {
+pub fn read_vca_reviews_aggregated_file(filepath: &Path) -> Result<Vec<AdvisorReview>, Report> {
     Ok(
         utils::csv::load_data_from_csv::<AdvisorReviewRow, b','>(filepath)?
             .into_iter()