(de-)serialize canteen correctly
This commit is contained in:
parent
e45daf2971
commit
675b5bb7db
|
|
@ -5,7 +5,7 @@ use chrono::NaiveDate;
|
||||||
use scraper::{Html, Selector};
|
use scraper::{Html, Selector};
|
||||||
use shared::{Canteen, DishType};
|
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<Selector> = LazyLock::new(|| {
|
static HTML_MAIN_DISHES_TBODY_SELECTOR: LazyLock<Selector> = LazyLock::new(|| {
|
||||||
Selector::parse("table.table-dishes.main-dishes > tbody").expect("Failed to parse selector")
|
Selector::parse("table.table-dishes.main-dishes > tbody").expect("Failed to parse selector")
|
||||||
|
|
|
||||||
|
|
@ -3,21 +3,7 @@ use std::str::FromStr;
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use strum::EnumIter;
|
use strum::EnumIter;
|
||||||
|
|
||||||
#[derive(
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, EnumIter, Hash, utoipa::ToSchema)]
|
||||||
Debug,
|
|
||||||
Clone,
|
|
||||||
Copy,
|
|
||||||
PartialEq,
|
|
||||||
Eq,
|
|
||||||
PartialOrd,
|
|
||||||
Ord,
|
|
||||||
EnumIter,
|
|
||||||
Hash,
|
|
||||||
Serialize,
|
|
||||||
Deserialize,
|
|
||||||
utoipa::ToSchema,
|
|
||||||
)]
|
|
||||||
#[serde(rename_all = "kebab-case")]
|
|
||||||
pub enum Canteen {
|
pub enum Canteen {
|
||||||
Forum,
|
Forum,
|
||||||
Academica,
|
Academica,
|
||||||
|
|
@ -61,3 +47,22 @@ impl FromStr for Canteen {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Serialize for Canteen {
|
||||||
|
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
|
||||||
|
where
|
||||||
|
S: serde::Serializer,
|
||||||
|
{
|
||||||
|
serializer.serialize_str(self.get_identifier())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Deserialize<'a> for Canteen {
|
||||||
|
fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
|
||||||
|
where
|
||||||
|
D: serde::Deserializer<'a>,
|
||||||
|
{
|
||||||
|
let s = String::deserialize(deserializer)?;
|
||||||
|
Canteen::from_str(&s).map_err(serde::de::Error::custom)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue