Merge branch 'main' into wip/path-routing-for-channels

1 files changed, 67 insertions, 58 deletions

diff --git a/src/message/repo.rs b/src/message/repo.rs
index 5b199a7..71c6d10 100644
--- a/src/message/repo.rs
+++ b/src/message/repo.rs
@@ -2,7 +2,7 @@ use sqlx::{sqlite::Sqlite, SqliteConnection, Transaction};
 
 use super::{snapshot::Message, History, Id};
 use crate::{
-    channel::{self, Channel},
+    channel,
     clock::DateTime,
     event::{Instant, ResumePoint, Sequence},
     login::{self, Login},
@@ -38,6 +38,10 @@ impl<'c> Messages<'c> {
 				values ($1, $2, $3, $4, $5, $6)
 				returning
 					id as "id: Id",
+                    channel as "channel: channel::Id",
+                    sender as "sender: login::Id",
+                    sent_at as "sent_at: DateTime",
+                    sent_sequence as "sent_sequence: Sequence",
 					body
 			"#,
             id,
@@ -49,12 +53,12 @@ impl<'c> Messages<'c> {
         )
         .map(|row| History {
             message: Message {
-                sent: *sent,
-                // Use "as created" here as we don't care about providing a perfectly up-to-date
-                // representation of the channel. The `name` is informational (and the ID, which is
-                // normative, is fixed over time).
-                channel: channel.as_created(),
-                sender: sender.clone(),
+                sent: Instant {
+                    at: row.sent_at,
+                    sequence: row.sent_sequence,
+                },
+                channel: row.channel,
+                sender: row.sender,
                 id: row.id,
                 body: row.body,
             },
@@ -75,20 +79,16 @@ impl<'c> Messages<'c> {
         let messages = sqlx::query!(
             r#"
                 select
-                    channel.id as "channel_id: channel::Id",
-                    channel.name as "channel_name",
-                    sender.id as "sender_id: login::Id",
-                    sender.name as "sender_name",
-                    message.id as "id: Id",
-                    message.body,
+                    channel as "channel: channel::Id",
+                    sender as "sender: login::Id",
+                    id as "id: Id",
+                    body,
                     sent_at as "sent_at: DateTime",
                     sent_sequence as "sent_sequence: Sequence"
                 from message
-                    join channel on message.channel = channel.id
-                    join login as sender on message.sender = sender.id
-                where channel.id = $1
-                    and coalesce(message.sent_sequence <= $2, true)
-                order by message.sent_sequence
+                where channel = $1
+                    and coalesce(sent_sequence <= $2, true)
+                order by sent_sequence
             "#,
             channel_id,
             resume_at,
@@ -99,14 +99,43 @@ impl<'c> Messages<'c> {
                     at: row.sent_at,
                     sequence: row.sent_sequence,
                 },
-                channel: Channel {
-                    id: row.channel_id,
-                    name: row.channel_name,
-                },
-                sender: Login {
-                    id: row.sender_id,
-                    name: row.sender_name,
+                channel: row.channel,
+                sender: row.sender,
+                id: row.id,
+                body: row.body,
+            },
+            deleted: None,
+        })
+        .fetch_all(&mut *self.0)
+        .await?;
+
+        Ok(messages)
+    }
+
+    pub async fn all(&mut self, resume_at: ResumePoint) -> Result<Vec<History>, sqlx::Error> {
+        let messages = sqlx::query!(
+            r#"
+                select
+                    channel as "channel: channel::Id",
+                    sender as "sender: login::Id",
+                    id as "id: Id",
+                    body,
+                    sent_at as "sent_at: DateTime",
+                    sent_sequence as "sent_sequence: Sequence"
+                from message
+                where coalesce(sent_sequence <= $2, true)
+                order by sent_sequence
+            "#,
+            resume_at,
+        )
+        .map(|row| History {
+            message: Message {
+                sent: Instant {
+                    at: row.sent_at,
+                    sequence: row.sent_sequence,
                 },
+                channel: row.channel,
+                sender: row.sender,
                 id: row.id,
                 body: row.body,
             },
@@ -122,18 +151,14 @@ impl<'c> Messages<'c> {
         let message = sqlx::query!(
             r#"
                 select
-                    channel.id as "channel_id: channel::Id",
-                    channel.name as "channel_name",
-                    sender.id as "sender_id: login::Id",
-                    sender.name as "sender_name",
-                    message.id as "id: Id",
-                    message.body,
+                    channel as "channel: channel::Id",
+                    sender as "sender: login::Id",
+                    id as "id: Id",
+                    body,
                     sent_at as "sent_at: DateTime",
                     sent_sequence as "sent_sequence: Sequence"
                 from message
-                    join channel on message.channel = channel.id
-                    join login as sender on message.sender = sender.id
-                where message.id = $1
+                where id = $1
             "#,
             message,
         )
@@ -143,14 +168,8 @@ impl<'c> Messages<'c> {
                     at: row.sent_at,
                     sequence: row.sent_sequence,
                 },
-                channel: Channel {
-                    id: row.channel_id,
-                    name: row.channel_name,
-                },
-                sender: Login {
-                    id: row.sender_id,
-                    name: row.sender_name,
-                },
+                channel: row.channel,
+                sender: row.sender,
                 id: row.id,
                 body: row.body,
             },
@@ -207,17 +226,13 @@ impl<'c> Messages<'c> {
         let messages = sqlx::query!(
             r#"
                 select
-                    channel.id as "channel_id: channel::Id",
-                    channel.name as "channel_name",
-                    sender.id as "sender_id: login::Id",
-                    sender.name as "sender_name",
-                    message.id as "id: Id",
-                    message.body,
+                    channel as "channel: channel::Id",
+                    sender as "sender: login::Id",
+                    id as "id: Id",
+                    body,
                     sent_at as "sent_at: DateTime",
                     sent_sequence as "sent_sequence: Sequence"
                 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)
             "#,
             resume_at,
@@ -228,14 +243,8 @@ impl<'c> Messages<'c> {
                     at: row.sent_at,
                     sequence: row.sent_sequence,
                 },
-                channel: Channel {
-                    id: row.channel_id,
-                    name: row.channel_name,
-                },
-                sender: Login {
-                    id: row.sender_id,
-                    name: row.sender_name,
-                },
+                channel: row.channel,
+                sender: row.sender,
                 id: row.id,
                 body: row.body,
             },