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.

3 files changed, 0 insertions, 250 deletions

diff --git a/src/event/repo/message.rs b/src/event/repo/message.rs
deleted file mode 100644
index f29c8a4..0000000
--- a/src/event/repo/message.rs
+++ /dev/null
@@ -1,196 +0,0 @@
-use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
-
-use crate::{
-    channel::{self, Channel},
-    clock::DateTime,
-    event::{types, Instant, Sequence},
-    login::{self, Login},
-    message::{self, Message},
-};
-
-pub trait Provider {
-    fn message_events(&mut self) -> Events;
-}
-
-impl<'c> Provider for Transaction<'c, Sqlite> {
-    fn message_events(&mut self) -> Events {
-        Events(self)
-    }
-}
-
-pub struct Events<'t>(&'t mut SqliteConnection);
-
-impl<'c> Events<'c> {
-    pub async fn create(
-        &mut self,
-        sender: &Login,
-        channel: &Channel,
-        sent: &Instant,
-        body: &str,
-    ) -> Result<types::ChannelEvent, sqlx::Error> {
-        let id = message::Id::generate();
-
-        let message = sqlx::query!(
-            r#"
-				insert into message
-					(id, channel, sender, sent_at, sent_sequence, body)
-				values ($1, $2, $3, $4, $5, $6)
-				returning
-					id as "id: message::Id",
-					sender as "sender: login::Id",
-                    sent_at as "sent_at: DateTime",
-                    sent_sequence as "sent_sequence: Sequence",
-					body
-			"#,
-            id,
-            channel.id,
-            sender.id,
-            sent.at,
-            sent.sequence,
-            body,
-        )
-        .map(|row| types::ChannelEvent {
-            instant: Instant {
-                at: row.sent_at,
-                sequence: row.sent_sequence,
-            },
-            data: types::MessageEvent {
-                channel: channel.clone(),
-                sender: sender.clone(),
-                message: Message {
-                    id: row.id,
-                    body: row.body,
-                },
-            }
-            .into(),
-        })
-        .fetch_one(&mut *self.0)
-        .await?;
-
-        Ok(message)
-    }
-
-    pub async fn delete(
-        &mut self,
-        channel: &Channel,
-        message: &message::Id,
-        deleted: &Instant,
-    ) -> Result<types::ChannelEvent, sqlx::Error> {
-        sqlx::query_scalar!(
-            r#"
-                delete from message
-                where id = $1
-                returning 1 as "row: i64"
-            "#,
-            message,
-        )
-        .fetch_one(&mut *self.0)
-        .await?;
-
-        Ok(types::ChannelEvent {
-            instant: Instant {
-                at: deleted.at,
-                sequence: deleted.sequence,
-            },
-            data: types::MessageDeletedEvent {
-                channel: channel.clone(),
-                message: message.clone(),
-            }
-            .into(),
-        })
-    }
-
-    pub async fn expired(
-        &mut self,
-        expire_at: &DateTime,
-    ) -> Result<Vec<(Channel, message::Id)>, sqlx::Error> {
-        let messages = sqlx::query!(
-            r#"
-                select
-                    channel.id as "channel_id: channel::Id",
-                    channel.name as "channel_name",
-                    channel.created_at as "channel_created_at: DateTime",
-                    channel.created_sequence as "channel_created_sequence: Sequence",
-                    message.id as "message: message::Id"
-                from message
-                    join channel on message.channel = channel.id
-                    join login as sender on message.sender = sender.id
-                where sent_at < $1
-            "#,
-            expire_at,
-        )
-        .map(|row| {
-            (
-                Channel {
-                    id: row.channel_id,
-                    name: row.channel_name,
-                    created: Instant {
-                        at: row.channel_created_at,
-                        sequence: row.channel_created_sequence,
-                    },
-                },
-                row.message,
-            )
-        })
-        .fetch_all(&mut *self.0)
-        .await?;
-
-        Ok(messages)
-    }
-
-    pub async fn replay(
-        &mut self,
-        resume_at: Option<Sequence>,
-    ) -> Result<Vec<types::ChannelEvent>, sqlx::Error> {
-        let events = sqlx::query!(
-            r#"
-				select
-					message.id as "id: message::Id",
-                    channel.id as "channel_id: channel::Id",
-                    channel.name as "channel_name",
-                    channel.created_at as "channel_created_at: DateTime",
-                    channel.created_sequence as "channel_created_sequence: Sequence",
-					sender.id as "sender_id: login::Id",
-					sender.name as sender_name,
-                    message.sent_at as "sent_at: DateTime",
-                    message.sent_sequence as "sent_sequence: Sequence",
-                    message.body
-				from message
-                    join channel on message.channel = channel.id
-					join login as sender on message.sender = sender.id
-				where coalesce(message.sent_sequence > $1, true)
-				order by sent_sequence asc
-			"#,
-            resume_at,
-        )
-        .map(|row| types::ChannelEvent {
-            instant: Instant {
-                at: row.sent_at,
-                sequence: row.sent_sequence,
-            },
-            data: types::MessageEvent {
-                channel: Channel {
-                    id: row.channel_id,
-                    name: row.channel_name,
-                    created: Instant {
-                        at: row.channel_created_at,
-                        sequence: row.channel_created_sequence,
-                    },
-                },
-                sender: Login {
-                    id: row.sender_id,
-                    name: row.sender_name,
-                },
-                message: Message {
-                    id: row.id,
-                    body: row.body,
-                },
-            }
-            .into(),
-        })
-        .fetch_all(&mut *self.0)
-        .await?;
-
-        Ok(events)
-    }
-}
diff --git a/src/event/repo/mod.rs b/src/event/repo/mod.rs
deleted file mode 100644
index cee840c..0000000
--- a/src/event/repo/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod message;
-mod sequence;
-
-pub use self::sequence::Provider;
diff --git a/src/event/repo/sequence.rs b/src/event/repo/sequence.rs
deleted file mode 100644
index 40d6a53..0000000
--- a/src/event/repo/sequence.rs
+++ /dev/null
@@ -1,50 +0,0 @@
-use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
-
-use crate::{
-    clock::DateTime,
-    event::{Instant, Sequence},
-};
-
-pub trait Provider {
-    fn sequence(&mut self) -> Sequences;
-}
-
-impl<'c> Provider for Transaction<'c, Sqlite> {
-    fn sequence(&mut self) -> Sequences {
-        Sequences(self)
-    }
-}
-
-pub struct Sequences<'t>(&'t mut SqliteConnection);
-
-impl<'c> Sequences<'c> {
-    pub async fn next(&mut self, at: &DateTime) -> Result<Instant, sqlx::Error> {
-        let next = sqlx::query_scalar!(
-            r#"
-                update event_sequence
-                set last_value = last_value + 1
-                returning last_value as "next_value: Sequence"
-            "#,
-        )
-        .fetch_one(&mut *self.0)
-        .await?;
-
-        Ok(Instant {
-            at: *at,
-            sequence: next,
-        })
-    }
-
-    pub async fn current(&mut self) -> Result<Sequence, sqlx::Error> {
-        let next = sqlx::query_scalar!(
-            r#"
-                select last_value as "last_value: Sequence"
-                from event_sequence
-            "#,
-        )
-        .fetch_one(&mut *self.0)
-        .await?;
-
-        Ok(next)
-    }
-}