Return Upcaster to original location

examples/common/a.rs

@@ -38,4 +38,4 @@ pub struct EventA {
 }
 
 #[cfg(feature = "upcasting")]
-impl esrs::sql::event::Upcaster for EventA {}
+impl esrs::event::Upcaster for EventA {}

examples/common/b.rs

@@ -38,4 +38,4 @@ pub struct EventB {
 }
 
 #[cfg(feature = "upcasting")]
-impl esrs::sql::event::Upcaster for EventB {}
+impl esrs::event::Upcaster for EventB {}

examples/common/basic/mod.rs

@@ -38,7 +38,7 @@ pub struct BasicEvent {
 }
 
 #[cfg(feature = "upcasting")]
-impl esrs::sql::event::Upcaster for BasicEvent {}
+impl esrs::event::Upcaster for BasicEvent {}
 
 #[allow(dead_code)]
 #[derive(Debug, thiserror::Error)]

examples/readme/main.rs

@@ -99,7 +99,7 @@ pub enum BookEvent {
 }
 
 #[cfg(feature = "upcasting")]
-impl esrs::sql::event::Upcaster for BookEvent {}
+impl esrs::event::Upcaster for BookEvent {}
 
 #[derive(Debug, Error)]
 pub enum BookError {

examples/saga/aggregate.rs

@@ -36,4 +36,4 @@ pub enum SagaEvent {
 }
 
 #[cfg(feature = "upcasting")]
-impl esrs::sql::event::Upcaster for SagaEvent {}
+impl esrs::event::Upcaster for SagaEvent {}

examples/schema/adding_schema.rs

@@ -66,7 +66,7 @@ mod before_schema {
     }
 
     #[cfg(feature = "upcasting")]
-    impl esrs::sql::event::Upcaster for Event {}
+    impl esrs::event::Upcaster for Event {}
 }
 
 mod after_schema {
@@ -129,7 +129,7 @@ mod after_schema {
     }
 
     #[cfg(feature = "upcasting")]
-    impl esrs::sql::event::Upcaster for Schema {}
+    impl esrs::event::Upcaster for Schema {}
 }
 
 pub(crate) async fn example(pool: PgPool) {

examples/schema/deprecating_events.rs

@@ -67,7 +67,7 @@ mod before_deprecation {
     }
 
     #[cfg(feature = "upcasting")]
-    impl esrs::sql::event::Upcaster for Schema {}
+    impl esrs::event::Upcaster for Schema {}
 
     impl esrs::store::postgres::Schema<Event> for Schema {
         fn from_event(value: Event) -> Self {
@@ -135,7 +135,7 @@ mod after_deprecation {
     }
 
     #[cfg(feature = "upcasting")]
-    impl esrs::sql::event::Upcaster for Schema {}
+    impl esrs::event::Upcaster for Schema {}
 
     impl esrs::store::postgres::Schema<Event> for Schema {
         fn from_event(value: Event) -> Self {

examples/schema/upcasting.rs

@@ -68,7 +68,7 @@ mod before_upcasting {
     }
 
     #[cfg(feature = "upcasting")]
-    impl esrs::sql::event::Upcaster for Schema {}
+    impl esrs::event::Upcaster for Schema {}
 
     impl esrs::store::postgres::Schema<Event> for Schema {
         fn from_event(value: Event) -> Self {
@@ -132,7 +132,7 @@ mod after_upcasting {
     }
 
     #[cfg(feature = "upcasting")]
-    impl esrs::sql::event::Upcaster for Schema {}
+    impl esrs::event::Upcaster for Schema {}
 
     impl esrs::store::postgres::Schema<Event> for Schema {
         fn from_event(value: Event) -> Self {

examples/upcasting/a.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use esrs::sql::event::Upcaster;
+use esrs::event::Upcaster;
 use esrs::Aggregate;
 
 use crate::{Command, Error};

examples/upcasting/b.rs

@@ -3,7 +3,7 @@ use std::convert::{TryFrom, TryInto};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 
-use esrs::sql::event::Upcaster;
+use esrs::event::Upcaster;
 use esrs::Aggregate;
 
 use crate::{Command, Error};

src/event.rs

@@ -0,0 +1,17 @@
+use serde::de::DeserializeOwned;
+
+pub trait Upcaster
+where
+    Self: Sized,
+{
+    fn upcast(value: serde_json::Value, _version: Option<i32>) -> Result<Self, serde_json::Error>
+    where
+        Self: DeserializeOwned,
+    {
+        serde_json::from_value(value)
+    }
+
+    fn current_version() -> Option<i32> {
+        None
+    }
+}

src/lib.rs

@@ -17,6 +17,8 @@ mod aggregate;
 mod state;
 
 pub mod bus;
+#[cfg(feature = "upcasting")]
+pub mod event;
 pub mod handler;
 pub mod manager;
 pub mod store;

src/sql/event.rs

@@ -10,34 +10,17 @@ use crate::types::SequenceNumber;
 use serde::de::DeserializeOwned;
 use serde::Serialize;
 
-#[cfg(feature = "upcasting")]
-pub trait Upcaster
-where
-    Self: Sized,
-{
-    fn upcast(value: serde_json::Value, _version: Option<i32>) -> Result<Self, serde_json::Error>
-    where
-        Self: DeserializeOwned,
-    {
-        serde_json::from_value(value)
-    }
-
-    fn current_version() -> Option<i32> {
-        None
-    }
-}
-
 #[cfg(not(feature = "upcasting"))]
 pub trait Persistable: Serialize + DeserializeOwned {}
 
 #[cfg(not(feature = "upcasting"))]
 impl<T> Persistable for T where T: Serialize + DeserializeOwned {}
 
 #[cfg(feature = "upcasting")]
-pub trait Persistable: Serialize + DeserializeOwned + Upcaster {}
+pub trait Persistable: Serialize + DeserializeOwned + crate::event::Upcaster {}
 
 #[cfg(feature = "upcasting")]
-impl<T> Persistable for T where T: Serialize + DeserializeOwned + Upcaster {}
+impl<T> Persistable for T where T: Serialize + DeserializeOwned + crate::event::Upcaster {}
 
 /// Event representation on the event store
 #[derive(sqlx::FromRow, serde::Serialize, serde::Deserialize, Debug)]

src/sql/migrations.rs

@@ -63,7 +63,7 @@ mod tests {
     pub struct TestEvent;
 
     #[cfg(feature = "upcasting")]
-    impl crate::sql::event::Upcaster for TestEvent {}
+    impl crate::event::Upcaster for TestEvent {}
 
     impl Aggregate for TestAggregate {
         const NAME: &'static str = "test";

src/store/postgres/schema.rs

@@ -23,7 +23,7 @@ use crate::sql::event::Persistable;
 /// # }
 /// #
 /// # #[cfg(feature = "upcasting")]
-/// # impl esrs::sql::event::Upcaster for Schema {}
+/// # impl esrs::event::Upcaster for Schema {}
 /// #
 /// # impl SchemaTrait<Event> for Schema {
 /// #   fn from_event(Event { a }: Event) -> Self {
@@ -65,7 +65,7 @@ pub trait Schema<E>: Persistable {
     /// # }
     /// #
     /// # #[cfg(feature = "upcasting")]
-    /// # impl esrs::sql::event::Upcaster for Schema {}
+    /// # impl esrs::event::Upcaster for Schema {}
     /// #
     /// # impl SchemaTrait<Event> for Schema {
     /// #   fn from_event(Event { a }: Event) -> Self {

tests/aggregate/structs.rs

@@ -11,7 +11,7 @@ pub struct TestEvent {
 }
 
 #[cfg(feature = "upcasting")]
-impl esrs::sql::event::Upcaster for TestEvent {}
+impl esrs::event::Upcaster for TestEvent {}
 
 #[derive(Debug, thiserror::Error)]
 pub enum TestError {}