Rewrite sync engine for robustness and duplicate prevention
Three-phase sync approach: 1. Process existing mappings (detect changes on both sides, handle conflicts with configurable winner) 2. Sync unmapped Outlook contacts to Starface with duplicate check (match by email, name+company, name, phone) 3. Sync unmapped Starface contacts to Outlook with duplicate check Key improvements: - Duplicate detection before creating: checks email, name+company, name, and phone number with normalization - Matched duplicates get linked instead of re-created - Conflict resolution when both sides changed - Dead mappings (both sides deleted) get cleaned up - Each contact logged individually with direction indicator - Address book switch works: old mappings get cleaned, contacts re-matched against new book Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
f0bcfdfd30
commit
39b30f9a80
|
|
@ -15,9 +15,15 @@ namespace StarfaceOutlookSync.Services
|
|||
|
||||
private void Log(string message) => OnProgress?.Invoke(message);
|
||||
|
||||
/// <summary>
|
||||
/// Findet einen passenden Kontakt in der Kandidatenliste.
|
||||
/// Matching-Reihenfolge: E-Mail, dann Vorname+Nachname+Firma, dann Vorname+Nachname.
|
||||
/// </summary>
|
||||
private static UnifiedContact FindMatch(UnifiedContact contact, List<UnifiedContact> candidates)
|
||||
{
|
||||
// Erst E-Mail-Match
|
||||
if (candidates == null || candidates.Count == 0) return null;
|
||||
|
||||
// 1. Exakte E-Mail
|
||||
if (!string.IsNullOrEmpty(contact.Email))
|
||||
{
|
||||
var byEmail = candidates.FirstOrDefault(c =>
|
||||
|
|
@ -26,7 +32,18 @@ namespace StarfaceOutlookSync.Services
|
|||
if (byEmail != null) return byEmail;
|
||||
}
|
||||
|
||||
// Dann Name-Match
|
||||
// 2. Vorname + Nachname + Firma (staerkstes Match ohne E-Mail)
|
||||
if ((!string.IsNullOrEmpty(contact.FirstName) || !string.IsNullOrEmpty(contact.LastName))
|
||||
&& !string.IsNullOrEmpty(contact.Company))
|
||||
{
|
||||
var byNameCompany = candidates.FirstOrDefault(c =>
|
||||
c.FirstName.Equals(contact.FirstName, StringComparison.OrdinalIgnoreCase) &&
|
||||
c.LastName.Equals(contact.LastName, StringComparison.OrdinalIgnoreCase) &&
|
||||
c.Company.Equals(contact.Company, StringComparison.OrdinalIgnoreCase));
|
||||
if (byNameCompany != null) return byNameCompany;
|
||||
}
|
||||
|
||||
// 3. Vorname + Nachname (ohne Firma)
|
||||
if (!string.IsNullOrEmpty(contact.FirstName) || !string.IsNullOrEmpty(contact.LastName))
|
||||
{
|
||||
var byName = candidates.FirstOrDefault(c =>
|
||||
|
|
@ -36,9 +53,32 @@ namespace StarfaceOutlookSync.Services
|
|||
if (byName != null) return byName;
|
||||
}
|
||||
|
||||
// 4. Telefonnummer (Buero oder Mobil)
|
||||
if (!string.IsNullOrEmpty(contact.PhoneWork))
|
||||
{
|
||||
var byPhone = candidates.FirstOrDefault(c =>
|
||||
!string.IsNullOrEmpty(c.PhoneWork) &&
|
||||
NormalizePhone(c.PhoneWork) == NormalizePhone(contact.PhoneWork));
|
||||
if (byPhone != null) return byPhone;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(contact.PhoneMobile))
|
||||
{
|
||||
var byMobile = candidates.FirstOrDefault(c =>
|
||||
!string.IsNullOrEmpty(c.PhoneMobile) &&
|
||||
NormalizePhone(c.PhoneMobile) == NormalizePhone(contact.PhoneMobile));
|
||||
if (byMobile != null) return byMobile;
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private static string NormalizePhone(string phone)
|
||||
{
|
||||
if (string.IsNullOrEmpty(phone)) return "";
|
||||
// Nur Ziffern und + behalten
|
||||
return new string(phone.Where(c => char.IsDigit(c) || c == '+').ToArray());
|
||||
}
|
||||
|
||||
public async Task<SyncResult> SyncProfileAsync(SyncProfile profile)
|
||||
{
|
||||
var result = new SyncResult
|
||||
|
|
@ -49,7 +89,6 @@ namespace StarfaceOutlookSync.Services
|
|||
|
||||
try
|
||||
{
|
||||
// Starface verbinden
|
||||
Log("Verbinde mit Starface...");
|
||||
using (var starface = new StarfaceApiClient(profile.StarfaceConnection))
|
||||
{
|
||||
|
|
@ -62,10 +101,6 @@ namespace StarfaceOutlookSync.Services
|
|||
return result;
|
||||
}
|
||||
|
||||
var mappings = _profileManager.GetMappings(profile.Id);
|
||||
var mappingByOutlook = mappings.ToDictionary(m => m.OutlookEntryId, m => m);
|
||||
var mappingByStarface = mappings.ToDictionary(m => m.StarfaceId, m => m);
|
||||
|
||||
// Kontakte laden
|
||||
Log("Lade Outlook-Kontakte...");
|
||||
var outlookContacts = _outlookService.GetContacts(profile.OutlookFolderPath);
|
||||
|
|
@ -75,144 +110,240 @@ namespace StarfaceOutlookSync.Services
|
|||
var starfaceContacts = await starface.GetContactsAsync(profile.StarfaceAddressBook);
|
||||
Log($"{starfaceContacts.Count} Starface-Kontakte geladen");
|
||||
|
||||
// Outlook -> Starface
|
||||
if (profile.SyncDirection == SyncDirection.Both ||
|
||||
profile.SyncDirection == SyncDirection.OutlookToStarface)
|
||||
{
|
||||
Log("Synchronisiere Outlook -> Starface...");
|
||||
foreach (var oc in outlookContacts)
|
||||
{
|
||||
try
|
||||
{
|
||||
SyncMapping existing = null;
|
||||
if (!string.IsNullOrEmpty(oc.OutlookEntryId))
|
||||
mappingByOutlook.TryGetValue(oc.OutlookEntryId, out existing);
|
||||
// Bestehende Mappings laden
|
||||
var mappings = _profileManager.GetMappings(profile.Id);
|
||||
|
||||
if (existing != null)
|
||||
// Sets fuer schnellen Lookup
|
||||
var mappingByOutlook = new Dictionary<string, SyncMapping>();
|
||||
var mappingByStarface = new Dictionary<string, SyncMapping>();
|
||||
foreach (var m in mappings)
|
||||
{
|
||||
if (!string.IsNullOrEmpty(m.OutlookEntryId))
|
||||
mappingByOutlook[m.OutlookEntryId] = m;
|
||||
if (!string.IsNullOrEmpty(m.StarfaceId))
|
||||
mappingByStarface[m.StarfaceId] = m;
|
||||
}
|
||||
|
||||
// Tracking: welche Kontakte wurden bereits verarbeitet
|
||||
var processedStarfaceIds = new HashSet<string>();
|
||||
var processedOutlookIds = new HashSet<string>();
|
||||
var newMappings = new List<SyncMapping>();
|
||||
|
||||
// ============================================
|
||||
// Phase 1: Bestehende Mappings abgleichen
|
||||
// ============================================
|
||||
Log("Gleiche bestehende Zuordnungen ab...");
|
||||
foreach (var mapping in mappings.ToList())
|
||||
{
|
||||
var oc = outlookContacts.FirstOrDefault(c => c.OutlookEntryId == mapping.OutlookEntryId);
|
||||
var sc = starfaceContacts.FirstOrDefault(c => c.StarfaceId == mapping.StarfaceId);
|
||||
|
||||
if (oc != null) processedOutlookIds.Add(oc.OutlookEntryId);
|
||||
if (sc != null) processedStarfaceIds.Add(sc.StarfaceId);
|
||||
|
||||
if (oc == null && sc == null)
|
||||
{
|
||||
// Beide Seiten geloescht -> Mapping entfernen
|
||||
continue;
|
||||
}
|
||||
|
||||
if (oc != null && sc != null)
|
||||
{
|
||||
// Beide vorhanden -> auf Aenderungen pruefen
|
||||
var olHash = oc.GetHash();
|
||||
var sfHash = sc.GetHash();
|
||||
bool olChanged = olHash != mapping.LastSyncHash;
|
||||
bool sfChanged = sfHash != mapping.LastSyncHash;
|
||||
|
||||
if (olChanged && !sfChanged && (profile.SyncDirection == SyncDirection.Both || profile.SyncDirection == SyncDirection.OutlookToStarface))
|
||||
{
|
||||
// Outlook hat sich geaendert -> Starface updaten
|
||||
if (await starface.UpdateContactAsync(mapping.StarfaceId, oc, profile.StarfaceAddressBook))
|
||||
{
|
||||
var hash = oc.GetHash();
|
||||
if (hash != existing.LastSyncHash)
|
||||
mapping.LastSyncHash = olHash;
|
||||
result.Updated++;
|
||||
Log($" Aktualisiert (OL->SF): {oc.DisplayName}");
|
||||
}
|
||||
}
|
||||
else if (sfChanged && !olChanged && (profile.SyncDirection == SyncDirection.Both || profile.SyncDirection == SyncDirection.StarfaceToOutlook))
|
||||
{
|
||||
// Starface hat sich geaendert -> Outlook updaten
|
||||
if (_outlookService.UpdateContact(mapping.OutlookEntryId, sc))
|
||||
{
|
||||
mapping.LastSyncHash = sfHash;
|
||||
result.Updated++;
|
||||
Log($" Aktualisiert (SF->OL): {sc.DisplayName}");
|
||||
}
|
||||
}
|
||||
else if (olChanged && sfChanged)
|
||||
{
|
||||
// Beide geaendert -> Konflikt, neuere gewinnt (Outlook bevorzugt)
|
||||
if (profile.SyncDirection != SyncDirection.StarfaceToOutlook)
|
||||
{
|
||||
if (await starface.UpdateContactAsync(mapping.StarfaceId, oc, profile.StarfaceAddressBook))
|
||||
{
|
||||
if (await starface.UpdateContactAsync(existing.StarfaceId, oc, profile.StarfaceAddressBook))
|
||||
{
|
||||
existing.LastSyncHash = hash;
|
||||
result.Updated++;
|
||||
}
|
||||
mapping.LastSyncHash = olHash;
|
||||
result.Updated++;
|
||||
Log($" Konflikt (OL gewinnt): {oc.DisplayName}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var match = FindMatch(oc, starfaceContacts);
|
||||
if (match != null && !string.IsNullOrEmpty(match.StarfaceId))
|
||||
if (_outlookService.UpdateContact(mapping.OutlookEntryId, sc))
|
||||
{
|
||||
if (await starface.UpdateContactAsync(match.StarfaceId, oc, profile.StarfaceAddressBook))
|
||||
{
|
||||
_profileManager.AddOrUpdateMapping(new SyncMapping
|
||||
{
|
||||
ProfileId = profile.Id,
|
||||
OutlookEntryId = oc.OutlookEntryId,
|
||||
StarfaceId = match.StarfaceId,
|
||||
LastSyncHash = oc.GetHash()
|
||||
});
|
||||
result.Updated++;
|
||||
}
|
||||
mapping.LastSyncHash = sfHash;
|
||||
result.Updated++;
|
||||
Log($" Konflikt (SF gewinnt): {sc.DisplayName}");
|
||||
}
|
||||
else
|
||||
}
|
||||
}
|
||||
// Beide unveraendert -> nichts tun
|
||||
}
|
||||
|
||||
newMappings.Add(mapping);
|
||||
}
|
||||
|
||||
// ============================================
|
||||
// Phase 2: Neue Outlook-Kontakte (ohne Mapping)
|
||||
// ============================================
|
||||
if (profile.SyncDirection == SyncDirection.Both || profile.SyncDirection == SyncDirection.OutlookToStarface)
|
||||
{
|
||||
var unmappedOutlook = outlookContacts
|
||||
.Where(c => !string.IsNullOrEmpty(c.OutlookEntryId) && !processedOutlookIds.Contains(c.OutlookEntryId))
|
||||
.ToList();
|
||||
|
||||
if (unmappedOutlook.Count > 0)
|
||||
Log($"Neue Outlook-Kontakte: {unmappedOutlook.Count}");
|
||||
|
||||
// Starface-Kontakte die noch kein Mapping haben (fuer Duplikat-Check)
|
||||
var unmappedStarface = starfaceContacts
|
||||
.Where(c => !string.IsNullOrEmpty(c.StarfaceId) && !processedStarfaceIds.Contains(c.StarfaceId))
|
||||
.ToList();
|
||||
|
||||
foreach (var oc in unmappedOutlook)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Duplikat-Check: existiert der Kontakt schon in der Starface?
|
||||
var match = FindMatch(oc, unmappedStarface);
|
||||
if (match != null)
|
||||
{
|
||||
// Existiert schon -> verknuepfen und updaten
|
||||
if (await starface.UpdateContactAsync(match.StarfaceId, oc, profile.StarfaceAddressBook))
|
||||
{
|
||||
var created = await starface.CreateContactAsync(oc, profile.StarfaceAddressBook);
|
||||
if (created != null && !string.IsNullOrEmpty(created.StarfaceId))
|
||||
newMappings.Add(new SyncMapping
|
||||
{
|
||||
_profileManager.AddOrUpdateMapping(new SyncMapping
|
||||
{
|
||||
ProfileId = profile.Id,
|
||||
OutlookEntryId = oc.OutlookEntryId,
|
||||
StarfaceId = created.StarfaceId,
|
||||
LastSyncHash = oc.GetHash()
|
||||
});
|
||||
result.Created++;
|
||||
}
|
||||
ProfileId = profile.Id,
|
||||
OutlookEntryId = oc.OutlookEntryId,
|
||||
StarfaceId = match.StarfaceId,
|
||||
LastSyncHash = oc.GetHash()
|
||||
});
|
||||
processedStarfaceIds.Add(match.StarfaceId);
|
||||
unmappedStarface.Remove(match);
|
||||
result.Updated++;
|
||||
Log($" Verknuepft (OL->SF): {oc.DisplayName}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Neu -> in Starface erstellen
|
||||
var created = await starface.CreateContactAsync(oc, profile.StarfaceAddressBook);
|
||||
if (created != null && !string.IsNullOrEmpty(created.StarfaceId))
|
||||
{
|
||||
newMappings.Add(new SyncMapping
|
||||
{
|
||||
ProfileId = profile.Id,
|
||||
OutlookEntryId = oc.OutlookEntryId,
|
||||
StarfaceId = created.StarfaceId,
|
||||
LastSyncHash = oc.GetHash()
|
||||
});
|
||||
result.Created++;
|
||||
Log($" Erstellt (OL->SF): {oc.DisplayName}");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result.Errors++;
|
||||
result.ErrorMessages.Add($"{oc.DisplayName}: {ex.Message}");
|
||||
result.ErrorMessages.Add($"OL->SF {oc.DisplayName}: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Starface -> Outlook
|
||||
if (profile.SyncDirection == SyncDirection.Both ||
|
||||
profile.SyncDirection == SyncDirection.StarfaceToOutlook)
|
||||
// ============================================
|
||||
// Phase 3: Neue Starface-Kontakte (ohne Mapping)
|
||||
// ============================================
|
||||
if (profile.SyncDirection == SyncDirection.Both || profile.SyncDirection == SyncDirection.StarfaceToOutlook)
|
||||
{
|
||||
Log("Synchronisiere Starface -> Outlook...");
|
||||
foreach (var sc in starfaceContacts)
|
||||
var unmappedStarface = starfaceContacts
|
||||
.Where(c => !string.IsNullOrEmpty(c.StarfaceId) && !processedStarfaceIds.Contains(c.StarfaceId))
|
||||
.ToList();
|
||||
|
||||
if (unmappedStarface.Count > 0)
|
||||
Log($"Neue Starface-Kontakte: {unmappedStarface.Count}");
|
||||
|
||||
// Outlook-Kontakte die noch kein Mapping haben (fuer Duplikat-Check)
|
||||
var unmappedOutlook = outlookContacts
|
||||
.Where(c => !string.IsNullOrEmpty(c.OutlookEntryId) && !processedOutlookIds.Contains(c.OutlookEntryId))
|
||||
.ToList();
|
||||
|
||||
foreach (var sc in unmappedStarface)
|
||||
{
|
||||
try
|
||||
{
|
||||
SyncMapping existing = null;
|
||||
if (!string.IsNullOrEmpty(sc.StarfaceId))
|
||||
mappingByStarface.TryGetValue(sc.StarfaceId, out existing);
|
||||
|
||||
if (existing != null)
|
||||
// Duplikat-Check: existiert der Kontakt schon in Outlook?
|
||||
var match = FindMatch(sc, unmappedOutlook);
|
||||
if (match != null)
|
||||
{
|
||||
var hash = sc.GetHash();
|
||||
if (hash != existing.LastSyncHash)
|
||||
// Existiert schon -> verknuepfen und updaten
|
||||
if (_outlookService.UpdateContact(match.OutlookEntryId, sc))
|
||||
{
|
||||
if (_outlookService.UpdateContact(existing.OutlookEntryId, sc))
|
||||
newMappings.Add(new SyncMapping
|
||||
{
|
||||
existing.LastSyncHash = hash;
|
||||
result.Updated++;
|
||||
}
|
||||
ProfileId = profile.Id,
|
||||
OutlookEntryId = match.OutlookEntryId,
|
||||
StarfaceId = sc.StarfaceId,
|
||||
LastSyncHash = sc.GetHash()
|
||||
});
|
||||
processedOutlookIds.Add(match.OutlookEntryId);
|
||||
unmappedOutlook.Remove(match);
|
||||
result.Updated++;
|
||||
Log($" Verknuepft (SF->OL): {sc.DisplayName}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var match = FindMatch(sc, outlookContacts);
|
||||
if (match != null && !string.IsNullOrEmpty(match.OutlookEntryId))
|
||||
// Neu -> in Outlook erstellen
|
||||
var created = _outlookService.CreateContact(sc, profile.OutlookFolderPath);
|
||||
if (created != null && !string.IsNullOrEmpty(created.OutlookEntryId))
|
||||
{
|
||||
if (_outlookService.UpdateContact(match.OutlookEntryId, sc))
|
||||
newMappings.Add(new SyncMapping
|
||||
{
|
||||
_profileManager.AddOrUpdateMapping(new SyncMapping
|
||||
{
|
||||
ProfileId = profile.Id,
|
||||
OutlookEntryId = match.OutlookEntryId,
|
||||
StarfaceId = sc.StarfaceId,
|
||||
LastSyncHash = sc.GetHash()
|
||||
});
|
||||
result.Updated++;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
var created = _outlookService.CreateContact(sc, profile.OutlookFolderPath);
|
||||
if (created != null && !string.IsNullOrEmpty(created.OutlookEntryId))
|
||||
{
|
||||
_profileManager.AddOrUpdateMapping(new SyncMapping
|
||||
{
|
||||
ProfileId = profile.Id,
|
||||
OutlookEntryId = created.OutlookEntryId,
|
||||
StarfaceId = sc.StarfaceId,
|
||||
LastSyncHash = sc.GetHash()
|
||||
});
|
||||
result.Created++;
|
||||
}
|
||||
ProfileId = profile.Id,
|
||||
OutlookEntryId = created.OutlookEntryId,
|
||||
StarfaceId = sc.StarfaceId,
|
||||
LastSyncHash = sc.GetHash()
|
||||
});
|
||||
result.Created++;
|
||||
Log($" Erstellt (SF->OL): {sc.DisplayName}");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
result.Errors++;
|
||||
result.ErrorMessages.Add($"{sc.DisplayName}: {ex.Message}");
|
||||
result.ErrorMessages.Add($"SF->OL {sc.DisplayName}: {ex.Message}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Mappings speichern
|
||||
_profileManager.SaveMappings(profile.Id, newMappings);
|
||||
_profileManager.UpdateLastSync(profile.Id);
|
||||
_profileManager.SaveMappings(profile.Id, mappings);
|
||||
|
||||
await starface.LogoutAsync();
|
||||
Log("Synchronisation abgeschlossen!");
|
||||
|
||||
Log($"Fertig: {result.Created} erstellt, {result.Updated} aktualisiert, {result.Errors} Fehler");
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
|
|
|||
Loading…
Reference in New Issue