diff options
| author | Owen Jacobson <owen@grimoire.ca> | 2025-08-21 23:47:15 -0400 |
|---|---|---|
| committer | Owen Jacobson <owen@grimoire.ca> | 2025-08-24 04:50:49 -0400 |
| commit | 53944ef14af4d37c08464cb1bb9f3a8f09277194 (patch) | |
| tree | 8458167c1608222a914ce0bdcc1fb5f966cf4f95 /src/conversation/repo.rs | |
| parent | fd6a74e8ca1f5ded2a760b8ac644124862d80d54 (diff) | |
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.
Diffstat (limited to 'src/conversation/repo.rs')
| -rw-r--r-- | src/conversation/repo.rs | 15 |
1 files changed, 5 insertions, 10 deletions
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) |