Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.
TypeScript agentaiai-agentsall-in-onecrmcrm-systememaillinearmcpmessagingnotesnotionofficerustslackslack-alternativestartupstartup-toolstypescriptworkspace
feat(kafka): delete chat message kafka event (#5235)
Will Hutchinsone5f37878e176
diff --git a/.sqlx/query-663a12ade5ccf4613703c0ad368772673560741961c20f5c401b59b5c5f6027d.json b/.sqlx/query-cc4408a6a2db538cff01be0565744c30cddd4911f0fe444d26b7ab7f0b21144a.jsonsimilarity index 64%rename from .sqlx/query-663a12ade5ccf4613703c0ad368772673560741961c20f5c401b59b5c5f6027d.jsonrename to .sqlx/query-cc4408a6a2db538cff01be0565744c30cddd4911f0fe444d26b7ab7f0b21144a.jsonindex 565892f3ba..0ad61afde3 100644--- a/.sqlx/query-663a12ade5ccf4613703c0ad368772673560741961c20f5c401b59b5c5f6027d.json+++ b/.sqlx/query-cc4408a6a2db538cff01be0565744c30cddd4911f0fe444d26b7ab7f0b21144a.json@@ -1,11 +1,11 @@{"db_name": "PostgreSQL",- "query": "\n DELETE FROM \"ChatMessage\"\n WHERE id = $1\n RETURNING id\n ",+ "query": "\n DELETE FROM \"ChatMessage\"\n WHERE id = $1\n RETURNING \"chatId\" as \"chat_id!\"\n ","describe": {"columns": [{"ordinal": 0,- "name": "id",+ "name": "chat_id!","type_info": "Text"}],@@ -18,5 +18,5 @@false]},- "hash": "663a12ade5ccf4613703c0ad368772673560741961c20f5c401b59b5c5f6027d"+ "hash": "cc4408a6a2db538cff01be0565744c30cddd4911f0fe444d26b7ab7f0b21144a"}diff --git a/crates/chat/README.md b/crates/chat/README.mdindex 020d580b4a..25e78c2080 100644--- a/crates/chat/README.md+++ b/crates/chat/README.md@@ -23,6 +23,7 @@ between different chats is unspecified.| `chat.restored` | `ChatService::revert_delete` succeeds | `chat_id`, `actor_user_id`, `project_id` || `chat.copied` | `ChatService::copy_chat` succeeds | `chat_id` (the new copy), `source_chat_id`, `owner`, `name` || `chat.message_sent` | `MessageService::create` (user message) or `MessageService::store` (assistant message) persists the message | `chat_id`, `message_id`, `role`, `model`, `actor_user_id`, `attachment_count` |+| `chat.message_deleted` | `MessageService::delete` permanently deletes the message | `chat_id`, `message_id` |Optional metadata is serialized as `null`. On `chat.updated`, `name` and`project_id` describe the requested PATCH: `null` means the field was omitted,@@ -36,7 +37,8 @@ callers.and distinguishes user messages from assistant messages. `actor_user_id` isthe sender for user messages and `null` for assistant messages. `chat.copied`is keyed by the new chat's id; `chat.message_sent` is keyed by the parent-chat's id, preserving per-chat ordering.+chat's id. `chat.message_deleted` is also keyed by the parent chat's id, so+both message events preserve per-chat ordering.## Sanitization@@ -54,10 +56,9 @@ be treated as personal data. This matches identifiers already published on the## Excluded flows and known gapsOnly the successful mutations in the table produce these events. Read/list-operations and tool-call mutations emit nothing. Message update and delete-operations and tool events (for example `chat.tool_called` and-`chat.tool_rejected`) are not yet produced; they can be added later as new-enum variants.+operations and tool-call mutations emit nothing. Message update operations+and tool events (for example `chat.tool_called` and `chat.tool_rejected`) are+not yet produced; they can be added later as new enum variants.The AI auto-rename flow(`services/document_cognition_service/src/service/chat_renamer.rs`) patchesdiff --git a/crates/chat/src/domain/events.rs b/crates/chat/src/domain/events.rsindex ef69ff08b8..89d136b37a 100644--- a/crates/chat/src/domain/events.rs+++ b/crates/chat/src/domain/events.rs@@ -140,6 +140,15 @@ pub struct ChatMessageSentMetadata {pub attachment_count: usize,}+/// Metadata for [`ChatTopicEvent::MessageDeleted`].+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]+pub struct ChatMessageDeletedMetadata {+ /// Identifier of the chat the message belonged to.+ pub chat_id: String,+ /// Identifier of the deleted message.+ pub message_id: String,+}+/// Lifecycle and message events published to [`MacroChatsTopic`].#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]#[serde(tag = "event_type", content = "metadata")]@@ -165,6 +174,9 @@ pub enum ChatTopicEvent {/// A message was persisted to a chat.#[serde(rename = "chat.message_sent")]MessageSent(ChatMessageSentMetadata),+ /// A message was permanently deleted from a chat.+ #[serde(rename = "chat.message_deleted")]+ MessageDeleted(ChatMessageDeletedMetadata),}impl TopicEvent for ChatTopicEvent {@@ -222,6 +234,15 @@ impl ChatMacroEvent {)}+ /// Build a message-deleted event keyed by the parent chat id, preserving+ /// per-chat ordering.+ pub fn message_deleted(metadata: ChatMessageDeletedMetadata) -> Self {+ Self::new(+ metadata.chat_id.clone(),+ ChatTopicEvent::MessageDeleted(metadata),+ )+ }+fn new(key: String, event: ChatTopicEvent) -> Self {Self::with_event(key, Event::new(event))}diff --git a/crates/chat/src/domain/events/test.rs b/crates/chat/src/domain/events/test.rsindex 219839753c..8efab359c0 100644--- a/crates/chat/src/domain/events/test.rs+++ b/crates/chat/src/domain/events/test.rs@@ -160,6 +160,19 @@ fn topic_events() -> Vec<(ChatTopicEvent, Value)> {}}),),+ (+ ChatTopicEvent::MessageDeleted(ChatMessageDeletedMetadata {+ chat_id: CHAT_ID.to_string(),+ message_id: MESSAGE_ID.to_string(),+ }),+ json!({+ "event_type": "chat.message_deleted",+ "metadata": {+ "chat_id": CHAT_ID,+ "message_id": MESSAGE_ID+ }+ }),+ ),]}@@ -176,6 +189,7 @@ fn macro_events() -> Vec<ChatMacroEvent> {ChatTopicEvent::Restored(metadata) => ChatMacroEvent::restored(metadata),ChatTopicEvent::Copied(metadata) => ChatMacroEvent::copied(metadata),ChatTopicEvent::MessageSent(metadata) => ChatMacroEvent::message_sent(metadata),+ ChatTopicEvent::MessageDeleted(metadata) => ChatMacroEvent::message_deleted(metadata),}).collect()}diff --git a/crates/chat/src/domain/ports/message.rs b/crates/chat/src/domain/ports/message.rsindex 4eab72d18f..17e4aa7a82 100644--- a/crates/chat/src/domain/ports/message.rs+++ b/crates/chat/src/domain/ports/message.rs@@ -15,8 +15,8 @@ pub trait MessageRepo: Send + Sync + 'static {message: NewChatMessage,) -> impl Future<Output = Result<String>> + Send;- /// Delete a message by ID.- fn delete(&self, message_id: &str) -> impl Future<Output = Result<()>> + Send;+ /// Delete a message by ID, returning its parent chat ID.+ fn delete(&self, message_id: &str) -> impl Future<Output = Result<String>> + Send;/// Get all messages for a chat, with attachment metadata.fn get_messages(diff --git a/crates/chat/src/domain/service/message.rs b/crates/chat/src/domain/service/message.rsindex 704760eea8..06139759fe 100644--- a/crates/chat/src/domain/service/message.rs+++ b/crates/chat/src/domain/service/message.rs@@ -12,7 +12,7 @@ use model::chat::{AttachmentType, NewChatMessage};use model_entity::{Entity, EntityType};use non_empty::NonEmpty;-use crate::domain::events::{ChatMacroEvent, ChatMessageSentMetadata};+use crate::domain::events::{ChatMacroEvent, ChatMessageDeletedMetadata, ChatMessageSentMetadata};use crate::domain::models::{ChatErr, ResolvedMessageContent, Result};use crate::domain::ports::{MessageRepo, MessageService};@@ -176,7 +176,16 @@ impl<R: MessageRepo, A: AttachmentService, B: MacroEventBroker> MessageService#[tracing::instrument(err, skip(self))]async fn delete(&self, message_id: &str) -> Result<()> {- self.repo.delete(message_id).await+ let chat_id = self.repo.delete(message_id).await?;++ self.publish_chat_event(&ChatMacroEvent::message_deleted(+ ChatMessageDeletedMetadata {+ chat_id,+ message_id: message_id.to_owned(),+ },+ ));++ Ok(())}#[tracing::instrument(err, skip(self))]diff --git a/crates/chat/src/domain/service/message/test.rs b/crates/chat/src/domain/service/message/test.rsindex 53fb4455cd..91250ad200 100644--- a/crates/chat/src/domain/service/message/test.rs+++ b/crates/chat/src/domain/service/message/test.rs@@ -44,11 +44,22 @@ fn document_attachment(attachment_id: &str) -> NewAttachment {#[derive(Clone, Default)]struct StubMessageRepo {fail_create: bool,+ fail_delete: bool,}impl StubMessageRepo {fn failing() -> Self {- Self { fail_create: true }+ Self {+ fail_create: true,+ ..Self::default()+ }+ }++ fn failing_delete() -> Self {+ Self {+ fail_delete: true,+ ..Self::default()+ }}}@@ -62,8 +73,13 @@ impl MessageRepo for StubMessageRepo {Ok(MESSAGE_ID.to_string())}- async fn delete(&self, _message_id: &str) -> Result<()> {- unimplemented!("not used in these tests")+ async fn delete(&self, _message_id: &str) -> Result<String> {+ if self.fail_delete {+ return Err(ChatErr::BadRequest(+ "intentional delete failure".to_string(),+ ));+ }+ Ok(CHAT_ID.to_string())}async fn get_messages(&self, _chat_id: &str) -> Result<Vec<ChatMessageWithAttachments>> {@@ -275,6 +291,28 @@ async fn store_publishes_assistant_message_sent_without_actor() {);}+#[tokio::test]+async fn delete_publishes_message_deleted_keyed_by_chat_id() {+ let broker = RecordingEventBroker::default();+ let service = service_with_broker(StubMessageRepo::default(), broker.clone());++ service.delete(MESSAGE_ID).await.expect("delete succeeds");++ let events = broker.events();+ assert_eq!(events.len(), 1);+ let event = &events[0];+ assert_eq!(event.topic, "macro.chats");+ assert_eq!(event.key, CHAT_ID);+ assert_eq!(event.envelope["event_type"], "chat.message_deleted");+ assert_eq!(+ event.envelope["metadata"],+ json!({+ "chat_id": CHAT_ID,+ "message_id": MESSAGE_ID+ })+ );+}+#[tokio::test]async fn failed_create_publishes_no_event() {let broker = RecordingEventBroker::default();@@ -293,6 +331,15 @@ async fn failed_create_publishes_no_event() {assert!(broker.events().is_empty());}+#[tokio::test]+async fn failed_delete_publishes_no_event() {+ let broker = RecordingEventBroker::default();+ let service = service_with_broker(StubMessageRepo::failing_delete(), broker.clone());++ assert!(service.delete(MESSAGE_ID).await.is_err());+ assert!(broker.events().is_empty());+}+#[tokio::test]async fn broker_scheduling_failure_does_not_fail_the_call() {let service = service_with_broker(StubMessageRepo::default(), RecordingEventBroker::failing());@@ -308,4 +355,9 @@ async fn broker_scheduling_failure_does_not_fail_the_call() {.await.expect("store succeeds despite broker failure");assert_eq!(message_id, MESSAGE_ID);++ service+ .delete(MESSAGE_ID)+ .await+ .expect("delete succeeds despite broker failure");}diff --git a/crates/chat/src/outbound/postgres/mod.rs b/crates/chat/src/outbound/postgres/mod.rsindex f260912169..f6d274641a 100644--- a/crates/chat/src/outbound/postgres/mod.rs+++ b/crates/chat/src/outbound/postgres/mod.rs@@ -385,7 +385,7 @@ impl MessageRepo for PgChatRepo {}#[tracing::instrument(err, skip(self))]- async fn delete(&self, message_id: &str) -> Result<()> {+ async fn delete(&self, message_id: &str) -> Result<String> {queries::delete_message::delete_message(&self.pool, message_id).await.map_err(to_chat_err)diff --git a/crates/chat/src/outbound/postgres/queries/delete_message.rs b/crates/chat/src/outbound/postgres/queries/delete_message.rsindex 6f4aa1d3d0..71b2229f9d 100644--- a/crates/chat/src/outbound/postgres/queries/delete_message.rs+++ b/crates/chat/src/outbound/postgres/queries/delete_message.rs@@ -2,19 +2,19 @@use sqlx::PgPool;-/// Delete a message, returning an error if it does not exist.+/// Delete a message, returning its parent chat ID or an error if it does not exist.#[tracing::instrument(err, skip(pool))]-pub(crate) async fn delete_message(pool: &PgPool, message_id: &str) -> anyhow::Result<()> {- sqlx::query!(+pub(crate) async fn delete_message(pool: &PgPool, message_id: &str) -> anyhow::Result<String> {+ let row = sqlx::query!(r#"DELETE FROM "ChatMessage"WHERE id = $1- RETURNING id+ RETURNING "chatId" as "chat_id!""#,message_id).fetch_one(pool).await?;- Ok(())+ Ok(row.chat_id)}diff --git a/crates/chat/src/outbound/postgres/test.rs b/crates/chat/src/outbound/postgres/test.rsindex 0568560703..d9130c53e0 100644--- a/crates/chat/src/outbound/postgres/test.rs+++ b/crates/chat/src/outbound/postgres/test.rs@@ -134,6 +134,25 @@ async fn create_message_bumps_chat_updated_at(pool: Pool<Postgres>) {assert!(updated_at > original_updated_at);}+#[sqlx::test(+ migrator = "MACRO_DB_MIGRATIONS",+ fixtures(path = "fixtures", scripts("users"))+)]+async fn delete_message_returns_parent_chat_id_and_removes_message(pool: Pool<Postgres>) {+ let repo = PgChatRepo::new(pool);+ let (chat_id, message_id) = create_chat_with_message(&repo).await;++ let deleted_from_chat_id = crate::domain::ports::MessageRepo::delete(&repo, &message_id)+ .await+ .unwrap();++ assert_eq!(deleted_from_chat_id, chat_id);+ assert!(matches!(+ crate::domain::ports::MessageRepo::get_message_content(&repo, &chat_id, &message_id).await,+ Err(ChatErr::NotFound)+ ));+}+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS",fixtures(path = "fixtures", scripts("users"))diff --git a/crates/macro_event_topics/src/lib.rs b/crates/macro_event_topics/src/lib.rsindex 7e9ad316e0..d5872e8f03 100644--- a/crates/macro_event_topics/src/lib.rs+++ b/crates/macro_event_topics/src/lib.rs@@ -69,6 +69,6 @@ topics! {MacroWebhooksTopic => "macro.webhooks",/// Entity mention events (created / deleted) across channels and docs.MacroMentionsTopic => "macro.mentions",- /// AI chat lifecycle events (created / updated / deleted / restored / copied).+ /// AI chat lifecycle and message events.MacroChatsTopic => "macro.chats",}