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

birthday calendar, rename birthday objects, support anniversary field

Browse Source
This commit is contained in:
Lennart
2025-01-21 13:38:46 +01:00
parent 7a678f5150
commit ec6dbf50f6
2 changed files with 78 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/store/src/contact_birthday_store.rs
View File

@@ -1,4 +1,4 @@
use std::sync::Arc;
use std::{collections::HashMap, sync::Arc};
use crate::{
calendar::CalendarObjectType, AddressObject, Addressbook, AddressbookStore, Calendar,
@@ -99,14 +99,17 @@ impl<AS: AddressbookStore> CalendarStore for ContactBirthdayStore<AS> {
principal: &str,
cal_id: &str,
) -> Result<Vec<CalendarObject>, Error> {
let objects: Result<Vec<Option<CalendarObject>>, Error> = self
let objects: Result<Vec<HashMap<&'static str, CalendarObject>>, Error> = self
.0
.get_objects(principal, cal_id)
.await?
.iter()
.map(AddressObject::get_birthday_object)
.map(AddressObject::get_significant_dates)
.collect();
let objects = objects?
.into_iter()
.flat_map(HashMap::into_values)
.collect();
let objects = objects?.into_iter().flatten().collect();
Ok(objects)
}
@@ -117,12 +120,14 @@ impl<AS: AddressbookStore> CalendarStore for ContactBirthdayStore<AS> {
cal_id: &str,
object_id: &str,
) -> Result<CalendarObject, Error> {
Ok(self
.0
.get_object(principal, cal_id, object_id)
let (addressobject_id, date_type) = object_id.rsplit_once("-").ok_or(Error::NotFound)?;
dbg!(addressobject_id, date_type);
self.0
.get_object(principal, cal_id, addressobject_id)
.await?
.get_birthday_object()?
.ok_or(Error::NotFound)?)
.get_significant_dates()?
.remove(date_type)
.ok_or(Error::NotFound)
}
async fn put_object(