From e97c29db4336860206bef4bb0b9c782e4d2ac1b2 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Sun, 14 Dec 2025 22:18:15 +0100
Subject: [PATCH] Dtos: Rename MemberDeliveryPerVarietyData to
 MemberDeliveryYieldsPerVarietyData

---
 Elwig/Helpers/AppDbContext.cs                  |  2 +-
 ...s => MemberDeliveryYieldsPerVarietyData.cs} | 18 +++++++++---------
 Elwig/Windows/MainWindow.xaml.cs               |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)
 rename Elwig/Models/Dtos/{MemberDeliveryPerVarietyData.cs => MemberDeliveryYieldsPerVarietyData.cs} (85%)

diff --git a/Elwig/Helpers/AppDbContext.cs b/Elwig/Helpers/AppDbContext.cs
index f3b013e..8ee5b86 100644
--- a/Elwig/Helpers/AppDbContext.cs
+++ b/Elwig/Helpers/AppDbContext.cs
@@ -67,7 +67,7 @@ namespace Elwig.Helpers {
 
         public DbSet<OverUnderDeliveryRow> OverUnderDeliveryRows { get; private set; }
         public DbSet<AreaComUnderDeliveryRowSingle> AreaComUnderDeliveryRows { get; private set; }
-        public DbSet<MemberDeliveryPerVariantRowSingle> MemberDeliveryPerVariantRows { get; private set; }
+        public DbSet<MemberDeliveryPerVarietyRowSingle> MemberDeliveryPerVariantRows { get; private set; }
         public DbSet<MemberAreaComsRowSingle> MemberAreaComsRows { get; private set; }
         public DbSet<CreditNoteDeliveryRowSingle> CreditNoteDeliveryRows { get; private set; }
         public DbSet<CreditNoteRowSingle> CreditNoteRows { get; private set; }
diff --git a/Elwig/Models/Dtos/MemberDeliveryPerVarietyData.cs b/Elwig/Models/Dtos/MemberDeliveryYieldsPerVarietyData.cs
similarity index 85%
rename from Elwig/Models/Dtos/MemberDeliveryPerVarietyData.cs
rename to Elwig/Models/Dtos/MemberDeliveryYieldsPerVarietyData.cs
index dea124b..48587e3 100644
--- a/Elwig/Models/Dtos/MemberDeliveryPerVarietyData.cs
+++ b/Elwig/Models/Dtos/MemberDeliveryYieldsPerVarietyData.cs
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Threading.Tasks;
 
 namespace Elwig.Models.Dtos {
-    public class MemberDeliveryPerVarietyData : DataTable<MemberDeliveryPerVariantRow> {
+    public class MemberDeliveryYieldsPerVarietyData : DataTable<MemberDeliveryYieldsPerVarietyRow> {
 
         private static readonly (string, string, string?, int)[] FieldNames = [
             ("MgNr", "MgNr.", null, 12),
@@ -21,19 +21,19 @@ namespace Elwig.Models.Dtos {
             ("Yields", "Ertrag", "kg/ha", 22),
         ];
 
-        public MemberDeliveryPerVarietyData(IEnumerable<MemberDeliveryPerVariantRow> rows, int year) :
+        public MemberDeliveryYieldsPerVarietyData(IEnumerable<MemberDeliveryYieldsPerVarietyRow> rows, int year) :
             base($"Liefermengen", $"Liefermengen pro Mitglied, Sorte und Attribut {year}", rows, FieldNames) {
         }
 
-        public static async Task<MemberDeliveryPerVarietyData> ForSeason(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
-            return new MemberDeliveryPerVarietyData(
+        public static async Task<MemberDeliveryYieldsPerVarietyData> ForSeason(DbSet<MemberDeliveryPerVarietyRowSingle> table, int year) {
+            return new MemberDeliveryYieldsPerVarietyData(
                (await FromDbSet(table, year)).GroupBy(
                    r => r.MgNr,
-                   (k, g) => new MemberDeliveryPerVariantRow(g)
+                   (k, g) => new MemberDeliveryYieldsPerVarietyRow(g)
              ), year);
         }
 
-        private static async Task<IEnumerable<MemberDeliveryPerVariantRowSingle>> FromDbSet(DbSet<MemberDeliveryPerVariantRowSingle> table, int year) {
+        private static async Task<IEnumerable<MemberDeliveryPerVarietyRowSingle>> FromDbSet(DbSet<MemberDeliveryPerVarietyRowSingle> table, int year) {
             return await table.FromSql($"""
                     SELECT m.mgnr, m.name AS name_1,
                            COALESCE(m.prefix || ' ', '') || m.given_name ||
@@ -67,7 +67,7 @@ namespace Elwig.Models.Dtos {
         }
     }
 
-    public class MemberDeliveryPerVariantRow {
+    public class MemberDeliveryYieldsPerVarietyRow {
         public int MgNr;
         public string Name1;
         public string? Name2;
@@ -80,7 +80,7 @@ namespace Elwig.Models.Dtos {
         public int[] Weights;
         public int?[] Yields => Weights.Zip(Areas).Select(i => i.Second > 0 ? (int?)i.First * 10_000 / i.Second : null).ToArray();
 
-        public MemberDeliveryPerVariantRow(IEnumerable<MemberDeliveryPerVariantRowSingle> rows) {
+        public MemberDeliveryYieldsPerVarietyRow(IEnumerable<MemberDeliveryPerVarietyRowSingle> rows) {
             var f = rows.First();
             MgNr = f.MgNr;
             Name1 = f.Name1;
@@ -96,7 +96,7 @@ namespace Elwig.Models.Dtos {
     }
 
     [Keyless]
-    public class MemberDeliveryPerVariantRowSingle {
+    public class MemberDeliveryPerVarietyRowSingle {
         [Column("mgnr")]
         public int MgNr { get; set; }
         [Column("name_1")]
diff --git a/Elwig/Windows/MainWindow.xaml.cs b/Elwig/Windows/MainWindow.xaml.cs
index 374a205..efde0ec 100644
--- a/Elwig/Windows/MainWindow.xaml.cs
+++ b/Elwig/Windows/MainWindow.xaml.cs
@@ -579,7 +579,7 @@ namespace Elwig.Windows {
                     App.HintContextChange();
 
                     using var ctx = new AppDbContext();
-                    var tbl = await MemberDeliveryPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
+                    var tbl = await MemberDeliveryYieldsPerVarietyData.ForSeason(ctx.MemberDeliveryPerVariantRows, year);
                     using var ods = new OdsFile(d.FileName);
                     await ods.AddTable(tbl);
                 } catch (Exception exc) {