From 7b78f9d6b9ad89aa373ce8b52c827db80ea5d438 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Tue, 7 Apr 2026 12:34:38 +0200
Subject: [PATCH] [#79] Windows: Fix errors unconvered by E2E tests

---
 Elwig/Windows/MailWindow.xaml.cs        | 2 +-
 Elwig/Windows/MemberAdminWindow.xaml.cs | 7 +++----
 Tests/E2ETests/MemberAdminWindowTest.cs | 1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Elwig/Windows/MailWindow.xaml.cs b/Elwig/Windows/MailWindow.xaml.cs
index 89c0dd6..aa838c4 100644
--- a/Elwig/Windows/MailWindow.xaml.cs
+++ b/Elwig/Windows/MailWindow.xaml.cs
@@ -155,7 +155,7 @@ namespace Elwig.Windows {
         }
 
         protected override async Task OnRenewContext(AppDbContext ctx) {
-            var season = await ctx.Seasons.Include(s => s.PaymentVariants).Where(s => s.Year == Year).SingleAsync();
+            var season = await ctx.Seasons.Include(s => s.PaymentVariants).Where(s => s.Year == Year).SingleOrDefaultAsync();
             var l = new List<string> {
                 MemberDataSheet.Name
             };
diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs
index 7788c19..b1d158f 100644
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@@ -388,10 +388,9 @@ namespace Elwig.Windows {
 
             int areaComs = 0, deliveries = 0, credits = 0;
             using (var ctx = new AppDbContext()) {
-                var l = await ctx.FetchMembers(m.MgNr).SingleAsync();
-                areaComs = l.AreaCommitments.Count;
-                deliveries = l.Deliveries.Count;
-                credits = l.Credits.Count;
+                areaComs = await ctx.AreaCommitments.Where(c => c.MgNr == m.MgNr).CountAsync();
+                deliveries = await ctx.Deliveries.Where(d => d.MgNr == m.MgNr).CountAsync();
+                credits = await ctx.Credits.Where(c => c.MgNr == m.MgNr).CountAsync();
             }
             var d = new DeleteMemberDialog(m.MgNr, m.AdministrativeName, areaComs, deliveries, credits);
             if (d.ShowDialog() == true) {
diff --git a/Tests/E2ETests/MemberAdminWindowTest.cs b/Tests/E2ETests/MemberAdminWindowTest.cs
index df825a4..52fd655 100644
--- a/Tests/E2ETests/MemberAdminWindowTest.cs
+++ b/Tests/E2ETests/MemberAdminWindowTest.cs
@@ -80,6 +80,7 @@ namespace Tests.E2ETests {
 
             Window.FindElement(By.WpfId("SaveButton")).Click();
 
+            Thread.Sleep(500);
             Window.FindElement(By.WpfId("SearchInput")).SendKeys("9999");
             Thread.Sleep(500);
             var memberListRow = Window.FindElement(By.WpfId("MemberList")).FindElement(By.ClassName("DataGridRow"));