Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(email-search): stop 500s on threads with no sender (alerts 642/644) (#9617)

teoca47c3d83116
diff --git a/.sqlx/query-65534e2c228491519d074a22ad62454a831e54f54cd77a582dc1f8d386103706.json b/.sqlx/query-65534e2c228491519d074a22ad62454a831e54f54cd77a582dc1f8d386103706.json
new file mode 100644
index 0000000000..9d4c66a90c
--- /dev/null
+++ b/.sqlx/query-65534e2c228491519d074a22ad62454a831e54f54cd77a582dc1f8d386103706.json
@@ -0,0 +1,107 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT\n t.id as thread_id,\n -- Return timestamps from the chosen messages directly\n COALESCE(earliest_msg.sent_at, earliest_msg.updated_at) as \"first_message_ts!\",\n COALESCE(latest_msg.sent_at, latest_msg.updated_at) as \"last_message_ts!\",\n -- Last time user viewed this thread\n uh.updated_at as \"viewed_at?\",\n latest_msg.snippet,\n earliest_msg.subject as \"subject?\",\n l.macro_id,\n t.link_id,\n latest_msg.sender as \"sender?\",\n latest_msg.pretty_sender as \"pretty_sender?\",\n latest_msg.trash_label as trash_label,\n (\n SELECT m_latest.is_draft\n FROM email_messages m_latest\n WHERE m_latest.thread_id = t.id\n AND m_latest.link_id = t.link_id\n AND NOT (m_latest.is_draft AND COALESCE((m_latest.mailbox_state->>'provider_missing')::boolean, false))\n ORDER BY m_latest.internal_date_ts DESC NULLS LAST\n LIMIT 1\n ) AS \"is_draft!\",\n t.is_read,\n t.inbox_visible,\n -- Gmail's IMPORTANT label — a different notion from the\n -- Importance filter / email_threads.is_signal heuristic.\n (\n SELECT EXISTS (\n SELECT 1\n FROM email_messages m_imp\n JOIN email_message_labels ml ON m_imp.id = ml.message_id\n JOIN email_labels l ON ml.label_id = l.id\n WHERE m_imp.thread_id = t.id\n AND l.link_id = t.link_id\n AND l.name = 'IMPORTANT'\n )\n ) AS \"is_important!\"\n FROM email_threads t\n LEFT JOIN email_user_history uh ON uh.thread_id = t.id AND uh.link_id = t.link_id\n LEFT JOIN email_links l ON l.id = t.link_id\n -- LATERAL join for LATEST message\n -- JOIN (Inner) acts as a filter to ensure we only return threads that actually have messages\n JOIN LATERAL (\n SELECT\n m2.snippet,\n m2.sent_at,\n m2.updated_at,\n c.email_address as sender,\n COALESCE(c.name, c.email_address) as pretty_sender,\n EXISTS(\n SELECT 1 \n FROM email_message_labels eml \n JOIN email_labels el ON el.id = eml.label_id \n WHERE eml.message_id = m2.id \n AND el.provider_label_id = 'TRASH'\n ) as trash_label\n FROM email_messages m2\n LEFT JOIN email_contacts c ON c.id = m2.from_contact_id\n WHERE m2.thread_id = t.id\n AND m2.link_id = t.link_id\n AND NOT (m2.is_draft AND COALESCE((m2.mailbox_state->>'provider_missing')::boolean, false))\n ORDER BY\n (CASE WHEN m2.is_draft = false AND m2.sent_at IS NOT NULL THEN 0 ELSE 1 END) ASC,\n COALESCE(m2.sent_at, m2.updated_at) DESC NULLS LAST\n LIMIT 1\n ) latest_msg ON true\n -- LATERAL join for EARLIEST message\n LEFT JOIN LATERAL (\n SELECT\n m3.subject,\n m3.sent_at,\n m3.updated_at\n FROM email_messages m3\n WHERE m3.thread_id = t.id\n AND m3.link_id = t.link_id\n AND NOT (m3.is_draft AND COALESCE((m3.mailbox_state->>'provider_missing')::boolean, false))\n ORDER BY\n -- 1. Priority: Non-drafts with valid sent_at come first (0), everything else is fallback (1)\n (CASE WHEN m3.is_draft = false AND m3.sent_at IS NOT NULL THEN 0 ELSE 1 END) ASC,\n -- 2. Sort by time (Oldest first)\n COALESCE(m3.sent_at, m3.updated_at) ASC NULLS LAST\n LIMIT 1\n ) earliest_msg ON true\n WHERE t.id = ANY($2)\n AND t.link_id = ANY($1)\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "thread_id",
+ "type_info": "Uuid"
+ },
+ {
+ "ordinal": 1,
+ "name": "first_message_ts!",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 2,
+ "name": "last_message_ts!",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 3,
+ "name": "viewed_at?",
+ "type_info": "Timestamptz"
+ },
+ {
+ "ordinal": 4,
+ "name": "snippet",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 5,
+ "name": "subject?",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 6,
+ "name": "macro_id",
+ "type_info": "Text"
+ },
+ {
+ "ordinal": 7,
+ "name": "link_id",
+ "type_info": "Uuid"
+ },
+ {
+ "ordinal": 8,
+ "name": "sender?",
+ "type_info": "Varchar"
+ },
+ {
+ "ordinal": 9,
+ "name": "pretty_sender?",
+ "type_info": "Varchar"
+ },
+ {
+ "ordinal": 10,
+ "name": "trash_label",
+ "type_info": "Bool"
+ },
+ {
+ "ordinal": 11,
+ "name": "is_draft!",
+ "type_info": "Bool"
+ },
+ {
+ "ordinal": 12,
+ "name": "is_read",
+ "type_info": "Bool"
+ },
+ {
+ "ordinal": 13,
+ "name": "inbox_visible",
+ "type_info": "Bool"
+ },
+ {
+ "ordinal": 14,
+ "name": "is_important!",
+ "type_info": "Bool"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "UuidArray",
+ "UuidArray"
+ ]
+ },
+ "nullable": [
+ false,
+ null,
+ null,
+ false,
+ true,
+ true,
+ false,
+ false,
+ false,
+ null,
+ null,
+ null,
+ false,
+ false,
+ null
+ ]
+ },
+ "hash": "65534e2c228491519d074a22ad62454a831e54f54cd77a582dc1f8d386103706"
+}
diff --git a/.sqlx/query-d47de9234302e9f1e022748731c4bc4400c9aa390e0e020f8674c63861917e7e.json b/.sqlx/query-d47de9234302e9f1e022748731c4bc4400c9aa390e0e020f8674c63861917e7e.json
deleted file mode 100644
index 9ac553fedc..0000000000
--- a/.sqlx/query-d47de9234302e9f1e022748731c4bc4400c9aa390e0e020f8674c63861917e7e.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT\n t.id as thread_id,\n -- Return timestamps from the chosen messages directly\n COALESCE(earliest_msg.sent_at, earliest_msg.updated_at) as \"first_message_ts!\",\n COALESCE(latest_msg.sent_at, latest_msg.updated_at) as \"last_message_ts!\",\n -- Last time user viewed this thread\n uh.updated_at as \"viewed_at?\",\n latest_msg.snippet,\n earliest_msg.subject as \"subject?\",\n l.macro_id,\n t.link_id,\n latest_msg.sender as sender,\n latest_msg.pretty_sender as \"pretty_sender!\",\n latest_msg.trash_label as trash_label,\n (\n SELECT m_latest.is_draft\n FROM email_messages m_latest\n WHERE m_latest.thread_id = t.id\n AND m_latest.link_id = t.link_id\n AND NOT (m_latest.is_draft AND COALESCE((m_latest.mailbox_state->>'provider_missing')::boolean, false))\n ORDER BY m_latest.internal_date_ts DESC NULLS LAST\n LIMIT 1\n ) AS \"is_draft!\",\n t.is_read,\n t.inbox_visible,\n -- Gmail's IMPORTANT label — a different notion from the\n -- Importance filter / email_threads.is_signal heuristic.\n (\n SELECT EXISTS (\n SELECT 1\n FROM email_messages m_imp\n JOIN email_message_labels ml ON m_imp.id = ml.message_id\n JOIN email_labels l ON ml.label_id = l.id\n WHERE m_imp.thread_id = t.id\n AND l.link_id = t.link_id\n AND l.name = 'IMPORTANT'\n )\n ) AS \"is_important!\"\n FROM email_threads t\n LEFT JOIN email_user_history uh ON uh.thread_id = t.id AND uh.link_id = t.link_id\n LEFT JOIN email_links l ON l.id = t.link_id\n -- LATERAL join for LATEST message\n -- JOIN (Inner) acts as a filter to ensure we only return threads that actually have messages\n JOIN LATERAL (\n SELECT\n m2.snippet,\n m2.sent_at,\n m2.updated_at,\n c.email_address as sender,\n COALESCE(c.name, c.email_address) as pretty_sender,\n EXISTS(\n SELECT 1 \n FROM email_message_labels eml \n JOIN email_labels el ON el.id = eml.label_id \n WHERE eml.message_id = m2.id \n AND el.provider_label_id = 'TRASH'\n ) as trash_label\n FROM email_messages m2\n LEFT JOIN email_contacts c ON c.id = m2.from_contact_id\n WHERE m2.thread_id = t.id\n AND m2.link_id = t.link_id\n AND NOT (m2.is_draft AND COALESCE((m2.mailbox_state->>'provider_missing')::boolean, false))\n ORDER BY\n (CASE WHEN m2.is_draft = false AND m2.sent_at IS NOT NULL THEN 0 ELSE 1 END) ASC,\n COALESCE(m2.sent_at, m2.updated_at) DESC NULLS LAST\n LIMIT 1\n ) latest_msg ON true\n -- LATERAL join for EARLIEST message\n LEFT JOIN LATERAL (\n SELECT\n m3.subject,\n m3.sent_at,\n m3.updated_at\n FROM email_messages m3\n WHERE m3.thread_id = t.id\n AND m3.link_id = t.link_id\n AND NOT (m3.is_draft AND COALESCE((m3.mailbox_state->>'provider_missing')::boolean, false))\n ORDER BY\n -- 1. Priority: Non-drafts with valid sent_at come first (0), everything else is fallback (1)\n (CASE WHEN m3.is_draft = false AND m3.sent_at IS NOT NULL THEN 0 ELSE 1 END) ASC,\n -- 2. Sort by time (Oldest first)\n COALESCE(m3.sent_at, m3.updated_at) ASC NULLS LAST\n LIMIT 1\n ) earliest_msg ON true\n WHERE t.id = ANY($2)\n AND t.link_id = ANY($1)\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "thread_id",
- "type_info": "Uuid"
- },
- {
- "ordinal": 1,
- "name": "first_message_ts!",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 2,
- "name": "last_message_ts!",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 3,
- "name": "viewed_at?",
- "type_info": "Timestamptz"
- },
- {
- "ordinal": 4,
- "name": "snippet",
- "type_info": "Text"
- },
- {
- "ordinal": 5,
- "name": "subject?",
- "type_info": "Text"
- },
- {
- "ordinal": 6,
- "name": "macro_id",
- "type_info": "Text"
- },
- {
- "ordinal": 7,
- "name": "link_id",
- "type_info": "Uuid"
- },
- {
- "ordinal": 8,
- "name": "sender",
- "type_info": "Varchar"
- },
- {
- "ordinal": 9,
- "name": "pretty_sender!",
- "type_info": "Varchar"
- },
- {
- "ordinal": 10,
- "name": "trash_label",
- "type_info": "Bool"
- },
- {
- "ordinal": 11,
- "name": "is_draft!",
- "type_info": "Bool"
- },
- {
- "ordinal": 12,
- "name": "is_read",
- "type_info": "Bool"
- },
- {
- "ordinal": 13,
- "name": "inbox_visible",
- "type_info": "Bool"
- },
- {
- "ordinal": 14,
- "name": "is_important!",
- "type_info": "Bool"
- }
- ],
- "parameters": {
- "Left": [
- "UuidArray",
- "UuidArray"
- ]
- },
- "nullable": [
- false,
- null,
- null,
- false,
- true,
- true,
- false,
- false,
- false,
- null,
- null,
- null,
- false,
- false,
- null
- ]
- },
- "hash": "d47de9234302e9f1e022748731c4bc4400c9aa390e0e020f8674c63861917e7e"
-}
diff --git a/.sqlx/query-fab9a824cda630cab30894236104bd723c6473db79f05ce7fd94ccd1f02fcbc3.json b/.sqlx/query-ef419a492910d146d323a17fb15745fc39a407f5f96c27fe929aee41e39cb9d5.json
similarity index 72%
rename from .sqlx/query-fab9a824cda630cab30894236104bd723c6473db79f05ce7fd94ccd1f02fcbc3.json
rename to .sqlx/query-ef419a492910d146d323a17fb15745fc39a407f5f96c27fe929aee41e39cb9d5.json
index fbde75d1cf..cb7ad79d3c 100644
--- a/.sqlx/query-fab9a824cda630cab30894236104bd723c6473db79f05ce7fd94ccd1f02fcbc3.json
+++ b/.sqlx/query-ef419a492910d146d323a17fb15745fc39a407f5f96c27fe929aee41e39cb9d5.json
@@ -1,6 +1,6 @@
{
"db_name": "PostgreSQL",
- "query": "\n SELECT\n m.id as \"message_id!\",\n c.email_address as \"sender!\",\n COALESCE(c.name, c.email_address) as \"pretty_sender!\"\n FROM email_messages m\n LEFT JOIN email_contacts c ON c.id = m.from_contact_id\n WHERE m.id = ANY($1)\n AND m.link_id = ANY($2)\n ",
+ "query": "\n SELECT\n m.id as \"message_id!\",\n c.email_address as \"sender?\",\n COALESCE(c.name, c.email_address) as \"pretty_sender?\"\n FROM email_messages m\n LEFT JOIN email_contacts c ON c.id = m.from_contact_id\n WHERE m.id = ANY($1)\n AND m.link_id = ANY($2)\n ",
"describe": {
"columns": [
{
@@ -10,12 +10,12 @@
},
{
"ordinal": 1,
- "name": "sender!",
+ "name": "sender?",
"type_info": "Varchar"
},
{
"ordinal": 2,
- "name": "pretty_sender!",
+ "name": "pretty_sender?",
"type_info": "Varchar"
}
],
@@ -31,5 +31,5 @@
null
]
},
- "hash": "fab9a824cda630cab30894236104bd723c6473db79f05ce7fd94ccd1f02fcbc3"
+ "hash": "ef419a492910d146d323a17fb15745fc39a407f5f96c27fe929aee41e39cb9d5"
}
diff --git a/crates/email_db_client/AGENTS.md b/crates/email_db_client/AGENTS.md
index cb28edec39..4ef965e1ad 100644
--- a/crates/email_db_client/AGENTS.md
+++ b/crates/email_db_client/AGENTS.md
@@ -70,6 +70,10 @@ Parsed message responses expose the draft generation captured in the same SQL sn
(`label_present_before`, passed on by older writes given up). Code that
stages, confirms or abandons a Gmail label write takes
`lock_thread_label_writes` for its threads first.
+- SQLx can't see that a column read through a `LEFT JOIN` inside a `LATERAL`
+ subquery can be NULL and types it non-null from the table. Alias such
+ columns `"name?"`, and never force `"name!"` on one; `from_contact_id` is
+ nullable and `ON DELETE SET NULL`, so contact columns are often NULL.
- Quote and alias camelCase columns to Rust field names; check
`crates/macro_db_client/migrations/` for real column spelling, don't guess.
- A Macro draft (no provider id, or a live `email_mailbox_drafts` row) puts its
diff --git a/crates/email_db_client/src/messages/get.rs b/crates/email_db_client/src/messages/get.rs
index 9ebf0d7464..94b6c9e428 100644
--- a/crates/email_db_client/src/messages/get.rs
+++ b/crates/email_db_client/src/messages/get.rs
@@ -38,7 +38,8 @@ where
.await
}
-/// Returns a map of message IDs to sender info for all found messages
+/// Returns a map of message IDs to sender info for all found messages.
+/// Messages without a sender contact are left out of the map.
#[tracing::instrument(skip(pool), err)]
pub async fn get_message_sender_and_pretty_sender(
pool: &PgPool,
@@ -54,8 +55,8 @@ pub async fn get_message_sender_and_pretty_sender(
r#"
SELECT
m.id as "message_id!",
- c.email_address as "sender!",
- COALESCE(c.name, c.email_address) as "pretty_sender!"
+ c.email_address as "sender?",
+ COALESCE(c.name, c.email_address) as "pretty_sender?"
FROM email_messages m
LEFT JOIN email_contacts c ON c.id = m.from_contact_id
WHERE m.id = ANY($1)
@@ -70,8 +71,11 @@ pub async fn get_message_sender_and_pretty_sender(
let mut result = HashMap::new();
for row in rows {
let message_id = row.message_id;
- let sender = row.sender;
- let pretty_sender = row.pretty_sender;
+ let Some(sender) = row.sender else {
+ tracing::warn!(%message_id, "message has no sender contact");
+ continue;
+ };
+ let pretty_sender = row.pretty_sender.unwrap_or_else(|| sender.clone());
result.insert(
message_id,
MessageSenderInfo {
diff --git a/crates/email_db_client/src/messages/test.rs b/crates/email_db_client/src/messages/test.rs
index 9f4f14c059..b029726358 100644
--- a/crates/email_db_client/src/messages/test.rs
+++ b/crates/email_db_client/src/messages/test.rs
@@ -585,3 +585,44 @@ async fn parsed_reads_preserve_restored_draft_generation(
);
Ok(())
}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../fixtures", scripts("get_thread_summary_info"))
+)]
+async fn get_message_sender_and_pretty_sender_skips_messages_without_sender_contact(
+ pool: Pool<Postgres>,
+) -> anyhow::Result<()> {
+ const _: &sqlx::migrate::Migrator = &MACRO_DB_MIGRATIONS;
+ let link_id = Uuid::parse_str("00000000-0000-0000-0000-00000000001c")?;
+ let thread_id = Uuid::parse_str("00000000-0000-0000-0000-000000000301")?;
+ let with_contact_id = Uuid::parse_str("00000000-0000-0000-0000-0000000e0601")?;
+ let without_contact_id = Uuid::parse_str("00000000-0000-0000-0000-0000000e0626")?;
+
+ sqlx::query!(
+ r#"
+ INSERT INTO email_messages (id, thread_id, link_id, is_draft, is_sent, from_contact_id)
+ VALUES ($1, $2, $3, false, false, NULL)
+ "#,
+ without_contact_id,
+ thread_id,
+ link_id
+ )
+ .execute(&pool)
+ .await?;
+
+ let senders = crate::messages::get::get_message_sender_and_pretty_sender(
+ &pool,
+ &[link_id],
+ &[with_contact_id, without_contact_id],
+ )
+ .await?;
+
+ assert_eq!(senders.len(), 1);
+ assert!(!senders.contains_key(&without_contact_id));
+ let sender = senders.get(&with_contact_id).unwrap();
+ assert_eq!(sender.sender, "[email protected]");
+ assert_eq!(sender.pretty_sender, "Alice Smith");
+
+ Ok(())
+}
diff --git a/crates/email_db_client/src/user_history.rs b/crates/email_db_client/src/user_history.rs
index fb3e695ae7..1c86879c05 100644
--- a/crates/email_db_client/src/user_history.rs
+++ b/crates/email_db_client/src/user_history.rs
@@ -44,6 +44,9 @@ where
/// - `snippet`, `sender`, `pretty_sender`: from the *latest* message in the thread
/// - `subject`: from the *earliest* message in the thread (so it doesn't include "Re:"s
///
+/// `sender` and `pretty_sender` are empty when the latest message has no
+/// sender contact (`from_contact_id` is nullable and `ON DELETE SET NULL`).
+///
/// The "earliest" and "latest" messages are determined by:
/// 1. Priority: Non-drafts with a valid `sent_at` take precedence over drafts (or messages without `sent_at`).
/// 2. Sort: Chronological order of `sent_at` (or `updated_at` fallback).
@@ -75,8 +78,8 @@ pub async fn get_thread_summary_info(
earliest_msg.subject as "subject?",
l.macro_id,
t.link_id,
- latest_msg.sender as sender,
- latest_msg.pretty_sender as "pretty_sender!",
+ latest_msg.sender as "sender?",
+ latest_msg.pretty_sender as "pretty_sender?",
latest_msg.trash_label as trash_label,
(
SELECT m_latest.is_draft
@@ -166,6 +169,11 @@ pub async fn get_thread_summary_info(
if row.trash_label.unwrap_or_default() {
continue;
}
+ let sender = row.sender.unwrap_or_else(|| {
+ tracing::warn!(thread_id = %row.thread_id, "latest message has no sender contact");
+ String::new()
+ });
+ let pretty_sender = row.pretty_sender.unwrap_or_else(|| sender.clone());
let summary_info = ThreadHistoryInfo {
item_id: row.thread_id,
user_id: row.macro_id,
@@ -179,8 +187,8 @@ pub async fn get_thread_summary_info(
viewed_at: row
.viewed_at
.filter(|&viewed| viewed >= row.last_message_ts),
- sender: row.sender,
- pretty_sender: row.pretty_sender,
+ sender,
+ pretty_sender,
is_read: row.is_read,
inbox_visible: row.inbox_visible,
is_draft: row.is_draft,
diff --git a/crates/email_db_client/src/user_history/test.rs b/crates/email_db_client/src/user_history/test.rs
index afb9d1051b..273d652cf5 100644
--- a/crates/email_db_client/src/user_history/test.rs
+++ b/crates/email_db_client/src/user_history/test.rs
@@ -330,3 +330,94 @@ async fn get_thread_summary_info_skips_discarded_drafts(pool: Pool<Postgres>) ->
Ok(())
}
+
+#[sqlx::test(
+ migrator = "MACRO_DB_MIGRATIONS",
+ fixtures(path = "../../fixtures", scripts("get_thread_summary_info"))
+)]
+async fn get_thread_summary_info_latest_message_without_sender_contact(
+ pool: Pool<Postgres>,
+) -> Result<()> {
+ const _: &sqlx::migrate::Migrator = &MACRO_DB_MIGRATIONS;
+
+ let link_id = Uuid::parse_str("00000000-0000-0000-0000-00000000001c")?;
+ let healthy_thread_id = Uuid::parse_str("00000000-0000-0000-0000-000000000301")?;
+ let no_contact_thread_id = Uuid::parse_str("00000000-0000-0000-0000-000000000310")?;
+ let deleted_contact_thread_id = Uuid::parse_str("00000000-0000-0000-0000-000000000311")?;
+ let deleted_contact_id = Uuid::parse_str("00000000-0000-0000-0000-0000000c0030")?;
+
+ // A message stored without a sender contact, and one whose contact is
+ // later deleted (`from_contact_id` is `ON DELETE SET NULL`).
+ sqlx::query!(
+ "INSERT INTO email_threads (id, link_id) VALUES ($1, $3), ($2, $3)",
+ no_contact_thread_id,
+ deleted_contact_thread_id,
+ link_id
+ )
+ .execute(&pool)
+ .await?;
+ sqlx::query!(
+ "INSERT INTO email_contacts (id, link_id, email_address) VALUES ($1, $2, '[email protected]')",
+ deleted_contact_id,
+ link_id
+ )
+ .execute(&pool)
+ .await?;
+ sqlx::query!(
+ r#"
+ INSERT INTO email_messages (id, thread_id, link_id, is_draft, is_sent, from_contact_id,
+ internal_date_ts, sent_at, subject)
+ VALUES ('00000000-0000-0000-0000-0000000e0624', $1, $3, false, false, NULL,
+ '2025-01-12 10:00:00 +00:00', '2025-01-12 10:00:00 +00:00', 'No contact'),
+ ('00000000-0000-0000-0000-0000000e0625', $2, $3, false, false, $4,
+ '2025-01-12 11:00:00 +00:00', '2025-01-12 11:00:00 +00:00', 'Deleted contact')
+ "#,
+ no_contact_thread_id,
+ deleted_contact_thread_id,
+ link_id,
+ deleted_contact_id
+ )
+ .execute(&pool)
+ .await?;
+ sqlx::query!(
+ "DELETE FROM email_contacts WHERE id = $1",
+ deleted_contact_id
+ )
+ .execute(&pool)
+ .await?;
+
+ let result = get_thread_summary_info(
+ &pool,
+ &[link_id],
+ &[
+ healthy_thread_id,
+ no_contact_thread_id,
+ deleted_contact_thread_id,
+ ],
+ )
+ .await?;
+
+ assert_eq!(
+ result.len(),
+ 3,
+ "a thread without a sender must not drop the batch"
+ );
+ for thread_id in [no_contact_thread_id, deleted_contact_thread_id] {
+ let info = result.get(&thread_id).unwrap();
+ assert_eq!(info.sender, "");
+ assert_eq!(info.pretty_sender, "");
+ }
+ assert_eq!(
+ result
+ .get(&no_contact_thread_id)
+ .unwrap()
+ .subject
+ .as_deref(),
+ Some("No contact")
+ );
+ let healthy = result.get(&healthy_thread_id).unwrap();
+ assert!(!healthy.sender.is_empty());
+ assert!(!healthy.pretty_sender.is_empty());
+
+ Ok(())
+}