fix: issues with tests

Author: glitchedmob

SgfDevs.Tests/PresenterMemberMatcherTests.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using SgfDevs.Dev.EventSync;
 using SgfDevs.Dev.EventSync.Sessionize;
 using Xunit;
@@ -8,28 +9,63 @@ namespace SgfDevs.Tests;
 public class PresenterMemberMatcherTests
 {
     [Fact]
-    public void BuildSearchTerms_IncludesNormalizedNameOnce()
+    public void MatchPresenters_AssignsMemberKeyWhenExactlyOneMemberMatches()
     {
-        var result = PresenterMemberMatcher.BuildSearchTerms("Bertram   Gilfoyle");
+        var memberKey = Guid.NewGuid();
+        var matcher = CreateMatcher(new Dictionary<string, IReadOnlyList<Guid>>
+        {
+            ["bertram gilfoyle"] = [memberKey]
+        });
 
-        Assert.Equal(["bertram gilfoyle", "Bertram   Gilfoyle"], result);
+        var result = Assert.Single(matcher.MatchPresenters([new ImportedPresenterPlan("speaker-1", "Bertram   Gilfoyle", null)]));
+
+        Assert.Equal(memberKey, result.MatchedMemberKey);
+    }
+
+    [Fact]
+    public void MatchPresenters_LeavesPresenterUnchangedWhenNoMembersMatch()
+    {
+        var matcher = CreateMatcher(new Dictionary<string, IReadOnlyList<Guid>>());
+
+        var result = Assert.Single(matcher.MatchPresenters([new ImportedPresenterPlan("speaker-1", "Bertram Gilfoyle", null)]));
+
+        Assert.Null(result.MatchedMemberKey);
     }
 
     [Fact]
-    public void GetMatchedMemberKey_ReturnsSingleKeyWhenExactlyOneMatchExists()
+    public void MatchPresenters_LeavesPresenterUnchangedWhenMultipleMembersMatch()
     {
-        var key = Guid.NewGuid();
+        var matcher = CreateMatcher(new Dictionary<string, IReadOnlyList<Guid>>
+        {
+            ["bertram gilfoyle"] = [Guid.NewGuid(), Guid.NewGuid()]
+        });
 
-        var result = PresenterMemberMatcher.GetMatchedMemberKey([key]);
+        var result = Assert.Single(matcher.MatchPresenters([new ImportedPresenterPlan("speaker-1", "Bertram Gilfoyle", null)]));
 
-        Assert.Equal(key, result);
+        Assert.Null(result.MatchedMemberKey);
     }
 
     [Fact]
-    public void GetMatchedMemberKey_ReturnsNullWhenMultipleMatchesExist()
+    public void MatchPresenters_DeduplicatesSameMemberReturnedByMultipleSearchTerms()
     {
-        var result = PresenterMemberMatcher.GetMatchedMemberKey([Guid.NewGuid(), Guid.NewGuid()]);
+        var memberKey = Guid.NewGuid();
+        var matcher = CreateMatcher(new Dictionary<string, IReadOnlyList<Guid>>
+        {
+            ["bertram gilfoyle"] = [memberKey],
+            ["Bertram   Gilfoyle"] = [memberKey]
+        });
+
+        var result = Assert.Single(matcher.MatchPresenters([new ImportedPresenterPlan("speaker-1", "Bertram   Gilfoyle", null)]));
+
+        Assert.Equal(memberKey, result.MatchedMemberKey);
+    }
 
-        Assert.Null(result);
+    private static PresenterMemberMatcher CreateMatcher(IReadOnlyDictionary<string, IReadOnlyList<Guid>> resultsBySearchTerm)
+    {
+        return new PresenterMemberMatcher(searchTerm =>
+            resultsBySearchTerm.TryGetValue(searchTerm, out var result)
+                ? result
+                : []);
     }
+
 }

SgfDevs/Dev/EventSync/PresenterMemberMatcher.cs

@@ -10,11 +10,16 @@ namespace SgfDevs.Dev.EventSync;
 
 public class PresenterMemberMatcher
 {
-    private readonly IMemberService _memberService;
+    private readonly Func<string, IReadOnlyList<Guid>> _findMembersByDisplayName;
 
     public PresenterMemberMatcher(IMemberService memberService)
     {
-        _memberService = memberService;
+        _findMembersByDisplayName = searchTerm => FindMembersByDisplayName(memberService, searchTerm);
+    }
+
+    internal PresenterMemberMatcher(Func<string, IReadOnlyList<Guid>> findMembersByDisplayName)
+    {
+        _findMembersByDisplayName = findMembersByDisplayName;
     }
 
     public IReadOnlyList<ImportedPresenterPlan> MatchPresenters(IReadOnlyList<ImportedPresenterPlan> presenters)
@@ -32,12 +37,12 @@ private ImportedPresenterPlan MatchPresenter(ImportedPresenterPlan presenter)
             : presenter;
     }
 
-    internal static Guid? GetMatchedMemberKey(IReadOnlyList<Guid> memberKeys)
+    private static Guid? GetMatchedMemberKey(IReadOnlyList<Guid> memberKeys)
     {
         return memberKeys.Count == 1 ? memberKeys[0] : null;
     }
 
-    internal static IReadOnlyList<string> BuildSearchTerms(string? name)
+    private static IReadOnlyList<string> BuildSearchTerms(string? name)
     {
         var normalizedName = NormalizeName(name);
         if (string.IsNullOrWhiteSpace(normalizedName))
@@ -68,7 +73,7 @@ internal static IReadOnlyList<string> BuildSearchTerms(string? name)
         return GetMatchedMemberKey(memberKeys);
     }
 
-    internal static string NormalizeName(string? name)
+    private static string NormalizeName(string? name)
     {
         if (string.IsNullOrWhiteSpace(name))
         {
@@ -81,13 +86,15 @@ internal static string NormalizeName(string? name)
             .ToLowerInvariant();
     }
 
-    private IReadOnlyList<Guid> FindMembersByDisplayName(string searchTerm)
+    private IReadOnlyList<Guid> FindMembersByDisplayName(string searchTerm) => _findMembersByDisplayName(searchTerm);
+
+    private static IReadOnlyList<Guid> FindMembersByDisplayName(IMemberService memberService, string searchTerm)
     {
         const int pageIndex = 0;
         const int pageSize = 10;
         long totalRecords;
 
-        return _memberService
+        return memberService
             .FindMembersByDisplayName(searchTerm, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Exact)
             .Select(member => member.Key)
             .ToList();