2 files changed, 26 insertions, 11 deletions
diff --git a/src/channel/repo.rs b/src/channel/repo.rs
index 7206c21..6612151 100644
--- a/src/channel/repo.rs
+++ b/src/channel/repo.rs
@@ -32,12 +32,13 @@ impl<'c> Channels<'c> {
         sqlx::query!(
             r#"
                 insert
-                into channel (id, created_at, created_sequence)
-                values ($1, $2, $3)
+                into channel (id, created_at, created_sequence, last_sequence)
+                values ($1, $2, $3, $4)
             "#,
             id,
             created.at,
             created.sequence,
+            created.sequence,
         )
         .execute(&mut *self.0)
         .await?;
@@ -160,8 +161,7 @@ impl<'c> Channels<'c> {
                     using (id)
                 left join channel_deleted as deleted
                     using (id)
-                where channel.created_sequence > $1
-                    or deleted.deleted_sequence > $1
+                where channel.last_sequence > $1
             "#,
             resume_at,
         )
@@ -192,6 +192,19 @@ impl<'c> Channels<'c> {
         let id = channel.id();
         sqlx::query!(
             r#"
+                update channel
+                set last_sequence = max(last_sequence, $1)
+                where id = $2
+                returning id as "id: Id"
+            "#,
+            deleted.sequence,
+            id,
+        )
+        .fetch_one(&mut *self.0)
+        .await?;
+
+        sqlx::query!(
+            r#"
                 insert into channel_deleted (id, deleted_at, deleted_sequence)
                 values ($1, $2, $3)
             "#,
diff --git a/src/message/repo.rs b/src/message/repo.rs
index 913135c..14f8eaf 100644
--- a/src/message/repo.rs
+++ b/src/message/repo.rs
@@ -34,8 +34,8 @@ impl<'c> Messages<'c> {
         let message = sqlx::query!(
             r#"
                 insert into message
-                    (id, channel, sender, sent_at, sent_sequence, body)
-                values ($1, $2, $3, $4, $5, $6)
+                    (id, channel, sender, sent_at, sent_sequence, body, last_sequence)
+                values ($1, $2, $3, $4, $5, $6, $7)
                 returning
                     id as "id: Id",
                     channel as "channel: channel::Id",
@@ -50,6 +50,7 @@ impl<'c> Messages<'c> {
             sent.at,
             sent.sequence,
             body,
+            sent.sequence,
         )
         .map(|row| History {
             message: Message {
@@ -205,12 +206,14 @@ impl<'c> Messages<'c> {
         sqlx::query!(
             r#"
                 update message
-                set body = ''
-                where id = $1
+                set body = '', last_sequence = max(last_sequence, $1)
+                where id = $2
+                returning id as "id: Id"
             "#,
+            deleted.sequence,
             id,
         )
-        .execute(&mut *self.0)
+        .fetch_one(&mut *self.0)
         .await?;
 
         let message = self.by_id(id).await?;
@@ -297,8 +300,7 @@ impl<'c> Messages<'c> {
                 from message
                 left join message_deleted as deleted
                     using (id)
-                where message.sent_sequence > $1
-                    or deleted.deleted_sequence > $1
+                where message.last_sequence > $1
             "#,
             resume_at,
         )