Merge branch 'fix'

Author: dlidstrom

Snittlistan.Web/Areas/V2/Domain/Roster.cs

@@ -34,55 +34,6 @@ public Roster(
         IsFourPlayer = isFourPlayer;
         OilPattern = oilPattern ?? new OilPatternInformation(string.Empty, string.Empty);
         AuditLogEntries = auditLogEntries ?? new List<AuditLogEntry>();
-
-        // fixup the state
-        if (AuditLogEntries.Any(x => x.Before.GetType() != typeof(RosterState)))
-        {
-            foreach (AuditLogEntry item in AuditLogEntries)
-            {
-                string[] playersBefore = Array.Empty<string>();
-                try
-                {
-                    playersBefore = ((dynamic)item.Before).Players;
-                }
-                catch (Exception)
-                {
-                }
-
-                string[] acceptedPlayersBefore = Array.Empty<string>();
-                try
-                {
-                    acceptedPlayersBefore = ((dynamic)item.Before).AcceptedPlayers;
-                }
-                catch (Exception)
-                {
-                }
-
-                RosterState before = new(playersBefore, acceptedPlayersBefore);
-                item.SetBefore(before);
-
-                string[] playersAfter = Array.Empty<string>();
-                try
-                {
-                    playersAfter = ((dynamic)item.After).Players;
-                }
-                catch (Exception)
-                {
-                }
-
-                string[] acceptedPlayersAfter = Array.Empty<string>();
-                try
-                {
-                    acceptedPlayersAfter = ((dynamic)item.After).AcceptedPlayers;
-                }
-                catch (Exception)
-                {
-                }
-
-                RosterState after = new(playersAfter, acceptedPlayersAfter);
-                item.SetAfter(after);
-            }
-        }
     }
 
     public string Id { get; set; } = null!;
@@ -288,7 +239,7 @@ private void Accept(string playerId)
 
     private RosterState GetState()
     {
-        return new RosterState(Players.ToArray(), AcceptedPlayers.ToArray());
+        return new RosterState(Players.ToArray(), AcceptedPlayers.ToArray(), TeamLeader);
     }
 
     public FormattedAuditLog GetFormattedAuditLog(IDocumentSession documentSession, Guid correlationId)

Snittlistan.Web/Areas/V2/Domain/RosterState.cs

@@ -4,13 +4,16 @@ namespace Snittlistan.Web.Areas.V2.Domain;
 
 public class RosterState
 {
-    public RosterState(string[] players, string[] acceptedPlayers)
+    public RosterState(string[] players, string[] acceptedPlayers, string? teamLeader)
     {
         Players = players;
         AcceptedPlayers = acceptedPlayers;
+        TeamLeader = teamLeader;
     }
 
     public string[] Players { get; }
 
     public string[] AcceptedPlayers { get; }
+
+    public string? TeamLeader { get; }
 }

Snittlistan.Web/Commands/PublishRosterMailsCommandHandler.cs

@@ -19,6 +19,8 @@ public override async Task Handle(HandlerContext<Command> context)
         RosterState before = (RosterState)auditLogEntry.Before;
         RosterState after = (RosterState)auditLogEntry.After;
         HashSet<string> affectedPlayers = new(before.Players.Concat(after.Players));
+        if (before.TeamLeader != null) affectedPlayers.Add(before.TeamLeader);
+        if (after.TeamLeader != null) affectedPlayers.Add(after.TeamLeader);
 
         // find user who did the last edit-players action
         AuditLogEntry? editPlayersAction = roster.AuditLogEntries.LastOrDefault(