[chore:] introducing KasPerson.id (refsid remains but isn't used in the mgmt-backend anymore)

DataImport.cs

@@ -32,7 +32,8 @@ public class DataImport
             return (false, null);
         }
 
-        var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
+        var imported =
+            new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
 
         while (!reader.EndOfStream)
         {
@@ -50,7 +51,7 @@ public class DataImport
 
             try
             {
-                var person = new KasPerson(
+                var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count),
                     ParseInt(parts[0]),
                     parts[1],
                     parts[2],
@@ -108,7 +109,8 @@ public class DataImport
 
         var headers = headerLine.Split(separator).Select(h => h.Trim()).ToArray();
 
-        var imported = new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
+        var imported =
+            new KasAddressList(KasAddressList.GenerateName(Path.GetFileNameWithoutExtension(pathToCsv.LocalPath)));
         var patchType = typeof(AddressPatch);
         var binding = BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
 
@@ -116,7 +118,7 @@ public class DataImport
             .Where(p => p.PropertyType == typeof(bool) && p.Name.StartsWith("has_", StringComparison.OrdinalIgnoreCase))
             .ToArray();
 
-        var last_refsid = 1000000;
+        //var last_refsid = 1000000;
 
         while (!reader.EndOfStream)
         {
@@ -128,7 +130,7 @@ public class DataImport
 
             var fieldValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
 
-            var refsid_existing = false;
+            //var refsid_existing = false;
 
             foreach (var hasProp in hasProperties)
             {
@@ -177,16 +179,13 @@ public class DataImport
                 return fieldValues.TryGetValue(name, out var v) ? v : "";
             }
 
-            var new_refsid = last_refsid;
+            var refsid = 0;
-            if (!patch.has_refsid)
+            if (patch.has_refsid)
-                new_refsid = GenerateNewRefsid();
+                refsid = ParseInt(GetField("refsid"));
-            else
-                new_refsid = ParseInt(GetField("refsid"));
 
             try
             {
-                var person = new KasPerson(
+                var person = new KasPerson(KasPerson.GenerateNewID(imported.KasPersons.Count), refsid,
-                    new_refsid,
                     GetField("anrede"),
                     GetField("titel"),
                     GetField("vorname"),
@@ -224,23 +223,17 @@ public class DataImport
 
         return (true, imported);
 
-        int GenerateNewRefsid()
+        // int GenerateNewRefsid()
-        {
+        // {
-
+        //     var biggest = last_refsid;
-            int biggest = last_refsid;
+        //     foreach (var set in Settings._instance.addressSets.addresses)
-            foreach (var set in Settings._instance.addressSets.addresses)
+        //     foreach (var address in set.KasPersons)
-            {
+        //         if (biggest < address.id)
-                foreach (var address in set.KasPersons)
+        //             biggest = address.id + 1;
-                {
+        //
-                    if (biggest < address.refsid)
+        //     last_refsid = biggest + 1;
-                    {
+        //     return last_refsid;
-                        biggest = address.refsid+1;
+        // }
-                    }
-                }
-            }
-            last_refsid = biggest+1;
-            return last_refsid;
-        }
     }
 
 

DataStructures.cs

@@ -62,6 +62,7 @@ public class KasPerson
 
     public KasPerson()
     {
+        id = GenerateNewID(0);
         refsid = 0;
         anrede = "";
         titel = "";
@@ -88,7 +89,7 @@ public class KasPerson
         funktionad = "";
     }
 
-    public KasPerson(int refsid,
+    public KasPerson(int id, int refsid,
         string anrede,
         string titel,
         string vorname,
@@ -113,6 +114,7 @@ public class KasPerson
         string abteilung,
         string funktionad)
     {
+        this.id = id;
         this.refsid = refsid;
         this.anrede = anrede;
         this.titel = titel;
@@ -139,6 +141,7 @@ public class KasPerson
         this.funktionad = funktionad;
     }
 
+    public int id { get; set; }
     public int refsid { get; set; }
     public string anrede { get; set; }
     public string titel { get; set; }
@@ -163,6 +166,17 @@ public class KasPerson
     public string funktion2 { get; set; }
     public string abteilung { get; set; }
     public string funktionad { get; set; }
+
+    public static int GenerateNewID(int base_id)
+    {
+        var newid = 100000 + base_id;
+        foreach (var set in Settings._instance.addressSets.addresses)
+        foreach (var add in set.KasPersons)
+            if (add.id >= newid)
+                newid = add.id + 1;
+
+        return newid;
+    }
 }
 
 public class KasPersonError

ResultWindow.axaml.cs

@@ -46,13 +46,13 @@ public partial class ResultWindow : Window
             Background = new SolidColorBrush(Color.Parse("#F0F0F0"))
         };
 
-        // Refsid
+        // ID
         grid.Children.Add(new TextBlock
         {
-            Text = "refsid: ",
+            Text = "id: ",
             FontWeight = FontWeight.Bold, Margin = new Thickness(5)
         });
-        grid.Children.Add(new TextBlock { Text = person.refsid.ToString(), Margin = new Thickness(5) });
+        grid.Children.Add(new TextBlock { Text = person.id.ToString(), Margin = new Thickness(5) });
         Grid.SetColumn(grid.Children[1], 1);
 
         // PLZ
@@ -70,10 +70,10 @@ public partial class ResultWindow : Window
         return grid;
     }
 
-    private void ViewSingle(int refsid)
+    private void ViewSingle(int id)
     {
         foreach (var result in ur_addresses.KasPersons)
-            if (result.refsid == refsid)
+            if (result.id == id)
             {
                 var wind = new Window();
                 var stp = new StackPanel();
@@ -82,8 +82,8 @@ public partial class ResultWindow : Window
                 var tb = new TextBlock();
                 var tb2 = new TextBlock();
                 tb.Text =
-                    "refsid:\nanrede:\ntitel:\nvorname:\nadel:\nname:\nnamezus:\nanredzus:\nstrasse:\nstrasse2:\nplz:\nort:\nland:\npplz:\npostfach:\nname1:\nname2:\nname3:\nname4:\nname5:\nfunktion:\nfunktion2:\nabteilung:\nfunktionad:";
+                    "id:\nanrede:\ntitel:\nvorname:\nadel:\nname:\nnamezus:\nanredzus:\nstrasse:\nstrasse2:\nplz:\nort:\nland:\npplz:\npostfach:\nname1:\nname2:\nname3:\nname4:\nname5:\nfunktion:\nfunktion2:\nabteilung:\nfunktionad:";
-                tb2.Text = result.refsid + "\n" + result.anrede + "\n" + result.titel + "\n" + result.vorname + "\n" +
+                tb2.Text = result.id + "\n" + result.anrede + "\n" + result.titel + "\n" + result.vorname + "\n" +
                            result.adel + "\n" + result.name + "\n" + result.namezus + "\n" + result.anredzus + "\n" +
                            result.strasse + "\n" + result.strasse2 + "\n" + result.plz + "\n" + result.ort + "\n" +
                            result.land + "\n" + result.pplz + "\n" + result.postfach + "\n" + result.name1 + "\n" +
@@ -212,7 +212,7 @@ public partial class ResultWindow : Window
         //     try
         //     {
         //         var _asKas = (KasPerson)selected;
-        //         ViewSingle(_asKas.refsid);
+        //         ViewSingle(_asKas.id);
         //     }
         //     catch (Exception ex)
         //     {

Tasks/AddressCheck.cs

@@ -247,7 +247,7 @@ public class AddressCheck
                 await Dispatcher.UIThread.InvokeAsync(() =>
                 {
                     if (hasFaults)
-                                _progress.AddToLog($"Person mit refsid {person.refsid} ist fehlerhaft");
+                        _progress.AddToLog($"Person mit id {person.id} ist fehlerhaft");
 
                     _progress.ChangePercentage(percent);
                 });

Tasks/AddressCreation.cs

@@ -40,7 +40,7 @@ public static class AddressCreator
     /// </summary>
     /// <param name="refsid">KasPerson-ID</param>
     /// <returns>A Markdown string with the address that is maximum seven lines long</returns>
-    public static string? CreateFinalMarkdownString(int refsid)
+    public static string? CreateFinalMarkdownString(int id)
     {
         // Maximum seven lines of information
 
@@ -50,7 +50,7 @@ public static class AddressCreator
         var address_line_count = 0;
         foreach (var set in Settings._instance.addressSets.addresses)
         {
-            var temp = set.KasPersons.FirstOrDefault(obj => obj.refsid == refsid);
+            var temp = set.KasPersons.FirstOrDefault(obj => obj.id == id);
             if (temp != null)
             {
                 address = temp;

Tasks/CombineAddresses.cs

@@ -16,7 +16,8 @@ public class CombineAddresses
         _progress = progressWindow;
     }
 
-    public async Task<(KasAddressList,KasAddressList)> Perform(List<KasAddressList> address_lists, string type, bool? exportUnused)
+    public async Task<(KasAddressList, KasAddressList)> Perform(List<KasAddressList> address_lists, string type,
+        bool? exportUnused)
     {
         var res = await Task.Run(async () =>
         {
@@ -48,7 +49,7 @@ public class CombineAddresses
         //             }
         // });
         // return result;
-        return (null,null);
+        return (null, null);
     }
 
 
@@ -91,11 +92,12 @@ public class CombineAddresses
         return false;
     }
 
-    public async Task<(KasAddressList,KasAddressList)> Difference(List<KasAddressList> address_lists, bool? return_unused,
+    public async Task<(KasAddressList, KasAddressList)> Difference(List<KasAddressList> address_lists,
+        bool? return_unused,
         Progress? progress = null)
     {
         if (address_lists == null || address_lists.Count == 0)
-            return (new KasAddressList(KasAddressList.GenerateName("difference")),null);
+            return (new KasAddressList(KasAddressList.GenerateName("difference")), null);
 
         progress ??= new Progress
         {
@@ -122,21 +124,23 @@ public class CombineAddresses
             progress.Increment();
             if (progress.LogAction == null) continue;
             var logMessage =
-                $"Person mit refsid {person.refsid} verglichen mit {restUnion.Count} Personen des Restes.";
+                $"Person mit id {person.id} verglichen mit {restUnion.Count} Personen des Restes.";
             await Dispatcher.UIThread.InvokeAsync(() => progress.LogAction?.Invoke(logMessage));
         }
-        if(return_unused == true) return (result,second_result);
+
-        else return (result, null);
+        if (return_unused == true) return (result, second_result);
+        return (result, null);
     }
 
 
-    public async Task<(KasAddressList,KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
+    public async Task<(KasAddressList, KasAddressList)> Union(List<KasAddressList> address_lists, bool? return_unused,
+        Progress progress = null)
     {
         var result = new KasAddressList(KasAddressList.GenerateName("union"));
         var second_result = new KasAddressList(KasAddressList.GenerateName("union_rest"));
 
         if (address_lists == null || address_lists.Count == 0)
-            return (result,null);
+            return (result, null);
 
         var total = address_lists.Sum(l => l.KasPersons.Count);
         var processed = 0;
@@ -152,7 +156,7 @@ public class CombineAddresses
             processed++;
             var percent = processed / (double)total * 100;
             var logMessage =
-                $"{percent:F1}%: Person mit {person.refsid} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
+                $"{percent:F1}%: Person mit {person.id} hinzugefügt (aktuell {result.KasPersons.Count} Einträge)";
 
             if (progress == null) continue;
             if (Dispatcher.UIThread.CheckAccess())
@@ -161,8 +165,8 @@ public class CombineAddresses
                 Dispatcher.UIThread.Post(() => progress.LogAction?.Invoke(logMessage));
         }
 
-        if(return_unused == true) return (result,second_result);
+        if (return_unused == true) return (result, second_result);
-        else return (result, null);
+        return (result, null);
     }
 
 
@@ -171,13 +175,14 @@ public class CombineAddresses
         return null;
     }
 
-    public async Task<(KasAddressList,KasAddressList)> Intersection(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
+    public async Task<(KasAddressList, KasAddressList)> Intersection(List<KasAddressList> address_lists,
+        bool? return_unused, Progress progress = null)
     {
         var result = new KasAddressList(KasAddressList.GenerateName("intersection"));
         var second_result = new KasAddressList(KasAddressList.GenerateName("intersection_rest"));
 
         if (address_lists == null || address_lists.Count == 0)
-            return (result,null);
+            return (result, null);
 
         // Nur die erste Liste als Ausgangspunkt verwenden
         var baseList = address_lists[0];
@@ -200,7 +205,7 @@ public class CombineAddresses
             processed++;
             var percent = processed / (double)total * 100;
             var logMessage =
-                $"{percent:F1}%: Person mit {person.refsid} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
+                $"{percent:F1}%: Person mit {person.id} geprüft – {(isInAll ? "in allen enthalten" : "nicht überall vorhanden")}";
 
             // Sicher und nicht blockierend loggen
             if (progress != null)
@@ -212,12 +217,13 @@ public class CombineAddresses
             }
         }
 
-        if(return_unused == true) return (result,second_result);
+        if (return_unused == true) return (result, second_result);
-        else return (result, null);
+        return (result, null);
     }
 
 
-    public async Task<(KasAddressList,KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists, bool? return_unused, Progress progress = null)
+    public async Task<(KasAddressList, KasAddressList)> SymmetricDifference(List<KasAddressList> address_lists,
+        bool? return_unused, Progress progress = null)
     {
         var result = new KasAddressList(KasAddressList.GenerateName("symmetric_difference"));
         var second_result = new KasAddressList(KasAddressList.GenerateName("symmetric_rest"));
@@ -251,7 +257,7 @@ public class CombineAddresses
             processed++;
             var percent = processed / (double)total * 100;
             var logMessage =
-                $"{percent:F1}%: Person mit {person.refsid} verarbeitet (Zwischengröße {allPersons.Count})";
+                $"{percent:F1}%: Person mit {person.id} verarbeitet (Zwischengröße {allPersons.Count})";
 
             if (progress != null)
             {
@@ -269,8 +275,8 @@ public class CombineAddresses
             else
                 second_result.KasPersons.Add(person);
 
-        if(return_unused == true) return (result,second_result);
+        if (return_unused == true) return (result, second_result);
-        else return (result, null);
+        return (result, null);
     }
 
 

Tasks/PdfBuilder.cs

@@ -72,7 +72,7 @@ public class PdfBuilder
 
         for (var i = 0; i < addressSet.KasPersons.Count; i++)
         {
-            var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].refsid);
+            var addr = AddressCreator.CreateFinalMarkdownString(addressSet.KasPersons[i].id);
             if (string.IsNullOrWhiteSpace(addr)) continue;
             if (!string.IsNullOrEmpty(senderLine))
                 addresses.Add(senderLine + (addr ?? ""));