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): finish Gmail draft moves while Outlook writes are off (#8462)

teo3296ed8d4e4a
diff --git a/.sqlx/query-f5cb1e774ef1e84193928d9f704a3a5397934cdb3cb04092a4a6fded05970b9b.json b/.sqlx/query-f5cb1e774ef1e84193928d9f704a3a5397934cdb3cb04092a4a6fded05970b9b.json
new file mode 100644
index 0000000000..064b719e00
--- /dev/null
+++ b/.sqlx/query-f5cb1e774ef1e84193928d9f704a3a5397934cdb3cb04092a4a6fded05970b9b.json
@@ -0,0 +1,15 @@
+{
+ "db_name": "PostgreSQL",
+ "query": "UPDATE email_draft_transfers SET lease_id=NULL,lease_until=NULL,available_at=now()+interval '30 seconds' WHERE id=$1 AND lease_id=$2 AND lease_until>now() AND state='cleanup'",
+ "describe": {
+ "columns": [],
+ "parameters": {
+ "Left": [
+ "Uuid",
+ "Uuid"
+ ]
+ },
+ "nullable": []
+ },
+ "hash": "f5cb1e774ef1e84193928d9f704a3a5397934cdb3cb04092a4a6fded05970b9b"
+}
diff --git a/crates/email/src/domain/draft_transfer.rs b/crates/email/src/domain/draft_transfer.rs
index edbf496fb3..74a745b95b 100644
--- a/crates/email/src/domain/draft_transfer.rs
+++ b/crates/email/src/domain/draft_transfer.rs
@@ -299,6 +299,7 @@ pub trait DraftRetirementGateway: Send + Sync + 'static {
pub struct DraftRetirementService<R, G> {
pub repository: R,
pub gateway: G,
+ pub writes_enabled: bool,
}
impl<R: DraftTransferRepository, G: DraftRetirementGateway> DraftRetirementService<R, G> {
pub async fn execute_once(&self) -> Result<bool, MailboxError> {
@@ -320,6 +321,9 @@ impl<R: DraftTransferRepository, G: DraftRetirementGateway> DraftRetirementServi
if plan.source_provider == UserProvider::Gmail {
return Ok(RetirementOutcome::OriginalRemains);
}
+ if !self.writes_enabled {
+ return Ok(RetirementOutcome::Retry);
+ }
let Some(facts) = self.gateway.inspect(&plan).await? else {
return Ok(RetirementOutcome::Removed);
};
diff --git a/crates/email/src/outbound/email_pg_repo/draft_transfer.rs b/crates/email/src/outbound/email_pg_repo/draft_transfer.rs
index 037906e242..ac091409fb 100644
--- a/crates/email/src/outbound/email_pg_repo/draft_transfer.rs
+++ b/crates/email/src/outbound/email_pg_repo/draft_transfer.rs
@@ -488,7 +488,13 @@ impl DraftTransferRepository for EmailPgRepo {
RetirementOutcome::OriginalRemains => ("conflict", Some("move_original_remains")),
RetirementOutcome::Sent => ("conflict", Some("move_source_sent")),
RetirementOutcome::Reauthorization => ("conflict", Some("move_reauthorization")),
- RetirementOutcome::Retry => ("cleanup", None),
+ RetirementOutcome::Retry => {
+ let changed=sqlx::query!("UPDATE email_draft_transfers SET lease_id=NULL,lease_until=NULL,available_at=now()+interval '30 seconds' WHERE id=$1 AND lease_id=$2 AND lease_until>now() AND state='cleanup'",plan.request.id,lease).execute(&self.pool).await.map_err(|_|MailboxError::Persistence)?.rows_affected();
+ if changed != 1 {
+ return Err(MailboxError::Stale);
+ }
+ return Ok(());
+ }
};
let mut tx = self
.pool
diff --git a/crates/email/src/outbound/email_pg_repo/draft_transfer/test.rs b/crates/email/src/outbound/email_pg_repo/draft_transfer/test.rs
index d52d5caee3..b5b9da4722 100644
--- a/crates/email/src/outbound/email_pg_repo/draft_transfer/test.rs
+++ b/crates/email/src/outbound/email_pg_repo/draft_transfer/test.rs
@@ -1,5 +1,6 @@
use super::*;
use crate::domain::{models::mailbox_operation::*, ports::EmailRepo};
+use email_api_client::domain::models::EmailApiError;
use macro_db_migrator::MACRO_DB_MIGRATIONS;
use macro_user_id::user_id::MacroUserIdStr;
use sqlx::PgPool;
@@ -232,6 +233,114 @@ async fn disconnect_keeps_destination_blocked_until_explicit_duplicate_acknowled
.unwrap();
}
+#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
+async fn paused_outlook_writes_still_finish_gmail_moves_and_keep_outlook_originals_resolvable(
+ db: PgPool,
+) {
+ struct PausedOutlook;
+ impl DraftRetirementGateway for PausedOutlook {
+ async fn inspect(
+ &self,
+ _: &DraftTransferPlan,
+ ) -> Result<Option<RetiredDraftFacts>, EmailApiError> {
+ panic!("Outlook must not be read while writes are paused")
+ }
+ async fn retire(&self, _: &DraftTransferPlan, _: &str) -> Result<(), EmailApiError> {
+ panic!("Outlook must not be written while writes are paused")
+ }
+ }
+ let gmail_source = Uuid::now_v7();
+ let gmail_target = Uuid::now_v7();
+ let outlook = Uuid::now_v7();
+ for (id, address, provider) in [
+ (gmail_source, "[email protected]", "GMAIL"),
+ (gmail_target, "[email protected]", "GMAIL"),
+ (outlook, "[email protected]", "OUTLOOK"),
+ ] {
+ sqlx::query!("INSERT INTO email_links(id,macro_id,fusionauth_user_id,email_address,provider,is_sync_active) VALUES($1,$2,'transfer-owner',$3,$4::text::email_user_provider_enum,true)",id,ACTOR,address,provider).execute(&db).await.unwrap();
+ }
+ let gmail_thread = Uuid::now_v7();
+ let outlook_thread = Uuid::now_v7();
+ for (thread, link) in [(gmail_thread, gmail_source), (outlook_thread, outlook)] {
+ sqlx::query!(
+ "INSERT INTO email_threads(id,link_id) VALUES($1,$2)",
+ thread,
+ link
+ )
+ .execute(&db)
+ .await
+ .unwrap();
+ }
+ let gmail_draft = Uuid::now_v7();
+ let outlook_draft = Uuid::now_v7();
+ sqlx::query!("INSERT INTO email_messages(id,thread_id,link_id,is_draft,subject,body_html_sanitized) VALUES($1,$2,$3,true,'Gmail draft','<p>Body</p>')",gmail_draft,gmail_thread,gmail_source).execute(&db).await.unwrap();
+ sqlx::query!("INSERT INTO email_messages(id,thread_id,link_id,is_draft,subject,body_html_sanitized,provider_id,provider_version) VALUES($1,$2,$3,true,'Outlook draft','<p>Body</p>','outlook-original','v1')",outlook_draft,outlook_thread,outlook).execute(&db).await.unwrap();
+ let repo = EmailPgRepo::new(db.clone());
+ let gmail_move = prepare(
+ &repo,
+ &DraftTransferRequest {
+ id: Uuid::now_v7(),
+ source_id: gmail_draft,
+ source_link_id: gmail_source,
+ destination_link_id: gmail_target,
+ },
+ )
+ .await;
+ repo.commit_transfer(&gmail_move, &contacts(), vec![])
+ .await
+ .unwrap();
+ let outlook_move = prepare(
+ &repo,
+ &DraftTransferRequest {
+ id: Uuid::now_v7(),
+ source_id: outlook_draft,
+ source_link_id: outlook,
+ destination_link_id: gmail_target,
+ },
+ )
+ .await;
+ let outlook_copy = repo
+ .commit_transfer(&outlook_move, &contacts(), vec![])
+ .await
+ .unwrap()
+ .message_id;
+ let reviewed = draft::operation_facts(&db, &[outlook_copy])
+ .await
+ .unwrap()
+ .remove(&outlook_copy)
+ .unwrap();
+ let worker = DraftRetirementService {
+ repository: EmailPgRepo::new(db.clone()),
+ gateway: PausedOutlook,
+ writes_enabled: false,
+ };
+ assert!(worker.execute_once().await.unwrap());
+ assert!(worker.execute_once().await.unwrap());
+ let mut send = gmail_move.input.clone();
+ send.send_time = Some(Utc::now());
+ assert!(
+ repo.insert_message(&send, &contacts(), gmail_target, None, false)
+ .await
+ .unwrap()
+ .is_some()
+ );
+ let keep_original = MessageResolutionRequest {
+ message_id: outlook_copy,
+ revision: reviewed.revision,
+ remote_version: reviewed.remote_version.clone(),
+ action: MessageResolutionAction::KeepOriginal,
+ accept_duplicate_risk: true,
+ };
+ let decision = plan_resolution(reviewed, keep_original).unwrap();
+ super::super::draft_resolution::commit(
+ &db,
+ &MacroUserIdStr::parse_from_str(ACTOR).unwrap(),
+ decision,
+ )
+ .await
+ .unwrap();
+}
+
#[sqlx::test(migrator = "MACRO_DB_MIGRATIONS")]
async fn native_attachment_bytes_are_referenced_before_source_retirement(db: PgPool) {
let (repo, request) = fixture(&db).await;
diff --git a/services/email_service/AGENTS.md b/services/email_service/AGENTS.md
index 917b0120d4..37d4be3554 100644
--- a/services/email_service/AGENTS.md
+++ b/services/email_service/AGENTS.md
@@ -56,6 +56,8 @@ the gateway `/email` prefix.
attachment bytes through the provider-aware reader.
- Preserve the calendar domain's `team_ooo_changed` hint when forwarding a
calendar refresh so unrelated invitation updates retain teammates' OOO rows.
+- Spawn `run_transfers` regardless of the Outlook flags. Gmail inbox moves
+ finish there; with writes off it pauses only the Outlook retire step.
## Related
diff --git a/services/email_service/src/bin/pubsub_workers/pubsub_workers.rs b/services/email_service/src/bin/pubsub_workers/pubsub_workers.rs
index 0da82bfaa3..10558ff6a2 100644
--- a/services/email_service/src/bin/pubsub_workers/pubsub_workers.rs
+++ b/services/email_service/src/bin/pubsub_workers/pubsub_workers.rs
@@ -478,17 +478,16 @@ async fn main() -> anyhow::Result<()> {
),
},
);
- if config.outlook_writes_enabled {
- worker_tracker.spawn(email_service::mailbox_sync_worker::run_transfers(
- email::domain::draft_transfer::DraftRetirementService {
- repository: email::outbound::EmailPgRepo::new(db.clone()),
- gateway: email_service::outbound::email_api::ProviderMailboxGateway(
- outlook_api.clone(),
- ),
- },
- worker_cancellation_token.clone(),
- ));
- }
+ worker_tracker.spawn(email_service::mailbox_sync_worker::run_transfers(
+ email::domain::draft_transfer::DraftRetirementService {
+ repository: email::outbound::EmailPgRepo::new(db.clone()),
+ gateway: email_service::outbound::email_api::ProviderMailboxGateway(
+ outlook_api.clone(),
+ ),
+ writes_enabled: config.outlook_writes_enabled,
+ },
+ worker_cancellation_token.clone(),
+ ));
worker_tracker.spawn(email_service::mailbox_sync_worker::run_drafts(
email::domain::mailbox::drafts::MailboxDraftService::new(
mailbox_repository.clone(),