refactor: search member presenters by name

Author: glitchedmob

SgfDevs.Tests/PresenterMemberMatcherTests.cs

@@ -8,43 +8,28 @@ namespace SgfDevs.Tests;
 public class PresenterMemberMatcherTests
 {
     [Fact]
-    public void MatchPresenter_MatchesUniqueNormalizedFullName()
+    public void BuildSearchTerms_IncludesNormalizedNameOnce()
     {
-        var memberKey = Guid.NewGuid();
-        var presenter = new ImportedPresenterPlan("speaker-1", "Bertram   Gilfoyle", null);
-        var lookup = PresenterMemberMatcher.BuildMemberNameLookup(
-        [
-            (memberKey, "Bertram Gilfoyle", "Bertram", "Gilfoyle")
-        ]);
+        var result = PresenterMemberMatcher.BuildSearchTerms("Bertram   Gilfoyle");
 
-        var result = PresenterMemberMatcher.MatchPresenter(presenter, lookup);
-
-        Assert.Equal(memberKey, result.MatchedMemberKey);
+        Assert.Equal(["bertram gilfoyle", "Bertram   Gilfoyle"], result);
     }
 
     [Fact]
-    public void MatchPresenter_DoesNotMatchWhenMultipleMembersShareTheSameName()
+    public void GetMatchedMemberKey_ReturnsSingleKeyWhenExactlyOneMatchExists()
     {
-        var presenter = new ImportedPresenterPlan("speaker-1", "Dinesh Chugtai", null);
-        var lookup = PresenterMemberMatcher.BuildMemberNameLookup(
-        [
-            (Guid.NewGuid(), "Dinesh Chugtai", "Dinesh", "Chugtai"),
-            (Guid.NewGuid(), "Dinesh Chugtai", "Dinesh", "Chugtai")
-        ]);
+        var key = Guid.NewGuid();
 
-        var result = PresenterMemberMatcher.MatchPresenter(presenter, lookup);
+        var result = PresenterMemberMatcher.GetMatchedMemberKey([key]);
 
-        Assert.Null(result.MatchedMemberKey);
+        Assert.Equal(key, result);
     }
 
     [Fact]
-    public void MatchPresenter_DoesNotMatchWhenNoMemberExists()
+    public void GetMatchedMemberKey_ReturnsNullWhenMultipleMatchesExist()
     {
-        var presenter = new ImportedPresenterPlan("speaker-1", "Jared Dunn", null);
-        var lookup = PresenterMemberMatcher.BuildMemberNameLookup(Array.Empty<(Guid Key, string? Name, string? FirstName, string? LastName)>());
-
-        var result = PresenterMemberMatcher.MatchPresenter(presenter, lookup);
+        var result = PresenterMemberMatcher.GetMatchedMemberKey([Guid.NewGuid(), Guid.NewGuid()]);
 
-        Assert.Null(result.MatchedMemberKey);
+        Assert.Null(result);
     }
 }

SgfDevs/Dev/EventSync/PresenterMemberMatcher.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using SgfDevs.Dev.EventSync.Sessionize;
+using Umbraco.Cms.Core.Persistence.Querying;
 using Umbraco.Cms.Core.Services;
 
 namespace SgfDevs.Dev.EventSync;
@@ -18,41 +19,53 @@ public PresenterMemberMatcher(IMemberService memberService)
 
     public IReadOnlyList<ImportedPresenterPlan> MatchPresenters(IReadOnlyList<ImportedPresenterPlan> presenters)
     {
-        var memberNameLookup = BuildMemberNameLookup(GetAllMemberNames());
-
         return presenters
-            .Select(presenter => MatchPresenter(presenter, memberNameLookup))
+            .Select(MatchPresenter)
             .ToList();
     }
 
