Collapse redundant "deleted_at" timestaps and "deleted" event instants.

These were separated as there wasn't an obvious way to serialize two fields with the same _type_ with different _prefixes_. Turns out this is a common problem, and someone's written a crate for it that remaps the names for you.

3 files changed, 18 insertions, 16 deletions

diff --git a/src/conversation/history.rs b/src/conversation/history.rs
index 601614c..746a1b0 100644
--- a/src/conversation/history.rs
+++ b/src/conversation/history.rs
@@ -4,12 +4,11 @@ use super::{
     Conversation, Id,
     event::{Created, Deleted, Event},
 };
-use crate::event::{Instant, Sequence};
+use crate::event::Sequence;
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct History {
     pub conversation: Conversation,
-    pub deleted: Option<Instant>,
 }
 
 // State interface
@@ -58,7 +57,7 @@ impl History {
     }
 
     fn deleted(&self) -> Option<Event> {
-        self.deleted.map(|instant| {
+        self.conversation.deleted.map(|instant| {
             Deleted {
                 instant,
                 id: self.conversation.id.clone(),
diff --git a/src/conversation/repo.rs b/src/conversation/repo.rs
index e40a5bd..7e38b62 100644
--- a/src/conversation/repo.rs
+++ b/src/conversation/repo.rs
@@ -59,9 +59,8 @@ impl Conversations<'_> {
                 created,
                 id,
                 name: name.clone(),
-                deleted_at: None,
+                deleted: None,
             },
-            deleted: None,
         };
 
         Ok(conversation)
@@ -93,9 +92,8 @@ impl Conversations<'_> {
                     created: Instant::new(row.created_at, row.created_sequence),
                     id: row.id,
                     name: Name::optional(row.display_name, row.canonical_name)?.unwrap_or_default(),
-                    deleted_at: row.deleted_at,
+                    deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
                 },
-                deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
             })
         })
         .fetch_one(&mut *self.0)
@@ -131,9 +129,8 @@ impl Conversations<'_> {
                     created: Instant::new(row.created_at, row.created_sequence),
                     id: row.id,
                     name: Name::optional(row.display_name, row.canonical_name)?.unwrap_or_default(),
-                    deleted_at: row.deleted_at,
+                    deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
                 },
-                deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
             })
         })
         .fetch(&mut *self.0)
@@ -170,9 +167,8 @@ impl Conversations<'_> {
                     created: Instant::new(row.created_at, row.created_sequence),
                     id: row.id,
                     name: Name::optional(row.display_name, row.canonical_name)?.unwrap_or_default(),
-                    deleted_at: row.deleted_at,
+                    deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
                 },
-                deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
             })
         })
         .fetch(&mut *self.0)
@@ -297,9 +293,8 @@ impl Conversations<'_> {
                     created: Instant::new(row.created_at, row.created_sequence),
                     id: row.id,
                     name: Name::optional(row.display_name, row.canonical_name)?.unwrap_or_default(),
-                    deleted_at: row.deleted_at,
+                    deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
                 },
-                deleted: Instant::optional(row.deleted_at, row.deleted_sequence),
             })
         })
         .fetch(&mut *self.0)
diff --git a/src/conversation/snapshot.rs b/src/conversation/snapshot.rs
index da9eaae..440f3c0 100644
--- a/src/conversation/snapshot.rs
+++ b/src/conversation/snapshot.rs
@@ -1,8 +1,10 @@
+use serde_with::with_prefix;
+
 use super::{
     Id,
     event::{Created, Event},
 };
-use crate::{clock::DateTime, event::Instant, name::Name};
+use crate::{event::Instant, name::Name};
 
 #[derive(Clone, Debug, Eq, PartialEq, serde::Serialize)]
 pub struct Conversation {
@@ -10,10 +12,16 @@ pub struct Conversation {
     pub created: Instant,
     pub id: Id,
     pub name: Name,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub deleted_at: Option<DateTime>,
+    #[serde(
+        flatten,
+        with = "prefix_deleted",
+        skip_serializing_if = "Option::is_none"
+    )]
+    pub deleted: Option<Instant>,
 }
 
+with_prefix!(prefix_deleted "deleted_");
+
 impl Conversation {
     fn apply(state: Option<Self>, event: Event) -> Option<Self> {
         match (state, event) {