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): scope contact lookup to link_id in link_has_any_message_with (#5073)

Evan Hutnikdd680896181c
diff --git a/.sqlx/query-8836199bec1d69563bff190098f2e2a3aa14d1d50a9fc9befcadd70c2341e192.json b/.sqlx/query-8836199bec1d69563bff190098f2e2a3aa14d1d50a9fc9befcadd70c2341e192.json
new file mode 100644
index 0000000000..660f9df3d5
--- /dev/null
+++ b/.sqlx/query-8836199bec1d69563bff190098f2e2a3aa14d1d50a9fc9befcadd70c2341e192.json
@@ -0,0 +1,23 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "\n SELECT EXISTS (\n SELECT 1\n FROM email_messages m\n JOIN email_message_recipients r ON r.message_id = m.id\n JOIN email_contacts c ON c.id = r.contact_id\n WHERE m.link_id = $1\n AND m.is_sent = true\n AND c.link_id = $1\n AND LOWER(c.email_address) = $2\n UNION ALL\n SELECT 1\n FROM email_messages m\n JOIN email_contacts c ON c.id = m.from_contact_id\n WHERE m.link_id = $1\n AND m.is_sent = false\n AND c.link_id = $1\n AND LOWER(c.email_address) = $2\n LIMIT 1\n ) AS \"exists!\"\n ",
+ "describe": {
+ "columns": [
+ {
+ "ordinal": 0,
+ "name": "exists!",
+ "type_info": "Bool"
+ }
+ ],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Text"
+ ]
+ },
+ "nullable": [
+ null
+ ]
+ },
+ "hash": "8836199bec1d69563bff190098f2e2a3aa14d1d50a9fc9befcadd70c2341e192"
+}
diff --git a/.sqlx/query-896b6aa18d1cbdf28df4b24758813d0327649d0b807a60928142de0d6a2ce5e8.json b/.sqlx/query-896b6aa18d1cbdf28df4b24758813d0327649d0b807a60928142de0d6a2ce5e8.json
deleted file mode 100644
index 2e3dd4d309..0000000000
--- a/.sqlx/query-896b6aa18d1cbdf28df4b24758813d0327649d0b807a60928142de0d6a2ce5e8.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "db_name": "PostgreSQL",
- "query": "\n SELECT EXISTS (\n SELECT 1\n FROM email_messages m\n JOIN email_message_recipients r ON r.message_id = m.id\n JOIN email_contacts c ON c.id = r.contact_id\n WHERE m.link_id = $1\n AND m.is_sent = true\n AND LOWER(c.email_address) = $2\n UNION ALL\n SELECT 1\n FROM email_messages m\n JOIN email_contacts c ON c.id = m.from_contact_id\n WHERE m.link_id = $1\n AND m.is_sent = false\n AND LOWER(c.email_address) = $2\n LIMIT 1\n ) AS \"exists!\"\n ",
- "describe": {
- "columns": [
- {
- "ordinal": 0,
- "name": "exists!",
- "type_info": "Bool"
- }
- ],
- "parameters": {
- "Left": [
- "Uuid",
- "Text"
- ]
- },
- "nullable": [
- null
- ]
- },
- "hash": "896b6aa18d1cbdf28df4b24758813d0327649d0b807a60928142de0d6a2ce5e8"
-}
diff --git a/crates/email_db_client/src/contacts/get.rs b/crates/email_db_client/src/contacts/get.rs
index 4aa1e250c3..b9e54cc542 100644
--- a/crates/email_db_client/src/contacts/get.rs
+++ b/crates/email_db_client/src/contacts/get.rs
@@ -188,6 +188,7 @@ pub async fn link_has_any_message_with(
JOIN email_contacts c ON c.id = r.contact_id
WHERE m.link_id = $1
AND m.is_sent = true
+ AND c.link_id = $1
AND LOWER(c.email_address) = $2
UNION ALL
SELECT 1
@@ -195,6 +196,7 @@ pub async fn link_has_any_message_with(
JOIN email_contacts c ON c.id = m.from_contact_id
WHERE m.link_id = $1
AND m.is_sent = false
+ AND c.link_id = $1
AND LOWER(c.email_address) = $2
LIMIT 1
) AS "exists!"