-    internal static ImportedPresenterPlan MatchPresenter(
-        ImportedPresenterPlan presenter,
-        IReadOnlyDictionary<string, IReadOnlyList<Guid>> memberNameLookup)
+    private ImportedPresenterPlan MatchPresenter(ImportedPresenterPlan presenter)
+    {
+        var matchedMemberKey = FindUniqueMemberKey(presenter.Name);
+        return matchedMemberKey.HasValue
+            ? presenter with { MatchedMemberKey = matchedMemberKey.Value }
+            : presenter;
+    }
+
+    internal static Guid? GetMatchedMemberKey(IReadOnlyList<Guid> memberKeys)
     {
-        var normalizedName = NormalizeName(presenter.Name);
+        return memberKeys.Count == 1 ? memberKeys[0] : null;
+    }
+
+    internal static IReadOnlyList<string> BuildSearchTerms(string? name)
+    {
+        var normalizedName = NormalizeName(name);
         if (string.IsNullOrWhiteSpace(normalizedName))
         {
-            return presenter;
+            return [];
         }
 
-        if (memberNameLookup.TryGetValue(normalizedName, out var memberKeys) == false || memberKeys.Count != 1)
+        var searchTerms = new List<string> { normalizedName };
+        var trimmedName = name?.Trim();
+
+        if (string.IsNullOrWhiteSpace(trimmedName) == false && string.Equals(normalizedName, trimmedName, StringComparison.OrdinalIgnoreCase) == false)
         {
-            return presenter;
+            searchTerms.Add(trimmedName);
         }
 
-        return presenter with { MatchedMemberKey = memberKeys[0] };
+        return searchTerms
+            .Distinct(StringComparer.OrdinalIgnoreCase)
+            .ToList();
     }
 
-    internal static IReadOnlyDictionary<string, IReadOnlyList<Guid>> BuildMemberNameLookup(IEnumerable<(Guid Key, string? Name, string? FirstName, string? LastName)> members)
+    private Guid? FindUniqueMemberKey(string? presenterName)
     {
-        return members
-            .SelectMany(member => GetCandidateNames(member)
-                .Select(name => new { Name = name, member.Key }))
-            .GroupBy(item => item.Name, StringComparer.Ordinal)
-            .ToDictionary(
-                group => group.Key,
-                group => (IReadOnlyList<Guid>)group.Select(item => item.Key).Distinct().ToList(),
-                StringComparer.Ordinal);
+        var memberKeys = BuildSearchTerms(presenterName)
+            .SelectMany(FindMembersByDisplayName)
+            .Distinct()
+            .ToList();
+
+        return GetMatchedMemberKey(memberKeys);
     }
 
     internal static string NormalizeName(string? name)
@@ -68,41 +81,15 @@ internal static string NormalizeName(string? name)
             .ToLowerInvariant();
     }
 
-    private IEnumerable<(Guid Key, string? Name, string? FirstName, string? LastName)> GetAllMemberNames()
+    private IReadOnlyList<Guid> FindMembersByDisplayName(string searchTerm)
     {
-        long pageIndex = 0;
-        const int pageSize = 500;
+        const int pageIndex = 0;
+        const int pageSize = 10;
         long totalRecords;
 
-        do
-        {
-            var members = _memberService.GetAll(pageIndex, pageSize, out totalRecords).ToList();
-
-            foreach (var member in members)
-            {
-                yield return (
-                    member.Key,
-                    member.Name,
-                    member.GetValue<string>("firstName"),
-                    member.GetValue<string>("lastName"));
-            }
-
-            pageIndex++;
-        }
-        while (pageIndex * pageSize < totalRecords);
-    }
-
-    private static IEnumerable<string> GetCandidateNames((Guid Key, string? Name, string? FirstName, string? LastName) member)
-    {
-        if (string.IsNullOrWhiteSpace(member.Name) == false)
-        {
-            yield return NormalizeName(member.Name);
-        }
-
-        var fullName = string.Join(' ', new[] { member.FirstName, member.LastName }.Where(value => string.IsNullOrWhiteSpace(value) == false));
-        if (string.IsNullOrWhiteSpace(fullName) == false)
-        {
-            yield return NormalizeName(fullName);
-        }
+        return _memberService
+            .FindMembersByDisplayName(searchTerm, pageIndex, pageSize, out totalRecords, StringPropertyMatchType.Exact)
+            .Select(member => member.Key)
+            .ToList();
     }
 }