[PLATFORM-1130]: Package refactor

examples/aggregate_deletion/main.rs

@@ -1,8 +1,10 @@
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder};
-use esrs::{AggregateManager, AggregateState, EventStore, StoreEvent};
+use esrs::manager::AggregateManager;
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::store::{EventStore, StoreEvent};
+use esrs::AggregateState;
 
 use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicEvent, BasicEventHandler, BasicView};
 

examples/common/basic/event_handler.rs

@@ -2,7 +2,8 @@ use async_trait::async_trait;
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::{EventHandler, StoreEvent};
+use esrs::handler::EventHandler;
+use esrs::store::StoreEvent;
 
 use crate::common::{BasicAggregate, BasicEvent, BasicView};
 

examples/common/shared/event_handler.rs

@@ -1,7 +1,8 @@
 use async_trait::async_trait;
 use sqlx::{Pool, Postgres};
 
-use esrs::{EventHandler, ReplayableEventHandler, StoreEvent};
+use esrs::handler::{EventHandler, ReplayableEventHandler};
+use esrs::store::StoreEvent;
 
 use crate::common::{AggregateA, AggregateB, EventA, EventB, SharedView, UpsertSharedView};
 

examples/event_bus/kafka.rs

@@ -2,7 +2,9 @@ use rdkafka::consumer::{Consumer, StreamConsumer};
 use rdkafka::{ClientConfig, Message};
 use serde::de::DeserializeOwned;
 
-use esrs::{Aggregate, EventHandler, StoreEvent};
+use esrs::handler::EventHandler;
+use esrs::store::StoreEvent;
+use esrs::Aggregate;
 
 pub struct KafkaEventBusConsumer<A> {
     consumer: StreamConsumer,

examples/event_bus/main.rs

@@ -7,10 +7,11 @@ use rdkafka::ClientConfig;
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::event_bus::kafka::{KafkaEventBus, KafkaEventBusConfig};
-use esrs::event_bus::rabbit::{RabbitEventBus, RabbitEventBusConfig};
-use esrs::postgres::{PgStore, PgStoreBuilder};
-use esrs::{AggregateManager, AggregateState};
+use esrs::bus::kafka::{KafkaEventBus, KafkaEventBusConfig};
+use esrs::bus::rabbit::{RabbitEventBus, RabbitEventBusConfig};
+use esrs::manager::AggregateManager;
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::AggregateState;
 
 use crate::common::{new_pool, random_letters, BasicAggregate, BasicCommand, BasicEventHandler, BasicView};
 use crate::kafka::KafkaEventBusConsumer;

examples/event_bus/rabbit.rs

@@ -4,7 +4,9 @@ use lapin::types::FieldTable;
 use lapin::{Connection, ConnectionProperties, Consumer};
 use serde::de::DeserializeOwned;
 
-use esrs::{Aggregate, EventHandler, StoreEvent};
+use esrs::handler::EventHandler;
+use esrs::store::StoreEvent;
+use esrs::Aggregate;
 
 use crate::common::random_letters;
 

examples/eventual_view/main.rs

@@ -1,8 +1,9 @@
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder};
-use esrs::{AggregateManager, AggregateState};
+use esrs::manager::AggregateManager;
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::AggregateState;
 
 use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicEventHandler, BasicView};
 

examples/locking_strategies/main.rs

@@ -5,8 +5,10 @@ use sqlx::{Pool, Postgres};
 use tokio::sync::Mutex;
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder};
-use esrs::{AggregateManager, AggregateManagerError, AggregateState, EventStore};
+use esrs::manager::{AggregateManager, AggregateManagerError};
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::store::EventStore;
+use esrs::AggregateState;
 
 use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicEvent};
 

examples/multi_aggregate_rebuild/main.rs

