fix: scope presenter blocks to presentations

Author: glitchedmob

SgfDevs.Tests/ImportedPresenterBlockBuilderTests.cs

@@ -8,14 +8,16 @@ namespace SgfDevs.Tests;
 
 public class ImportedPresenterBlockBuilderTests
 {
+    private static readonly Guid PresentationKey = new("11111111-1111-1111-1111-111111111111");
+
     private readonly ImportedPresenterBlockBuilder _builder = new(
         new Guid("1bdea08d-8393-4e70-85a9-2ca27bef54f1"),
         new Guid("5ff3a2c3-9dc3-4131-8f07-99c2c0a38be5"));
 
     [Fact]
     public void Build_ReturnsEmptyStringWhenNoPresentersExist()
     {
-        var result = _builder.Build([]);
+        var result = _builder.Build(PresentationKey, []);
 
         Assert.Equal(string.Empty, result);
     }
@@ -24,10 +26,11 @@ public void Build_ReturnsEmptyStringWhenNoPresentersExist()
     public void Build_CreatesBlockListPayloadForNonMemberPresenters()
     {
         var result = _builder.Build(
-        [
-            new ImportedPresenterPlan("speaker-1", "Bertram Gilfoyle", null, MatchedMemberKey: new Guid("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")),
-            new ImportedPresenterPlan("speaker-2", "Dinesh Chugtai", null)
-        ]);
+            PresentationKey,
+            [
+                new ImportedPresenterPlan("speaker-1", "Bertram Gilfoyle", null, MatchedMemberKey: new Guid("aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa")),
+                new ImportedPresenterPlan("speaker-2", "Dinesh Chugtai", null)
+            ]);
 
         using var document = JsonDocument.Parse(result);
         var root = document.RootElement;
@@ -55,9 +58,29 @@ public void Build_ReturnsSamePayloadForSamePresenters()
             new ImportedPresenterPlan("speaker-2", "Dinesh Chugtai", null)
         };
 
-        var first = _builder.Build(presenters);
-        var second = _builder.Build(presenters);
+        var first = _builder.Build(PresentationKey, presenters);
+        var second = _builder.Build(PresentationKey, presenters);
 
         Assert.Equal(first, second);
     }
+
+    [Fact]
+    public void Build_ReturnsDifferentBlockKeysForDifferentPresentations()
+    {
+        var presenters = new[]
+        {
+            new ImportedPresenterPlan("speaker-1", "Bertram Gilfoyle", null)
+        };
+
+        var first = GetFirstBlockKey(_builder.Build(PresentationKey, presenters));
+        var second = GetFirstBlockKey(_builder.Build(new Guid("22222222-2222-2222-2222-222222222222"), presenters));
+
+        Assert.NotEqual(first, second);
+    }
+
+    private static Guid GetFirstBlockKey(string payload)
+    {
+        using var document = JsonDocument.Parse(payload);
+        return document.RootElement.GetProperty("contentData")[0].GetProperty("key").GetGuid();
+    }
 }

SgfDevs/Dev/EventSync/ImportedPresenterBlockBuilder.cs

@@ -31,7 +31,7 @@ internal ImportedPresenterBlockBuilder(Guid presenterPickerTypeKey, Guid nonMemb
         _nonMemberPresenterTypeKey = nonMemberPresenterTypeKey;
     }
 
-    public string Build(IReadOnlyList<ImportedPresenterPlan> presenters)
+    public string Build(Guid presentationKey, IReadOnlyList<ImportedPresenterPlan> presenters)
     {
         if (presenters.Count == 0)
         {
@@ -47,7 +47,7 @@ public string Build(IReadOnlyList<ImportedPresenterPlan> presenters)
 
         var blocks = presenters.Select(presenter =>
         {
-            var key = BuildBlockKey(presenter);
+            var key = BuildBlockKey(presentationKey, presenter);
             var isMatchedMember = presenter.MatchedMemberKey.HasValue;
 
             return new
@@ -117,19 +117,11 @@ public string Build(IReadOnlyList<ImportedPresenterPlan> presenters)
         return JsonSerializer.Serialize(payload);
     }
 
-    private static Guid BuildBlockKey(ImportedPresenterPlan presenter)
+    private static Guid BuildBlockKey(Guid presentationKey, 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 presenterIdentity = presenter.MatchedMemberKey?.ToString("N")
+            ?? (string.IsNullOrWhiteSpace(presenter.SessionizeSpeakerId) ? presenter.Name : presenter.SessionizeSpeakerId);
+        var identity = $"{presentationKey:N}\n{presenterIdentity}";
         var hash = SHA256.HashData(Encoding.UTF8.GetBytes(identity));
         return new Guid(hash.AsSpan(0, 16));
     }

SgfDevs/Dev/EventSync/SessionizeEventSyncService.cs

@@ -222,7 +222,7 @@ private void SavePresentationContent(
             presentationContent.SetValue(MeetupUrlPropertyAlias, meetupUrl);
         }
 
-        presentationContent.SetValue(PresentersPropertyAlias, _presenterBlockBuilder.Build(presentationPlan.Presenters));
+        presentationContent.SetValue(PresentersPropertyAlias, _presenterBlockBuilder.Build(presentationContent.Key, presentationPlan.Presenters));
     }
 
     private async Task<IReadOnlyList<ImportedPresenterPlan>> ImportPresenterImagesAsync(