List messages per channel.

1 files changed, 45 insertions, 12 deletions

diff --git a/src/message/repo.rs b/src/message/repo.rs
index ae41736..fc835c8 100644
--- a/src/message/repo.rs
+++ b/src/message/repo.rs
@@ -48,12 +48,12 @@ impl<'c> Messages<'c> {
         )
         .map(|row| History {
             message: Message {
+                sent: *sent,
                 channel: channel.clone(),
                 sender: sender.clone(),
                 id: row.id,
                 body: row.body,
             },
-            sent: *sent,
             deleted: None,
         })
         .fetch_one(&mut *self.0)
@@ -62,18 +62,51 @@ impl<'c> Messages<'c> {
         Ok(message)
     }
 
-    pub async fn in_channel(&mut self, channel: &Channel) -> Result<Vec<Id>, sqlx::Error> {
-        let messages = sqlx::query_scalar!(
+    pub async fn in_channel(
+        &mut self,
+        channel: &Channel,
+        resume_at: Option<Sequence>,
+    ) -> Result<Vec<History>, sqlx::Error> {
+        let messages = sqlx::query!(
             r#"
                 select
-                    message.id as "id: Id"
+                    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,
+                    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
             "#,
             channel.id,
+            resume_at,
         )
+        .map(|row| History {
+            message: Message {
+                sent: Instant {
+                    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,
+                },
+                id: row.id,
+                body: row.body,
+            },
+            deleted: None,
+        })
         .fetch_all(&mut *self.0)
         .await?;
 
@@ -101,6 +134,10 @@ impl<'c> Messages<'c> {
         )
         .map(|row| History {
             message: Message {
+                sent: Instant {
+                    at: row.sent_at,
+                    sequence: row.sent_sequence,
+                },
                 channel: Channel {
                     id: row.channel_id,
                     name: row.channel_name,
@@ -112,10 +149,6 @@ impl<'c> Messages<'c> {
                 id: row.id,
                 body: row.body,
             },
-            sent: Instant {
-                at: row.sent_at,
-                sequence: row.sent_sequence,
-            },
             deleted: None,
         })
         .fetch_one(&mut *self.0)
@@ -189,6 +222,10 @@ impl<'c> Messages<'c> {
         )
         .map(|row| History {
             message: Message {
+                sent: Instant {
+                    at: row.sent_at,
+                    sequence: row.sent_sequence,
+                },
                 channel: Channel {
                     id: row.channel_id,
                     name: row.channel_name,
@@ -200,10 +237,6 @@ impl<'c> Messages<'c> {
                 id: row.id,
                 body: row.body,
             },
-            sent: Instant {
-                at: row.sent_at,
-                sequence: row.sent_sequence,
-            },
             deleted: None,
         })
         .fetch_all(&mut *self.0)