Calendar - mail mapping.
This commit is contained in:
@@ -1965,12 +1965,35 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
|
||||
// Create base MailCopy from metadata only - NO MIME download
|
||||
var baseMailCopy = await CreateMinimalMailCopyAsync(message, assignedFolder, cancellationToken);
|
||||
|
||||
// Initial sync metadata flow does not include MIME, but calendar invitations need MIME
|
||||
// for date rendering and invitation-to-calendar mapping.
|
||||
if (mimeMessage == null && baseMailCopy?.ItemType == MailItemType.CalendarInvitation && !string.IsNullOrEmpty(message?.Id))
|
||||
{
|
||||
try
|
||||
{
|
||||
var rawRequest = _gmailService.Users.Messages.Get("me", message.Id);
|
||||
rawRequest.Format = UsersResource.MessagesResource.GetRequest.FormatEnum.Raw;
|
||||
|
||||
var rawMessage = await rawRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false);
|
||||
if (!string.IsNullOrEmpty(rawMessage?.Raw))
|
||||
{
|
||||
mimeMessage = rawMessage.GetGmailMimeMessage();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Warning(ex, "Failed to fetch raw MIME for calendar invitation {MessageId}", message.Id);
|
||||
}
|
||||
}
|
||||
|
||||
if (mimeMessage != null)
|
||||
{
|
||||
// Raw responses don't include metadata headers. Backfill important fields from MIME.
|
||||
EnrichMailCopyFromMime(baseMailCopy, mimeMessage);
|
||||
}
|
||||
|
||||
await TryMapCalendarInvitationAsync(baseMailCopy, mimeMessage, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
var extractedContacts = ExtractContactsFromGmailMessage(message, mimeMessage);
|
||||
|
||||
// Check for local draft mapping using X-Wino-Draft-Id header.
|
||||
@@ -2055,6 +2078,59 @@ public class GmailSynchronizer : WinoSynchronizer<IClientServiceRequest, Message
|
||||
return packageList;
|
||||
}
|
||||
|
||||
private async Task TryMapCalendarInvitationAsync(MailCopy baseMailCopy, MimeMessage mimeMessage, CancellationToken cancellationToken)
|
||||
{
|
||||
if (baseMailCopy == null || baseMailCopy.ItemType != MailItemType.CalendarInvitation || mimeMessage == null)
|
||||
return;
|
||||
|
||||
var invitationUid = mimeMessage.ExtractInvitationUid();
|
||||
if (string.IsNullOrWhiteSpace(invitationUid))
|
||||
return;
|
||||
|
||||
var calendars = await _gmailChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
|
||||
if (calendars == null || calendars.Count == 0)
|
||||
return;
|
||||
|
||||
foreach (var calendar in calendars)
|
||||
{
|
||||
try
|
||||
{
|
||||
var listRequest = _calendarService.Events.List(calendar.RemoteCalendarId);
|
||||
listRequest.ICalUID = invitationUid;
|
||||
listRequest.MaxResults = 1;
|
||||
listRequest.SingleEvents = false;
|
||||
|
||||
var listResponse = await listRequest.ExecuteAsync(cancellationToken).ConfigureAwait(false);
|
||||
var matchedEvent = listResponse?.Items?.FirstOrDefault();
|
||||
if (matchedEvent == null || string.IsNullOrWhiteSpace(matchedEvent.Id))
|
||||
continue;
|
||||
|
||||
await _gmailChangeProcessor.ManageCalendarEventAsync(matchedEvent, calendar, Account).ConfigureAwait(false);
|
||||
|
||||
var localCalendarItem = await _gmailChangeProcessor.GetCalendarItemAsync(calendar.Id, matchedEvent.Id).ConfigureAwait(false);
|
||||
if (localCalendarItem == null)
|
||||
return;
|
||||
|
||||
await _gmailChangeProcessor.UpsertMailInvitationCalendarMappingAsync(new MailInvitationCalendarMapping()
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
AccountId = Account.Id,
|
||||
MailCopyId = baseMailCopy.Id,
|
||||
InvitationUid = invitationUid,
|
||||
CalendarId = calendar.Id,
|
||||
CalendarItemId = localCalendarItem.Id,
|
||||
CalendarRemoteEventId = matchedEvent.Id
|
||||
}).ConfigureAwait(false);
|
||||
|
||||
return;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Warning(ex, "Failed to map Gmail calendar invitation mail {MailCopyId} for calendar {CalendarId}", baseMailCopy.Id, calendar.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Calendar Operations
|
||||
|
||||
@@ -380,8 +380,9 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
|
||||
|
||||
if (!mailExists)
|
||||
{
|
||||
// For drafts, download MIME during initial sync like delta sync.
|
||||
if (folder.SpecialFolderType == SpecialFolderType.Draft)
|
||||
// For drafts and calendar invitations, download MIME during initial sync like delta sync.
|
||||
var itemType = Account.IsCalendarAccessGranted ? message.GetMailItemType() : MailItemType.Mail;
|
||||
if (folder.SpecialFolderType == SpecialFolderType.Draft || itemType == MailItemType.CalendarInvitation)
|
||||
{
|
||||
var draftPackages = await CreateNewMailPackagesAsync(message, folder, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
@@ -1874,6 +1875,8 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
|
||||
// If draft mapping was successful, mailCopy will be null
|
||||
if (mailCopy == null) return null;
|
||||
|
||||
await TryMapCalendarInvitationAsync(mailCopy, mimeMessage, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
// Outlook messages can only be assigned to 1 folder at a time.
|
||||
// Therefore we don't need to create multiple copies of the same message for different folders.
|
||||
var contacts = ExtractContactsFromOutlookMessage(message);
|
||||
@@ -1882,6 +1885,74 @@ public class OutlookSynchronizer : WinoSynchronizer<RequestInformation, Message,
|
||||
return [package];
|
||||
}
|
||||
|
||||
private async Task TryMapCalendarInvitationAsync(MailCopy mailCopy, MimeMessage mimeMessage, CancellationToken cancellationToken)
|
||||
{
|
||||
if (mailCopy.ItemType != MailItemType.CalendarInvitation || mimeMessage == null)
|
||||
return;
|
||||
|
||||
var invitationUid = mimeMessage.ExtractInvitationUid();
|
||||
if (string.IsNullOrWhiteSpace(invitationUid))
|
||||
return;
|
||||
|
||||
var calendars = await _outlookChangeProcessor.GetAccountCalendarsAsync(Account.Id).ConfigureAwait(false);
|
||||
if (calendars == null || calendars.Count == 0)
|
||||
return;
|
||||
|
||||
string escapedUid = invitationUid.Replace("'", "''", StringComparison.Ordinal);
|
||||
|
||||
foreach (var calendar in calendars)
|
||||
{
|
||||
try
|
||||
{
|
||||
var eventsResponse = await _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events
|
||||
.GetAsync(requestConfiguration =>
|
||||
{
|
||||
requestConfiguration.QueryParameters.Filter = $"iCalUId eq '{escapedUid}'";
|
||||
requestConfiguration.QueryParameters.Select = ["id"];
|
||||
requestConfiguration.QueryParameters.Top = 1;
|
||||
}, cancellationToken: cancellationToken)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
var matchedEvent = eventsResponse?.Value?.FirstOrDefault();
|
||||
if (matchedEvent == null || string.IsNullOrWhiteSpace(matchedEvent.Id))
|
||||
continue;
|
||||
|
||||
var fullEvent = await _graphClient.Me.Calendars[calendar.RemoteCalendarId].Events[matchedEvent.Id]
|
||||
.GetAsync(requestConfiguration =>
|
||||
{
|
||||
requestConfiguration.QueryParameters.Expand = ["attachments($select=id,name,contentType,size,isInline)"];
|
||||
}, cancellationToken: cancellationToken)
|
||||
.ConfigureAwait(false);
|
||||
|
||||
if (fullEvent == null)
|
||||
continue;
|
||||
|
||||
await _outlookChangeProcessor.ManageCalendarEventAsync(fullEvent, calendar, Account).ConfigureAwait(false);
|
||||
|
||||
var localCalendarItem = await _outlookChangeProcessor.GetCalendarItemAsync(calendar.Id, fullEvent.Id).ConfigureAwait(false);
|
||||
if (localCalendarItem == null)
|
||||
return;
|
||||
|
||||
await _outlookChangeProcessor.UpsertMailInvitationCalendarMappingAsync(new MailInvitationCalendarMapping()
|
||||
{
|
||||
Id = Guid.NewGuid(),
|
||||
AccountId = Account.Id,
|
||||
MailCopyId = mailCopy.Id,
|
||||
InvitationUid = invitationUid,
|
||||
CalendarId = calendar.Id,
|
||||
CalendarItemId = localCalendarItem.Id,
|
||||
CalendarRemoteEventId = fullEvent.Id
|
||||
}).ConfigureAwait(false);
|
||||
|
||||
return;
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
_logger.Warning(ex, "Failed to map Outlook calendar invitation mail {MailCopyId} for calendar {CalendarId}", mailCopy.Id, calendar.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override async Task<CalendarSynchronizationResult> SynchronizeCalendarEventsInternalAsync(CalendarSynchronizationOptions options, CancellationToken cancellationToken = default)
|
||||
{
|
||||
_logger.Information("Internal calendar synchronization started for {Name}", Account.Name);
|
||||
|
||||
Reference in New Issue
Block a user