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(calendar): include the organizer as an accepted guest (#5891)

teo5fb2b097f86c
diff --git a/crates/calendar_events/src/domain/models.rs b/crates/calendar_events/src/domain/models.rs
index da5861f7da..0acf7f10f6 100644
--- a/crates/calendar_events/src/domain/models.rs
+++ b/crates/calendar_events/src/domain/models.rs
@@ -805,6 +805,8 @@ pub struct CalendarAttendeeInput {
pub email: String,
/// Whether attendance is optional.
pub is_optional: bool,
+ /// RSVP to write for this attendee. `None` leaves the provider default.
+ pub response_status: Option<AttendeeResponseStatus>,
}
/// User-supplied fields for a new provider event.
diff --git a/crates/calendar_events/src/domain/mutations.rs b/crates/calendar_events/src/domain/mutations.rs
index 8ed6b9aad7..5f232c9b93 100644
--- a/crates/calendar_events/src/domain/mutations.rs
+++ b/crates/calendar_events/src/domain/mutations.rs
@@ -11,10 +11,10 @@ use uuid::Uuid;
use super::{
models::{
- AttendeeResponseStatus, CalendarEvent, CalendarEventDraft, CalendarEventMutationTarget,
- CalendarEventPatch, CalendarEventUpsert, DisconnectedGoogleCalendar, EventReminders,
- EventTime, OccurrenceRange, REMINDER_METHOD_EMAIL, REMINDER_METHOD_POPUP,
- REMINDER_MINUTES_MAX, REMINDER_OVERRIDES_MAX,
+ AttendeeResponseStatus, CalendarAttendeeInput, CalendarEvent, CalendarEventDraft,
+ CalendarEventMutationTarget, CalendarEventPatch, CalendarEventUpsert,
+ DisconnectedGoogleCalendar, EventReminders, EventTime, OccurrenceRange,
+ REMINDER_METHOD_EMAIL, REMINDER_METHOD_POPUP, REMINDER_MINUTES_MAX, REMINDER_OVERRIDES_MAX,
},
ports::{
CalendarAccessTokenProvider, CalendarDeletionScope, CalendarEventChange,
@@ -161,7 +161,7 @@ where
requester_id: &str,
email_link_id: Option<Uuid>,
calendar_id: Option<Uuid>,
- draft: CalendarEventDraft,
+ mut draft: CalendarEventDraft,
) -> Result<CalendarEvent, CalendarMutationError> {
validate_time(&draft.time)?;
validate_attendee_emails(draft.attendees.iter().map(|attendee| &attendee.email))?;
@@ -177,6 +177,7 @@ where
if target.is_read_only {
return Err(CalendarMutationError::ReadOnly);
}
+ ensure_organizer_attendee(&mut draft.attendees, &target.token_identity.email_address);
let access_token = self.fetch_token(&target.token_identity).await?;
let upsert = self
.provider
@@ -542,6 +543,32 @@ fn validate_reminders(reminders: &EventReminders) -> Result<(), CalendarMutation
Ok(())
}
+fn ensure_organizer_attendee(attendees: &mut Vec<CalendarAttendeeInput>, organizer_email: &str) {
+ let mut kept = false;
+ attendees.retain_mut(|attendee| {
+ if !attendee.email.eq_ignore_ascii_case(organizer_email) {
+ return true;
+ }
+ if kept {
+ return false;
+ }
+ attendee.response_status = Some(AttendeeResponseStatus::Accepted);
+ kept = true;
+ true
+ });
+ if kept {
+ return;
+ }
+ attendees.insert(
+ 0,
+ CalendarAttendeeInput {
+ email: organizer_email.to_string(),
+ is_optional: false,
+ response_status: Some(AttendeeResponseStatus::Accepted),
+ },
+ );
+}
+
fn validate_attendee_emails<'a>(
emails: impl Iterator<Item = &'a String>,
) -> Result<(), CalendarMutationError> {
diff --git a/crates/calendar_events/src/domain/mutations/test.rs b/crates/calendar_events/src/domain/mutations/test.rs
index 22243c6d41..13fddf5e5a 100644
--- a/crates/calendar_events/src/domain/mutations/test.rs
+++ b/crates/calendar_events/src/domain/mutations/test.rs
@@ -105,6 +105,7 @@ fn draft() -> CalendarEventDraft {
attendees: vec![CalendarAttendeeInput {
email: "[email protected]".to_string(),
is_optional: false,
+ response_status: None,
}],
recurrence_lines: Vec::new(),
visibility: None,
@@ -319,6 +320,7 @@ enum FakeProviderBehavior {
struct FakeProvider {
behavior: FakeProviderBehavior,
calls: Arc<Mutex<Vec<String>>>,
+ created_drafts: Arc<Mutex<Vec<CalendarEventDraft>>>,
}
impl FakeProvider {
@@ -326,6 +328,7 @@ impl FakeProvider {
Self {
behavior,
calls: Arc::new(Mutex::new(Vec::new())),
+ created_drafts: Arc::new(Mutex::new(Vec::new())),
}
}
@@ -344,9 +347,10 @@ impl GoogleCalendarMutationProvider for FakeProvider {
&self,
_access_token: &str,
target: &GoogleCalendarTarget,
- _draft: &CalendarEventDraft,
+ draft: &CalendarEventDraft,
) -> Result<CalendarEventUpsert, GoogleProviderError> {
self.calls.lock().unwrap().push("create".to_string());
+ self.created_drafts.lock().unwrap().push(draft.clone());
if let Some(error) = self.fail() {
return Err(error);
}
@@ -852,6 +856,127 @@ async fn a_rejected_mutation_publishes_nothing() {
);
}
+#[tokio::test]
+async fn create_includes_the_calendar_inbox_as_an_accepted_guest() {
+ let provider = FakeProvider::new(FakeProviderBehavior::Echo);
+ let drafts = provider.created_drafts.clone();
+ service(
+ FakeRepo {
+ creation_target: Some(creation_target(false)),
+ persisted_event_id: Some(Uuid::now_v7()),
+ ..FakeRepo::default()
+ },
+ provider,
+ FakeTokens::ok(),
+ )
+ .create_event("macro|user", None, None, draft())
+ .await
+ .unwrap();
+
+ let sent = drafts.lock().unwrap();
+ assert_eq!(sent.len(), 1);
+ let organizer = sent[0]
+ .attendees
+ .iter()
+ .find(|attendee| attendee.email.eq_ignore_ascii_case("[email protected]"))
+ .expect("the creation-target inbox must be on the guest list");
+ assert_eq!(
+ organizer.response_status,
+ Some(AttendeeResponseStatus::Accepted)
+ );
+ assert!(!organizer.is_optional);
+ assert!(
+ sent[0]
+ .attendees
+ .iter()
+ .any(|attendee| attendee.email == "[email protected]"),
+ "invited guests must still be sent"
+ );
+}
+
+#[tokio::test]
+async fn create_does_not_duplicate_an_organizer_already_on_the_guest_list() {
+ let provider = FakeProvider::new(FakeProviderBehavior::Echo);
+ let drafts = provider.created_drafts.clone();
+ let mut already_listed = draft();
+ already_listed.attendees.push(CalendarAttendeeInput {
+ email: "[email protected]".to_string(),
+ is_optional: true,
+ response_status: None,
+ });
+ service(
+ FakeRepo {
+ creation_target: Some(creation_target(false)),
+ persisted_event_id: Some(Uuid::now_v7()),
+ ..FakeRepo::default()
+ },
+ provider,
+ FakeTokens::ok(),
+ )
+ .create_event("macro|user", None, None, already_listed)
+ .await
+ .unwrap();
+
+ let sent = drafts.lock().unwrap();
+ let organizers: Vec<_> = sent[0]
+ .attendees
+ .iter()
+ .filter(|attendee| attendee.email.eq_ignore_ascii_case("[email protected]"))
+ .collect();
+ assert_eq!(organizers.len(), 1);
+ assert_eq!(
+ organizers[0].response_status,
+ Some(AttendeeResponseStatus::Accepted)
+ );
+}
+
+#[tokio::test]
+async fn create_collapses_duplicate_organizer_rows() {
+ let provider = FakeProvider::new(FakeProviderBehavior::Echo);
+ let drafts = provider.created_drafts.clone();
+ let mut listed = draft();
+ listed.attendees.push(CalendarAttendeeInput {
+ email: "[email protected]".to_string(),
+ is_optional: true,
+ response_status: None,
+ });
+ listed.attendees.push(CalendarAttendeeInput {
+ email: "[email protected]".to_string(),
+ is_optional: false,
+ response_status: Some(AttendeeResponseStatus::NeedsAction),
+ });
+ service(
+ FakeRepo {
+ creation_target: Some(creation_target(false)),
+ persisted_event_id: Some(Uuid::now_v7()),
+ ..FakeRepo::default()
+ },
+ provider,
+ FakeTokens::ok(),
+ )
+ .create_event("macro|user", None, None, listed)
+ .await
+ .unwrap();
+
+ let sent = drafts.lock().unwrap();
+ let organizers: Vec<_> = sent[0]
+ .attendees
+ .iter()
+ .filter(|attendee| attendee.email.eq_ignore_ascii_case("[email protected]"))
+ .collect();
+ assert_eq!(organizers.len(), 1);
+ assert_eq!(
+ organizers[0].response_status,
+ Some(AttendeeResponseStatus::Accepted)
+ );
+ assert!(
+ sent[0]
+ .attendees
+ .iter()
+ .any(|attendee| attendee.email == "[email protected]")
+ );
+}
+
#[tokio::test]
async fn create_rejects_invalid_input_before_reaching_the_provider() {
let provider = FakeProvider::new(FakeProviderBehavior::Echo);
diff --git a/crates/calendar_events/src/inbound/mutation_router.rs b/crates/calendar_events/src/inbound/mutation_router.rs
index 9f3efb7e06..3437aad514 100644
--- a/crates/calendar_events/src/inbound/mutation_router.rs
+++ b/crates/calendar_events/src/inbound/mutation_router.rs
@@ -105,6 +105,7 @@ impl From<CalendarAttendeeInputBody> for CalendarAttendeeInput {
Self {
email: body.email,
is_optional: body.is_optional,
+ response_status: None,
}
}
}
diff --git a/crates/calendar_events/src/inbound/toolset.rs b/crates/calendar_events/src/inbound/toolset.rs
index 6538960960..7c0a71fd2c 100644
--- a/crates/calendar_events/src/inbound/toolset.rs
+++ b/crates/calendar_events/src/inbound/toolset.rs
@@ -185,6 +185,7 @@ impl From<AttendeeInput> for CalendarAttendeeInput {
Self {
email: input.email,
is_optional: input.is_optional,
+ response_status: None,
}
}
}
diff --git a/crates/calendar_events/src/outbound/email_service_mutations/test.rs b/crates/calendar_events/src/outbound/email_service_mutations/test.rs
index 749e23591a..665a44f05e 100644
--- a/crates/calendar_events/src/outbound/email_service_mutations/test.rs
+++ b/crates/calendar_events/src/outbound/email_service_mutations/test.rs
@@ -26,6 +26,7 @@ fn sample_draft() -> CalendarEventDraft {
attendees: vec![CalendarAttendeeInput {
email: "[email protected]".to_string(),
is_optional: true,
+ response_status: None,
}],
recurrence_lines: vec!["RRULE:FREQ=WEEKLY".to_string()],
visibility: None,
@@ -64,6 +65,7 @@ fn update_body_matches_the_router_request() {
attendees: Some(vec![CalendarAttendeeInput {
email: "[email protected]".to_string(),
is_optional: false,
+ response_status: None,
}]),
conference: Some(crate::domain::models::ConferenceChange::Removed),
..Default::default()
diff --git a/crates/calendar_events/src/outbound/google.rs b/crates/calendar_events/src/outbound/google.rs
index 0eaf73e71c..84eac34cdc 100644
--- a/crates/calendar_events/src/outbound/google.rs
+++ b/crates/calendar_events/src/outbound/google.rs
@@ -1471,10 +1471,15 @@ fn google_attendees_body(attendees: &[CalendarAttendeeInput]) -> serde_json::Val
attendees
.iter()
.map(|attendee| {
- serde_json::json!({
+ let mut entry = serde_json::json!({
"email": attendee.email,
"optional": attendee.is_optional,
- })
+ });
+ if let Some(status) = attendee.response_status {
+ entry["responseStatus"] =
+ serde_json::Value::String(google_response_status(status).to_string());
+ }
+ entry
})
.collect()
}
diff --git a/crates/calendar_events/src/outbound/google/test.rs b/crates/calendar_events/src/outbound/google/test.rs
index d0946ebc3d..11247d04a2 100644
--- a/crates/calendar_events/src/outbound/google/test.rs
+++ b/crates/calendar_events/src/outbound/google/test.rs
@@ -559,6 +559,32 @@ fn rsvp_patch_updates_only_the_connected_attendee() {
assert_eq!(attendees[0]["comment"], "unrelated state that must survive");
}
+#[test]
+fn google_attendees_write_an_explicit_response_status() {
+ let body = google_attendees_body(&[
+ CalendarAttendeeInput {
+ email: "[email protected]".to_string(),
+ is_optional: false,
+ response_status: Some(AttendeeResponseStatus::Accepted),
+ },
+ CalendarAttendeeInput {
+ email: "[email protected]".to_string(),
+ is_optional: true,
+ response_status: None,
+ },
+ ]);
+
+ assert_eq!(body[0]["email"], "[email protected]");
+ assert_eq!(body[0]["responseStatus"], "accepted");
+ assert_eq!(body[0]["optional"], false);
+ assert_eq!(body[1]["email"], "[email protected]");
+ assert_eq!(body[1]["optional"], true);
+ assert!(
+ body[1].get("responseStatus").is_none(),
+ "a guest without a status must keep Google's default"
+ );
+}
+
#[test]
fn reminders_round_trip_between_google_and_the_domain() {
let master: GoogleEvent = serde_json::from_value(serde_json::json!({