nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 15:52:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix data model to fix event collisions with multiple principals

Browse Source
This commit is contained in:
Lennart
2024-06-21 21:16:31 +02:00
parent aed6bcff63
commit 06d1095c66
11 changed files with 245 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/caldav/src/calendar/methods/report.rs
View File

@@ -120,20 +120,22 @@ pub enum ReportRequest {
async fn get_events_calendar_query<C: CalendarStore + ?Sized>(
_cal_query: CalendarQueryRequest,
principal: &str,
cid: &str,
store: &RwLock<C>,
) -> Result<Vec<Event>, Error> {
// TODO: Implement filtering
Ok(store.read().await.get_events(cid).await?)
Ok(store.read().await.get_events(principal, cid).await?)
}
async fn get_events_calendar_multiget<C: CalendarStore + ?Sized>(
_cal_query: CalendarMultigetRequest,
principal: &str,
cid: &str,
store: &RwLock<C>,
) -> Result<Vec<Event>, Error> {
// TODO: proper implementation
Ok(store.read().await.get_events(cid).await?)
Ok(store.read().await.get_events(principal, cid).await?)
}
pub async fn route_report_calendar<A: CheckAuthentication, C: CalendarStore + ?Sized>(
@@ -152,10 +154,10 @@ pub async fn route_report_calendar<A: CheckAuthentication, C: CalendarStore + ?S
let request: ReportRequest = quick_xml::de::from_str(&body)?;
let events = match request.clone() {
ReportRequest::CalendarQuery(cal_query) => {
get_events_calendar_query(cal_query, &cid, &cal_store).await?
get_events_calendar_query(cal_query, &principal, &cid, &cal_store).await?
}
ReportRequest::CalendarMultiget(cal_multiget) => {
get_events_calendar_multiget(cal_multiget, &cid, &cal_store).await?
get_events_calendar_multiget(cal_multiget, &principal, &cid, &cal_store).await?
}
};