@@ -2,8 +2,11 @@ use futures::StreamExt;
 use sqlx::{PgConnection, Pool, Postgres, Transaction};
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder, PgStoreError};
-use esrs::{AggregateManager, AggregateState, ReplayableEventHandler, StoreEvent, TransactionalEventHandler};
+use esrs::handler::{ReplayableEventHandler, TransactionalEventHandler};
+use esrs::manager::AggregateManager;
+use esrs::store::postgres::{PgStore, PgStoreBuilder, PgStoreError};
+use esrs::store::StoreEvent;
+use esrs::AggregateState;
 
 use crate::common::{
     new_pool, AggregateA, AggregateB, CommandA, CommandB, EventA, EventB, SharedEventHandler, SharedView,

examples/multi_aggregate_rebuild/transactional_event_handler.rs

@@ -1,8 +1,9 @@
 use async_trait::async_trait;
 use sqlx::PgConnection;
 
-use esrs::postgres::PgStoreError;
-use esrs::{StoreEvent, TransactionalEventHandler};
+use esrs::handler::TransactionalEventHandler;
+use esrs::store::postgres::PgStoreError;
+use esrs::store::StoreEvent;
 
 use crate::common::{AggregateA, AggregateB, EventA, EventB, SharedView, UpsertSharedView};
 

examples/rebuilder/event_handler.rs

@@ -1,7 +1,8 @@
 use async_trait::async_trait;
 use sqlx::{Pool, Postgres};
 
-use esrs::{EventHandler, ReplayableEventHandler, StoreEvent};
+use esrs::handler::{EventHandler, ReplayableEventHandler};
+use esrs::store::StoreEvent;
 
 /// This is just an example. The need of v1 and v2 is due to having both the version of this event
 /// handler compiled in the code. In user codebase there will be only one `BasicEventHandler`

examples/rebuilder/main.rs

@@ -33,9 +33,10 @@
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder};
+use esrs::manager::AggregateManager;
 use esrs::rebuilder::{PgRebuilder, Rebuilder};
-use esrs::{AggregateManager, AggregateState};
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::AggregateState;
 
 use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicView};
 use crate::event_handler::{AnotherEventHandler, BasicEventHandlerV1, BasicEventHandlerV2};

examples/rebuilder/transactional_event_handler.rs

@@ -1,8 +1,9 @@
 use async_trait::async_trait;
 use sqlx::PgConnection;
 
-use esrs::postgres::PgStoreError;
-use esrs::{StoreEvent, TransactionalEventHandler};
+use esrs::handler::TransactionalEventHandler;
+use esrs::store::postgres::PgStoreError;
+use esrs::store::StoreEvent;
 
 use crate::common::{BasicAggregate, BasicEvent, BasicView};
 

examples/saga/event_handler.rs

@@ -3,8 +3,10 @@ use std::sync::Arc;
 use async_trait::async_trait;
 use futures::lock::Mutex;
 
-use esrs::postgres::PgStore;
-use esrs::{AggregateManager, EventHandler, StoreEvent};
+use esrs::handler::EventHandler;
+use esrs::manager::AggregateManager;
+use esrs::store::postgres::PgStore;
+use esrs::store::StoreEvent;
 
 use crate::aggregate::{SagaAggregate, SagaCommand, SagaEvent};
 

examples/saga/main.rs

@@ -4,8 +4,10 @@ use futures::lock::Mutex;
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder};
-use esrs::{AggregateManager, AggregateState, EventStore};
+use esrs::manager::AggregateManager;
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::store::EventStore;
+use esrs::AggregateState;
 
 use crate::aggregate::{SagaAggregate, SagaCommand, SagaEvent};
 use crate::common::new_pool;

examples/shared_view/main.rs

@@ -1,8 +1,9 @@
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder};
-use esrs::{AggregateManager, AggregateState};
+use esrs::manager::AggregateManager;
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::AggregateState;
 
 use crate::common::{new_pool, AggregateA, AggregateB, CommandA, CommandB, SharedEventHandler, SharedView};
 

examples/store_crud/main.rs

