Remove broken pieces from api crate

This commit is contained in:
Lennart
2023-09-07 18:50:03 +02:00
parent 092f418ba8
commit dcd6c01b12
2 changed files with 57 additions and 11 deletions

53
crates/api/Cargo.lock generated
View File

@@ -1423,6 +1423,7 @@ dependencies = [
"sha2", "sha2",
"sqlx", "sqlx",
"tokio", "tokio",
"toml",
] ]
[[package]] [[package]]
@@ -1487,6 +1488,15 @@ dependencies = [
"serde", "serde",
] ]
[[package]]
name = "serde_spanned"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186"
dependencies = [
"serde",
]
[[package]] [[package]]
name = "serde_urlencoded" name = "serde_urlencoded"
version = "0.7.1" version = "0.7.1"
@@ -1977,6 +1987,40 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "toml"
version = "0.7.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c17e963a819c331dcacd7ab957d80bc2b9a9c1e71c804826d2f283dd65306542"
dependencies = [
"serde",
"serde_spanned",
"toml_datetime",
"toml_edit",
]
[[package]]
name = "toml_datetime"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.19.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f8123f27e969974a3dfba720fdb560be359f57b44302d280ba72e76a74480e8a"
dependencies = [
"indexmap 2.0.0",
"serde",
"serde_spanned",
"toml_datetime",
"winnow",
]
[[package]] [[package]]
name = "tracing" name = "tracing"
version = "0.1.37" version = "0.1.37"
@@ -2219,6 +2263,15 @@ version = "0.48.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
[[package]]
name = "winnow"
version = "0.5.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
dependencies = [
"memchr",
]
[[package]] [[package]]
name = "zeroize" name = "zeroize"
version = "1.6.0" version = "1.6.0"

View File

@@ -7,12 +7,10 @@ use rustical_store::calendar::CalendarStore;
use tokio::sync::RwLock; use tokio::sync::RwLock;
pub fn configure_api<C: CalendarStore>(cfg: &mut web::ServiceConfig, store: Data<RwLock<C>>) { pub fn configure_api<C: CalendarStore>(cfg: &mut web::ServiceConfig, store: Data<RwLock<C>>) {
cfg.app_data(store) cfg.app_data(store).route(
.route("ping", web::method(Method::GET).to(get_ping::<C>)) "/{cid}/events",
.route( web::method(Method::GET).to(get_events::<C>),
"/{cid}/events", );
web::method(Method::GET).to(get_events::<C>),
);
} }
pub async fn get_events<C: CalendarStore>( pub async fn get_events<C: CalendarStore>(
@@ -23,8 +21,3 @@ pub async fn get_events<C: CalendarStore>(
let events = store.read().await.get_events(&cid).await.unwrap(); let events = store.read().await.get_events(&cid).await.unwrap();
serde_json::to_string_pretty(&events) serde_json::to_string_pretty(&events)
} }
pub async fn get_ping<C: CalendarStore>(store: Data<RwLock<C>>) -> impl Responder {
let cals = store.read().await.get_calendars().await.unwrap();
serde_json::to_string_pretty(&cals)
}