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
update topicevent trait (#5182)
Sean Aye1dddea1b72e3
diff --git a/crates/bots/src/domain/events.rs b/crates/bots/src/domain/events.rsindex a2c4495230..6cc3f47968 100644--- a/crates/bots/src/domain/events.rs+++ b/crates/bots/src/domain/events.rs@@ -90,9 +90,7 @@ pub enum BotTopicEvent {impl TopicEvent for BotTopicEvent {type Topic = MacroBotsTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable lifecycle event for [`MacroBotsTopic`], keyed by bot id.diff --git a/crates/channels/src/domain/broker_events.rs b/crates/channels/src/domain/broker_events.rsindex 0d8da32c9c..992ea5d90b 100644--- a/crates/channels/src/domain/broker_events.rs+++ b/crates/channels/src/domain/broker_events.rs@@ -230,9 +230,7 @@ pub enum ChannelTopicEvent {impl TopicEvent for ChannelTopicEvent {type Topic = MacroChannelsTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable event for [`MacroChannelsTopic`], keyed by channel id.diff --git a/crates/channels/src/domain/mention_events.rs b/crates/channels/src/domain/mention_events.rsindex 1a781def1c..521ae910d6 100644--- a/crates/channels/src/domain/mention_events.rs+++ b/crates/channels/src/domain/mention_events.rs@@ -68,9 +68,7 @@ pub enum MentionTopicEvent {impl TopicEvent for MentionTopicEvent {type Topic = MacroMentionsTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable event for [`MacroMentionsTopic`], keyed by the mentioneddiff --git a/crates/documents/src/domain/events.rs b/crates/documents/src/domain/events.rsindex 45bb648e94..545d0dae4e 100644--- a/crates/documents/src/domain/events.rs+++ b/crates/documents/src/domain/events.rs@@ -134,9 +134,7 @@ pub enum DocumentTopicEvent {impl TopicEvent for DocumentTopicEvent {type Topic = MacroDocumentsTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable event for [`MacroDocumentsTopic`], keyed by document id.diff --git a/crates/email/src/domain/events.rs b/crates/email/src/domain/events.rsindex 34152bd954..6397d0209e 100644--- a/crates/email/src/domain/events.rs+++ b/crates/email/src/domain/events.rs@@ -436,9 +436,7 @@ pub enum EmailTopicEvent {impl TopicEvent for EmailTopicEvent {type Topic = MacroEmailTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable event for [`MacroEmailTopic`], keyed by link (inbox) id.diff --git a/crates/macro_event_broker/examples/example_event.rs b/crates/macro_event_broker/examples/example_event.rsindex 942be611c6..3f75f41038 100644--- a/crates/macro_event_broker/examples/example_event.rs+++ b/crates/macro_event_broker/examples/example_event.rs@@ -51,9 +51,7 @@ pub enum ExampleTopicEvent {impl TopicEvent for ExampleTopicEvent {type Topic = MacroExampleTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable event for [`MacroExampleTopic`].diff --git a/crates/macro_event_broker/src/domain/models.rs b/crates/macro_event_broker/src/domain/models.rsindex b84fcf0af1..a5e6141bd8 100644--- a/crates/macro_event_broker/src/domain/models.rs+++ b/crates/macro_event_broker/src/domain/models.rs@@ -18,7 +18,7 @@ pub trait TopicEvent: Serialize + DeserializeOwned + Send + Sync {type Topic: Topic;/// Version of this concrete event variant's payload schema.- fn schema_version(&self) -> u8;+ const SCHEMA_VERSION: u8;}/// Serializable event envelope published through the broker.@@ -50,7 +50,7 @@ impl<E: TopicEvent> Event<E> {/// Create a new event with an explicit event id.pub fn with_event_id(event_id: Uuid, event: E) -> Self {- let schema_version = event.schema_version();+ let schema_version = E::SCHEMA_VERSION;Self::with_event_id_and_schema_version(event_id, schema_version, event)}@@ -226,7 +226,7 @@ macro_rules! declare_topics {.ok_or($crate::EventBrokerError::MissingMessagePayload)?;let event = <$event as $crate::MacroEvent>::decode(key, payload)?;let envelope = <$event as $crate::MacroEvent>::event(&event);- let expected = $crate::TopicEvent::schema_version(&envelope.event);+ let expected = <<$event as $crate::MacroEvent>::EventPayload as $crate::TopicEvent>::SCHEMA_VERSION;let actual = envelope.schema_version;if actual != expected {return Err($crate::EventBrokerError::UnsupportedSchemaVersion {diff --git a/crates/macro_event_broker/src/domain/models/test.rs b/crates/macro_event_broker/src/domain/models/test.rsindex 197213f11d..b54198ec62 100644--- a/crates/macro_event_broker/src/domain/models/test.rs+++ b/crates/macro_event_broker/src/domain/models/test.rs@@ -22,9 +22,7 @@ pub enum ExampleTopicEvent {impl TopicEvent for ExampleTopicEvent {type Topic = MacroExampleTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}#[derive(Debug, Clone, PartialEq, Eq)]@@ -130,9 +128,7 @@ pub struct DocumentsTopicEvent;impl TopicEvent for DocumentsTopicEvent {type Topic = MacroDocumentsTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}pub struct DocumentsMacroEvent {diff --git a/crates/macro_event_broker/src/domain/service/test.rs b/crates/macro_event_broker/src/domain/service/test.rsindex 5938c0dc58..a1e2ccfd4c 100644--- a/crates/macro_event_broker/src/domain/service/test.rs+++ b/crates/macro_event_broker/src/domain/service/test.rs@@ -101,9 +101,7 @@ pub enum ExampleTopicEvent {impl TopicEvent for ExampleTopicEvent {type Topic = MacroExampleTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}pub struct ExampleMacroEvent {@@ -223,9 +221,7 @@ impl Serialize for UnserializableTopicEvent {impl TopicEvent for UnserializableTopicEvent {type Topic = MacroExampleTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}struct UnserializableMacroEvent {diff --git a/crates/projects/src/domain/events.rs b/crates/projects/src/domain/events.rsindex f274c75597..0a9a93b1bc 100644--- a/crates/projects/src/domain/events.rs+++ b/crates/projects/src/domain/events.rs@@ -135,9 +135,7 @@ pub enum ProjectTopicEvent {impl TopicEvent for ProjectTopicEvent {type Topic = MacroProjectsTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable event for [`MacroProjectsTopic`], keyed by the root project id.diff --git a/crates/soup_realtime/src/domain/models.rs b/crates/soup_realtime/src/domain/models.rsindex d060c319eb..3441ff8306 100644--- a/crates/soup_realtime/src/domain/models.rs+++ b/crates/soup_realtime/src/domain/models.rs@@ -34,9 +34,7 @@ pub enum SoupTopicEvent {impl TopicEvent for SoupTopicEvent {type Topic = MacroSoupRealtimeTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable realtime Soup event keyed by recipient user ID.diff --git a/crates/teams/src/domain/events.rs b/crates/teams/src/domain/events.rsindex b3b347fb8e..9343f09aed 100644--- a/crates/teams/src/domain/events.rs+++ b/crates/teams/src/domain/events.rs@@ -204,9 +204,7 @@ pub enum TeamTopicEvent {impl TopicEvent for TeamTopicEvent {type Topic = MacroTeamsTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable event for [`MacroTeamsTopic`], keyed by the team's bare UUID.diff --git a/crates/webhook/src/domain/events.rs b/crates/webhook/src/domain/events.rsindex 3bff1c8422..dff86c2f78 100644--- a/crates/webhook/src/domain/events.rs+++ b/crates/webhook/src/domain/events.rs@@ -116,9 +116,7 @@ pub enum WebhookTopicEvent {impl TopicEvent for WebhookTopicEvent {type Topic = MacroWebhooksTopic;- fn schema_version(&self) -> u8 {- 1- }+ const SCHEMA_VERSION: u8 = 1;}/// Publishable lifecycle event for [`MacroWebhooksTopic`], keyed by webhook id.