@@ -5,9 +5,10 @@ use sqlx::types::Json;
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder};
-use esrs::sql::Event;
-use esrs::{AggregateState, EventStore, StoreEvent};
+use esrs::sql::event::Event;
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::store::{EventStore, StoreEvent};
+use esrs::AggregateState;
 
 use crate::common::{new_pool, BasicAggregate, BasicEvent};
 

examples/transactional_view/main.rs

@@ -1,8 +1,10 @@
 use sqlx::{Pool, Postgres};
 use uuid::Uuid;
 
-use esrs::postgres::{PgStore, PgStoreBuilder};
-use esrs::{AggregateManager, AggregateState, EventStore};
+use esrs::manager::AggregateManager;
+use esrs::store::postgres::{PgStore, PgStoreBuilder};
+use esrs::store::EventStore;
+use esrs::AggregateState;
 
 use crate::common::{new_pool, BasicAggregate, BasicCommand, BasicView, BasicViewRow};
 use crate::transactional_event_handler::BasicTransactionalEventHandler;

examples/transactional_view/transactional_event_handler.rs

@@ -1,8 +1,9 @@
 use async_trait::async_trait;
 use sqlx::PgConnection;
 
-use esrs::postgres::PgStoreError;
-use esrs::{StoreEvent, TransactionalEventHandler};
+use esrs::handler::TransactionalEventHandler;
+use esrs::store::postgres::PgStoreError;
+use esrs::store::StoreEvent;
 
 use crate::common::{BasicAggregate, BasicEvent, BasicView};
 

src/esrs/event_bus/kafka/config.rs → src/bus/kafka/config.rs

@@ -1,7 +1,7 @@
 use rdkafka::ClientConfig;
 use typed_builder::TypedBuilder;
 
-use crate::event_bus::kafka::error::KafkaEventBusError;
+use crate::bus::kafka::error::KafkaEventBusError;
 
 #[derive(TypedBuilder)]
 pub struct KafkaEventBusConfig<'a> {
@@ -24,7 +24,7 @@ pub struct KafkaEventBusConfig<'a> {
     pub(crate) client_config: Option<ClientConfig>,
     /// A boxed anonymous function utilized to provide a form of error handling, commonly used for
     /// reporting purposes.
-    #[builder(default = Box::new(|_| ()))]
+    #[builder(default = Box::new(| _ | ()))]
     pub(crate) error_handler: Box<dyn Fn(KafkaEventBusError) + Send + Sync>,
 }
 

src/esrs/event_bus/kafka/mod.rs → src/bus/kafka/mod.rs

@@ -9,8 +9,9 @@ use serde::Serialize;
 pub use config::KafkaEventBusConfig;
 pub use error::KafkaEventBusError;
 
-use crate::event_bus::EventBus;
-use crate::{Aggregate, StoreEvent};
+use crate::bus::EventBus;
+use crate::store::StoreEvent;
+use crate::Aggregate;
 
 mod config;
 mod error;

src/esrs/event_bus.rs → src/bus/mod.rs

@@ -1,6 +1,7 @@
 use async_trait::async_trait;
 
-use crate::{Aggregate, StoreEvent};
+use crate::store::StoreEvent;
+use crate::Aggregate;
 
 #[cfg(feature = "kafka")]
 pub mod kafka;

src/esrs/event_bus/rabbit/config.rs → src/bus/rabbit/config.rs

@@ -3,7 +3,7 @@ use lapin::types::FieldTable;
 use lapin::{BasicProperties, ConnectionProperties, ExchangeKind};
 use typed_builder::TypedBuilder;
 
-use crate::event_bus::rabbit::error::RabbitEventBusError;
+use crate::bus::rabbit::error::RabbitEventBusError;
 
 #[derive(TypedBuilder)]
 pub struct RabbitEventBusConfig<'a> {
@@ -38,6 +38,6 @@ pub struct RabbitEventBusConfig<'a> {
     pub(crate) publish_properties: BasicProperties,
     /// A boxed anonymous function utilized to provide a form of error handling, commonly used for
     /// reporting purposes.
