Represent channels and messages using a split "History" and "Snapshot" model.

This separates the code that figures out what happened to an entity from the code that represents it to a user, and makes it easier to compute a snapshot at a point in time (for things like bootstrap). It also makes the internal logic a bit easier to follow, since it's easier to tell whether you're working with a point in time or with the whole recorded history.

This hefty.

4 files changed, 21 insertions, 14 deletions

diff --git a/src/test/fixtures/event.rs b/src/test/fixtures/event.rs
new file mode 100644
index 0000000..09f0490
--- /dev/null
+++ b/src/test/fixtures/event.rs
@@ -0,0 +1,11 @@
+use crate::{
+    event::{Event, Kind},
+    message::Message,
+};
+
+pub fn message_sent(event: &Event, message: &Message) -> bool {
+    matches!(
+        &event.kind,
+        Kind::MessageSent(event) if message == &event.into()
+    )
+}
diff --git a/src/test/fixtures/filter.rs b/src/test/fixtures/filter.rs
index d1939a5..6e62aea 100644
--- a/src/test/fixtures/filter.rs
+++ b/src/test/fixtures/filter.rs
@@ -1,11 +1,11 @@
 use futures::future;
 
-use crate::event::types;
+use crate::event::{Event, Kind};
 
-pub fn messages() -> impl FnMut(&types::ChannelEvent) -> future::Ready<bool> {
-    |event| future::ready(matches!(event.data, types::ChannelEventData::Message(_)))
+pub fn messages() -> impl FnMut(&Event) -> future::Ready<bool> {
+    |event| future::ready(matches!(event.kind, Kind::MessageSent(_)))
 }
 
-pub fn created() -> impl FnMut(&types::ChannelEvent) -> future::Ready<bool> {
-    |event| future::ready(matches!(event.data, types::ChannelEventData::Created(_)))
+pub fn created() -> impl FnMut(&Event) -> future::Ready<bool> {
+    |event| future::ready(matches!(event.kind, Kind::ChannelCreated(_)))
 }
diff --git a/src/test/fixtures/message.rs b/src/test/fixtures/message.rs
index fd50887..381b10b 100644
--- a/src/test/fixtures/message.rs
+++ b/src/test/fixtures/message.rs
@@ -1,17 +1,12 @@
 use faker_rand::lorem::Paragraphs;
 
-use crate::{app::App, channel::Channel, clock::RequestedAt, event::types, login::Login};
+use crate::{app::App, channel::Channel, clock::RequestedAt, login::Login, message::Message};
 
-pub async fn send(
-    app: &App,
-    login: &Login,
-    channel: &Channel,
-    sent_at: &RequestedAt,
-) -> types::ChannelEvent {
+pub async fn send(app: &App, channel: &Channel, login: &Login, sent_at: &RequestedAt) -> Message {
     let body = propose();
 
-    app.events()
-        .send(login, &channel.id, &body, sent_at)
+    app.messages()
+        .send(&channel.id, login, sent_at, &body)
         .await
         .expect("should succeed if the channel exists")
 }
diff --git a/src/test/fixtures/mod.rs b/src/test/fixtures/mod.rs
index 76467ab..c5efa9b 100644
--- a/src/test/fixtures/mod.rs
+++ b/src/test/fixtures/mod.rs
@@ -3,6 +3,7 @@ use chrono::{TimeDelta, Utc};
 use crate::{app::App, clock::RequestedAt, db};
 
 pub mod channel;
+pub mod event;
 pub mod filter;
 pub mod future;
 pub mod identity;