fix: avoid redundant session imports

Author: glitchedmob

SgfDevs.Tests/ImportedPresenterBlockBuilderTests.cs

@@ -45,4 +45,19 @@ public void Build_CreatesBlockListPayloadForNonMemberPresenters()
         Assert.Equal("Dinesh Chugtai", secondValues[0].GetProperty("value").GetString());
         Assert.Equal(string.Empty, secondValues[1].GetProperty("value").GetString());
     }
+
+    [Fact]
+    public void Build_ReturnsSamePayloadForSamePresenters()
+    {
+        var presenters = new[]
+        {
+            new ImportedPresenterPlan("speaker-1", "Bertram Gilfoyle", null, MatchedMemberKey: new Guid("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")),
+            new ImportedPresenterPlan("speaker-2", "Dinesh Chugtai", null)
+        };
+
+        var first = _builder.Build(presenters);
+        var second = _builder.Build(presenters);
+
+        Assert.Equal(first, second);
+    }
 }

SgfDevs/Dev/EventSync/ImportedPresenterBlockBuilder.cs

@@ -2,6 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Cryptography;
+using System.Text;
 using System.Text.Json;
 using SgfDevs.Dev.EventSync.Sessionize;
 using Umbraco.Cms.Core;
@@ -45,7 +47,7 @@ public string Build(IReadOnlyList<ImportedPresenterPlan> presenters)
 
         var blocks = presenters.Select(presenter =>
         {
-            var key = Guid.NewGuid();
+            var key = BuildBlockKey(presenter);
             var isMatchedMember = presenter.MatchedMemberKey.HasValue;
 
             return new
@@ -114,4 +116,21 @@ public string Build(IReadOnlyList<ImportedPresenterPlan> presenters)
 
         return JsonSerializer.Serialize(payload);
     }
+
+    private static Guid BuildBlockKey(ImportedPresenterPlan presenter)
+    {
+        if (presenter.MatchedMemberKey.HasValue)
+        {
+            return presenter.MatchedMemberKey.Value;
+        }
+
+        if (Guid.TryParse(presenter.SessionizeSpeakerId, out var sessionizeSpeakerKey))
+        {
+            return sessionizeSpeakerKey;
+        }
+
+        var identity = $"{presenter.SessionizeSpeakerId}\n{presenter.Name}";
+        var hash = SHA256.HashData(Encoding.UTF8.GetBytes(identity));
+        return new Guid(hash.AsSpan(0, 16));
+    }
 }

SgfDevs/Dev/EventSync/SessionizeEventSyncService.cs

@@ -112,8 +112,7 @@ public async Task SyncAsync(CancellationToken cancellationToken = default)
 
             var eventContent = GetOrCreateEvent(existingEvents, references.EventsContainerId, eventPlan);
             SaveEventContent(eventContent, eventPlan);
-            _contentService.Save(eventContent, SystemUserId);
-            var presentationsToPublish = new List<IContent>();
+            SaveAndPublishContent(eventContent, "event", clearSchedule: true);
 
             var existingPresentations = GetChildren(eventContent.Id)
                 .Where(content => string.Equals(content.ContentType.Alias, PresentationAlias, StringComparison.Ordinal))
@@ -136,14 +135,7 @@ public async Task SyncAsync(CancellationToken cancellationToken = default)
 
                 var presentationContent = GetOrCreatePresentation(existingPresentations, eventContent.Id, presentationPlan);
                 SavePresentationContent(presentationContent, references.SpringfieldDevsGroupKey, enrichedPresentationPlan, meetupMatch?.EventUrl);
-                _contentService.Save(presentationContent, SystemUserId);
-                presentationsToPublish.Add(presentationContent);
-            }
-
-            PublishContent(eventContent, "event", clearSchedule: true);
-            foreach (var presentationContent in presentationsToPublish)
-            {
-                PublishContent(presentationContent, "presentation");
+                SaveAndPublishContent(presentationContent, "presentation");
             }
         }
     }
@@ -262,29 +254,31 @@ private async Task<IReadOnlyList<ImportedPresenterPlan>> ImportPresenterImagesAs
         return enrichedPresenters;
     }
 
-    private void PublishContent(IContent content, string contentKind, bool clearSchedule = false)
+    private void SaveAndPublishContent(IContent content, string contentKind, bool clearSchedule = false)
     {
-        if (clearSchedule)
+        if (content.IsDirty() == false && content.IsCultureEdited(null!) == false)
+        {
+            return;
+        }
+
+        if (clearSchedule && content.HasIdentity)
         {
             _contentService.PersistContentSchedule(content, new ContentScheduleCollection());
         }
 
-        var publishResult = _contentService.Publish(content, ["*"], SystemUserId);
+        var publishResult = _contentService.SaveAndPublish(content, [], SystemUserId);
         if (publishResult.Success)
         {
             _logger.LogInformation(
-                "Published {ContentKind} {ContentName} with result {PublishResult}.",
+                "Saved and published {ContentKind} {ContentName} with result {PublishResult}.",
                 contentKind,
                 content.Name,
                 publishResult.Result);
             return;
         }
 
-        _logger.LogWarning(
-            "Failed to publish {ContentKind} {ContentName}. Publish result was {PublishResult}.",
-            contentKind,
-            content.Name,
-            publishResult.Result);
+        throw new InvalidOperationException(
+            $"Failed to save and publish {contentKind} {content.Name}. Publish result was {publishResult.Result}.");
     }
 
     private IReadOnlyList<IContent> GetChildren(int parentId)