-    #[builder(default = Box::new(|_| ()))]
+    #[builder(default = Box::new(| _ | ()))]
     pub(crate) error_handler: Box<dyn Fn(RabbitEventBusError) + Send + Sync>,
 }

src/esrs/event_bus/rabbit/mod.rs → src/bus/rabbit/mod.rs

@@ -9,8 +9,9 @@ use serde::Serialize;
 pub use config::RabbitEventBusConfig;
 pub use error::RabbitEventBusError;
 
-use crate::esrs::event_bus::EventBus;
-use crate::{Aggregate, StoreEvent};
+use crate::bus::EventBus;
+use crate::store::StoreEvent;
+use crate::Aggregate;
 
 mod config;
 mod error;

src/esrs/event_handler.rs → src/handler.rs

@@ -3,7 +3,8 @@ use std::ops::Deref;
 use async_trait::async_trait;
 use uuid::Uuid;
 
-use crate::{Aggregate, StoreEvent};
+use crate::store::StoreEvent;
+use crate::Aggregate;
 
 /// This trait is used to implement an [`EventHandler`]. An event handler is intended to be an entity
 /// which can create, update and delete a read side and perform side effects.

src/lib.rs

@@ -9,41 +9,23 @@
 //! while using `postgres` event store, everytime a state load is required a database query is
 //! performed over the event store table.
 
-pub use crate::esrs::aggregate::Aggregate;
-pub use crate::esrs::aggregate_manager::AggregateManager;
-pub use crate::esrs::aggregate_manager::AggregateManagerError;
-pub use crate::esrs::aggregate_state::AggregateState;
-#[cfg(any(feature = "kafka", feature = "rabbit"))]
-pub use crate::esrs::event_bus;
-pub use crate::esrs::event_handler::{EventHandler, ReplayableEventHandler, TransactionalEventHandler};
-pub use crate::esrs::event_store::{EventStore, EventStoreLockGuard, StoreEvent, UnlockOnDrop};
-#[cfg(feature = "rebuilder")]
-pub use crate::esrs::rebuilder;
+pub use aggregate::Aggregate;
+pub use state::AggregateState;
 
-mod esrs;
+mod aggregate;
+mod state;
 
-#[cfg(feature = "postgres")]
-pub mod postgres {
-    //! Provides implementation of the [`EventStore`] for Postgres.
-    pub use crate::esrs::postgres::PgStore;
-    pub use crate::esrs::postgres::PgStoreBuilder;
-    pub use crate::esrs::postgres::PgStoreError;
-}
+pub mod bus;
+pub mod handler;
+pub mod manager;
+pub mod store;
 
+#[cfg(feature = "rebuilder")]
+pub mod rebuilder;
 #[cfg(feature = "sql")]
-pub mod sql {
-    pub use crate::esrs::sql::event::Event;
-    pub use crate::esrs::sql::migrations::{Migrations, MigrationsHandler};
-}
-
-pub mod error {
-    //! All possible errors returned by this crate
-    pub use serde_json::Error as JsonError;
-    #[cfg(feature = "sql")]
-    pub use sqlx::Error as SqlxError;
-}
+pub mod sql;
 
 pub mod types {
     //! Provides custom types.
-    pub use crate::esrs::SequenceNumber;
+    pub type SequenceNumber = i32;
 }

src/esrs/aggregate_manager.rs → src/manager.rs

@@ -2,7 +2,8 @@ use std::fmt::{Debug, Formatter};
 
 use uuid::Uuid;
 
-use crate::{Aggregate, AggregateState, EventStore, StoreEvent};
+use crate::store::{EventStore, StoreEvent};
+use crate::{Aggregate, AggregateState};
 
 /// The AggregateManager is responsible for coupling the Aggregate with a Store, so that the events
 /// can be persisted when handled, and the state can be reconstructed by loading and apply events sequentially.