diff --git a/scraper/src/menu.rs b/scraper/src/menu.rs index ae92f93..c087142 100644 --- a/scraper/src/menu.rs +++ b/scraper/src/menu.rs @@ -5,7 +5,7 @@ use chrono::NaiveDate; use scraper::{Html, Selector}; use shared::{Canteen, DishType}; -use crate::{canteen::CanteenExt as _, CustomError, Dish}; +use crate::{CustomError, Dish, canteen::CanteenExt as _}; static HTML_MAIN_DISHES_TBODY_SELECTOR: LazyLock = LazyLock::new(|| { Selector::parse("table.table-dishes.main-dishes > tbody").expect("Failed to parse selector") diff --git a/shared/src/canteen.rs b/shared/src/canteen.rs index 259994b..5acabf9 100644 --- a/shared/src/canteen.rs +++ b/shared/src/canteen.rs @@ -3,21 +3,7 @@ use std::str::FromStr; use serde::{Deserialize, Serialize}; use strum::EnumIter; -#[derive( - Debug, - Clone, - Copy, - PartialEq, - Eq, - PartialOrd, - Ord, - EnumIter, - Hash, - Serialize, - Deserialize, - utoipa::ToSchema, -)] -#[serde(rename_all = "kebab-case")] +#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, EnumIter, Hash, utoipa::ToSchema)] pub enum Canteen { Forum, Academica, @@ -61,3 +47,22 @@ impl FromStr for Canteen { } } } + +impl Serialize for Canteen { + fn serialize(&self, serializer: S) -> Result + where + S: serde::Serializer, + { + serializer.serialize_str(self.get_identifier()) + } +} + +impl<'a> Deserialize<'a> for Canteen { + fn deserialize(deserializer: D) -> Result + where + D: serde::Deserializer<'a>, + { + let s = String::deserialize(deserializer)?; + Canteen::from_str(&s).map_err(serde::de::Error::custom) + } +}