store: Refactoring to split calendar and addressbook

crates/store/src/addressbook/address_object.rs

@@ -1,6 +1,5 @@
-use sha2::{Digest, Sha256};
-
 use crate::Error;
+use sha2::{Digest, Sha256};
 
 #[derive(Debug, Clone)]
 pub struct AddressObject {

crates/store/src/addressbook/mod.rs

@@ -0,0 +1,5 @@
+pub mod address_object;
+pub mod addressbook;
+
+pub use address_object::*;
+pub use addressbook::*;

crates/store/src/addressbook_store.rs

@@ -1,5 +1,5 @@
 use crate::{
-    model::{AddressObject, Addressbook},
+    addressbook::{AddressObject, Addressbook},
     Error,
 };
 use async_trait::async_trait;

crates/store/src/calendar/mod.rs

@@ -0,0 +1,11 @@
+mod calendar;
+mod event;
+mod journal;
+mod object;
+mod todo;
+
+pub use calendar::*;
+pub use event::*;
+pub use journal::*;
+pub use object::*;
+pub use todo::*;

crates/store/src/calendar_store.rs

@@ -1,6 +1,5 @@
+use crate::calendar::{Calendar, CalendarObject};
 use crate::error::Error;
-use crate::model::object::CalendarObject;
-use crate::model::Calendar;
 use async_trait::async_trait;
 
 #[async_trait]

crates/store/src/lib.rs

@@ -1,10 +1,14 @@
+pub mod addressbook;
 pub mod addressbook_store;
 pub mod calendar_store;
 pub mod error;
-pub mod model;
 pub mod timestamp;
 pub use error::Error;
 pub mod auth;
+pub mod calendar;
 
 pub use addressbook_store::AddressbookStore;
 pub use calendar_store::CalendarStore;
+
+pub use addressbook::{AddressObject, Addressbook};
+pub use calendar::{Calendar, CalendarObject};

crates/store/src/model/mod.rs

@@ -1,14 +0,0 @@
-pub mod calendar;
-pub mod event;
-pub mod journal;
-pub mod object;
-pub mod todo;
-
-pub use calendar::Calendar;
-pub use object::CalendarObject;
-
-pub mod addressbook;
-pub use addressbook::Addressbook;
-
-pub mod address_object;
-pub use address_object::AddressObject;