From 4afd2d82424bdd46b41c3d403b402e0613d48c6c Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Sat, 16 Mar 2024 12:47:31 +0100
Subject: [PATCH] AppDbContext: Cleanup UpdateDeliveryPartModifiers()

---
 Elwig/Helpers/AppDbContext.cs             | 17 +++++++++--------
 Elwig/Windows/DeliveryAdminWindow.xaml.cs |  4 ++--
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Elwig/Helpers/AppDbContext.cs b/Elwig/Helpers/AppDbContext.cs
index 28ae656..2d590b0 100644
--- a/Elwig/Helpers/AppDbContext.cs
+++ b/Elwig/Helpers/AppDbContext.cs
@@ -236,20 +236,21 @@ namespace Elwig.Helpers {
             return await WineQualityLevels
                 .Where(q => !q.IsPredicate && (q.MinKmw == null || q.MinKmw <= kmw))
                 .OrderBy(q => q.MinKmw)
-                .LastOrDefaultAsync();
+                .LastAsync();
         }
 
-        public async Task UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
+        public void UpdateDeliveryPartModifiers(DeliveryPart part, IEnumerable<Modifier> modifiers) {
             foreach (var m in Modifiers.Where(m => m.Year == part.Year)) {
                 var mod = part.PartModifiers.Where(pa => pa.ModId == m.ModId).FirstOrDefault();
                 if (modifiers.Contains(m)) {
-                    DeliveryPartModifier dpm = mod ?? this.CreateProxy<DeliveryPartModifier>();
-                    dpm.Year = part.Year;
-                    dpm.DId = part.DId;
-                    dpm.DPNr = part.DPNr;
-                    dpm.ModId = m.ModId;
+                    var dpm = new DeliveryPartModifier {
+                        Year = part.Year,
+                        DId = part.DId,
+                        DPNr = part.DPNr,
+                        ModId = m.ModId,
+                    };
                     if (mod == null) {
-                        await AddAsync(dpm);
+                        Add(dpm);
                     } else {
                         Update(dpm);
                     }
diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
index f48b543..642f5a3 100644
--- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs
+++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs
@@ -975,7 +975,7 @@ namespace Elwig.Windows {
                     pEntry = partNew ? await Context.AddAsync(p) : Context.Update(p);
                 }
 
-                await Context.UpdateDeliveryPartModifiers(p, ModifiersInput.SelectedItems.Cast<Modifier>());
+                Context.UpdateDeliveryPartModifiers(p, ModifiersInput.SelectedItems.Cast<Modifier>());
 
                 if (originalMgNr != null && originalMgNr.Value != d.MgNr) {
                     // update origin (KgNr), if default is selected
@@ -1274,7 +1274,7 @@ namespace Elwig.Windows {
                     p2.HkId = "OEST";
                     entry2 = await Context.AddAsync(p2);
 
-                    await Context.UpdateDeliveryPartModifiers(p2, p.Modifiers);
+                    Context.UpdateDeliveryPartModifiers(p2, p.Modifiers);
                 }
                 await Context.SaveChangesAsync();
                 await RefreshDeliveryParts();