From fcbf7cf352ea896d76f950f8a01ee0b6e601763d Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Mon, 28 Oct 2024 17:50:35 +0100
Subject: [PATCH] store: move timestamp to calendar

---
 crates/caldav/src/calendar/methods/report/calendar_query.rs | 4 ++--
 crates/store/src/calendar/event.rs                          | 6 ++----
 crates/store/src/calendar/mod.rs                            | 2 ++
 crates/store/src/calendar/object.rs                         | 4 ++--
 crates/store/src/{ => calendar}/timestamp.rs                | 1 -
 crates/store/src/lib.rs                                     | 1 -
 6 files changed, 8 insertions(+), 10 deletions(-)
 rename crates/store/src/{ => calendar}/timestamp.rs (99%)

diff --git a/crates/caldav/src/calendar/methods/report/calendar_query.rs b/crates/caldav/src/calendar/methods/report/calendar_query.rs
index 60ca18a..c35e662 100644
--- a/crates/caldav/src/calendar/methods/report/calendar_query.rs
+++ b/crates/caldav/src/calendar/methods/report/calendar_query.rs
@@ -21,13 +21,13 @@ use crate::{
 struct TimeRangeElement {
     #[serde(
         rename = "@start",
-        deserialize_with = "rustical_store::timestamp::deserialize_utc_datetime",
+        deserialize_with = "rustical_store::calendar::deserialize_utc_datetime",
         default
     )]
     start: Option<DateTime<Utc>>,
     #[serde(
         rename = "@end",
-        deserialize_with = "rustical_store::timestamp::deserialize_utc_datetime",
+        deserialize_with = "rustical_store::calendar::deserialize_utc_datetime",
         default
     )]
     end: Option<DateTime<Utc>>,
diff --git a/crates/store/src/calendar/event.rs b/crates/store/src/calendar/event.rs
index b6b504d..0d4e2da 100644
--- a/crates/store/src/calendar/event.rs
+++ b/crates/store/src/calendar/event.rs
@@ -1,7 +1,5 @@
-use crate::{
-    timestamp::{parse_duration, CalDateTime},
-    Error,
-};
+use super::{parse_duration, CalDateTime};
+use crate::Error;
 use chrono::Duration;
 use ical::{
     generator::IcalEvent,
diff --git a/crates/store/src/calendar/mod.rs b/crates/store/src/calendar/mod.rs
index 81c2d9a..3807d75 100644
--- a/crates/store/src/calendar/mod.rs
+++ b/crates/store/src/calendar/mod.rs
@@ -2,10 +2,12 @@ mod calendar;
 mod event;
 mod journal;
 mod object;
+mod timestamp;
 mod todo;
 
 pub use calendar::*;
 pub use event::*;
 pub use journal::*;
 pub use object::*;
+pub use timestamp::*;
 pub use todo::*;
diff --git a/crates/store/src/calendar/object.rs b/crates/store/src/calendar/object.rs
index 1e3fb0e..14786d5 100644
--- a/crates/store/src/calendar/object.rs
+++ b/crates/store/src/calendar/object.rs
@@ -1,5 +1,5 @@
-use super::{event::EventObject, journal::JournalObject, todo::TodoObject};
-use crate::{timestamp::CalDateTime, Error};
+use super::{CalDateTime, EventObject, JournalObject, TodoObject};
+use crate::Error;
 use anyhow::Result;
 use ical::parser::{ical::component::IcalTimeZone, Component};
 use serde::{Deserialize, Serialize};
diff --git a/crates/store/src/timestamp.rs b/crates/store/src/calendar/timestamp.rs
similarity index 99%
rename from crates/store/src/timestamp.rs
rename to crates/store/src/calendar/timestamp.rs
index f568ffa..596ae04 100644
--- a/crates/store/src/timestamp.rs
+++ b/crates/store/src/calendar/timestamp.rs
@@ -1,5 +1,4 @@
 use crate::Error;
-use anyhow::{anyhow, Result};
 use chrono::{DateTime, Duration, NaiveDate, NaiveDateTime, NaiveTime, Utc};
 use chrono_tz::Tz;
 use ical::{
diff --git a/crates/store/src/lib.rs b/crates/store/src/lib.rs
index 87fd225..6f10041 100644
--- a/crates/store/src/lib.rs
+++ b/crates/store/src/lib.rs
@@ -2,7 +2,6 @@ pub mod addressbook;
 pub mod addressbook_store;
 pub mod calendar_store;
 pub mod error;
-pub mod timestamp;
 pub use error::Error;
 pub mod auth;
 pub mod calendar;