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.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/event/routes.rs b/src/event/routes.rs
index c87bfb2..5b9c7e3 100644
--- a/src/event/routes.rs
+++ b/src/event/routes.rs
@@ -10,11 +10,11 @@ use axum::{
 use axum_extra::extract::Query;
 use futures::stream::{Stream, StreamExt as _};
 
-use super::{extract::LastEventId, types};
+use super::{extract::LastEventId, Event};
 use crate::{
     app::App,
     error::{Internal, Unauthorized},
-    event::Sequence,
+    event::{Sequence, Sequenced as _},
     token::{app::ValidateError, extract::Identity},
 };
 
@@ -35,7 +35,7 @@ async fn events(
     identity: Identity,
     last_event_id: Option<LastEventId<Sequence>>,
     Query(query): Query<EventsQuery>,
-) -> Result<Events<impl Stream<Item = types::ChannelEvent> + std::fmt::Debug>, EventsError> {
+) -> Result<Events<impl Stream<Item = Event> + std::fmt::Debug>, EventsError> {
     let resume_at = last_event_id
         .map(LastEventId::into_inner)
         .or(query.resume_point);
@@ -51,7 +51,7 @@ struct Events<S>(S);
 
 impl<S> IntoResponse for Events<S>
 where
-    S: Stream<Item = types::ChannelEvent> + Send + 'static,
+    S: Stream<Item = Event> + Send + 'static,
 {
     fn into_response(self) -> Response {
         let Self(stream) = self;
@@ -62,11 +62,11 @@ where
     }
 }
 
-impl TryFrom<types::ChannelEvent> for sse::Event {
+impl TryFrom<Event> for sse::Event {
     type Error = serde_json::Error;
 
-    fn try_from(event: types::ChannelEvent) -> Result<Self, Self::Error> {
-        let id = serde_json::to_string(&Sequence::from(&event))?;
+    fn try_from(event: Event) -> Result<Self, Self::Error> {
+        let id = serde_json::to_string(&event.sequence())?;
         let data = serde_json::to_string_pretty(&event)?;
 
         let event = Self::default().id(id).data(data);