From db5f6dbef0a8f2feb9dbd4e4f7d28d823da338b7 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Fri, 14 Jul 2023 00:15:46 +0200
Subject: [PATCH] Use CountryCode as PK

---
 Elwig/Models/AT_PlzDest.cs              | 4 ++--
 Elwig/Models/BillingAddr.cs             | 6 +++---
 Elwig/Models/Country.cs                 | 8 ++++----
 Elwig/Models/Member.cs                  | 6 +++---
 Elwig/Models/PostalDest.cs              | 6 +++---
 Elwig/Windows/MemberAdminWindow.xaml.cs | 4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Elwig/Models/AT_PlzDest.cs b/Elwig/Models/AT_PlzDest.cs
index 1ef4fd8..d080829 100644
--- a/Elwig/Models/AT_PlzDest.cs
+++ b/Elwig/Models/AT_PlzDest.cs
@@ -11,7 +11,7 @@ namespace Elwig.Models {
         public int Okz { get; private set; }
 
         [Column("country")]
-        public string CountryCode { get; private set; }
+        public int CountryNum { get; private set; }
 
         [Column("id")]
         public string Id { get; private set;  }
@@ -25,7 +25,7 @@ namespace Elwig.Models {
         [ForeignKey("Okz")]
         public virtual AT_Ort Ort { get; private set; }
 
-        [ForeignKey("CountryCode")]
+        [ForeignKey("CountryNum")]
         public virtual Country Country { get; private set; }
     }
 }
diff --git a/Elwig/Models/BillingAddr.cs b/Elwig/Models/BillingAddr.cs
index d092133..50bab08 100644
--- a/Elwig/Models/BillingAddr.cs
+++ b/Elwig/Models/BillingAddr.cs
@@ -11,7 +11,7 @@ namespace Elwig.Models {
         public string Name { get; set; }
 
         [Column("country")]
-        public string CountryCode { get; set; }
+        public int CountryNum { get; set; }
 
         [Column("postal_dest")]
         public string PostalDestId { get; set; }
@@ -22,10 +22,10 @@ namespace Elwig.Models {
         [ForeignKey("MgNr")]
         public virtual Member Member { get; private set; }
 
-        [ForeignKey("CountryCode")]
+        [ForeignKey("CountryNum")]
         public virtual Country Country { get; private set; }
 
-        [ForeignKey("CountryCode, PostalDestId")]
+        [ForeignKey("CountryNum, PostalDestId")]
         public virtual PostalDest PostalDest { get; private set; }
     }
 }
diff --git a/Elwig/Models/Country.cs b/Elwig/Models/Country.cs
index b061f17..9134a95 100644
--- a/Elwig/Models/Country.cs
+++ b/Elwig/Models/Country.cs
@@ -2,17 +2,17 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models {
-    [Table("country"), PrimaryKey("Alpha2")]
+    [Table("country"), PrimaryKey("Num"), Index("Alpha2", IsUnique = true), Index("Alpha3", IsUnique = true)]
     public class Country {
+        [Column("num")]
+        public int Num { get; private set; }
+
         [Column("alpha2")]
         public string Alpha2 { get; private set; }
 
         [Column("alpha3")]
         public string Alpha3 { get; private set; }
 
-        [Column("num")]
-        public int Num { get; private set; }
-
         [Column("name")]
         public string Name { get; private set; }
 
diff --git a/Elwig/Models/Member.cs b/Elwig/Models/Member.cs
index cd89124..675331a 100644
--- a/Elwig/Models/Member.cs
+++ b/Elwig/Models/Member.cs
@@ -117,7 +117,7 @@ namespace Elwig.Models {
         public string? Bic { get; set; }
 
         [Column("country")]
-        public string CountryCode { get; set; }
+        public int CountryNum { get; set; }
 
         [Column("postal_dest")]
         public string PostalDestId { get; set; }
@@ -143,10 +143,10 @@ namespace Elwig.Models {
         [ForeignKey("PredecessorMgNr")]
         public virtual Member? Predecessor { get; private set; }
 
-        [ForeignKey("CountryCode")]
+        [ForeignKey("CountryNum")]
         public virtual Country Country { get; private set; }
 
-        [ForeignKey("CountryCode, PostalDestId")]
+        [ForeignKey("CountryNum, PostalDestId")]
         public virtual PostalDest PostalDest { get; private set; }
 
         [ForeignKey("DefaultKgNr")]
diff --git a/Elwig/Models/PostalDest.cs b/Elwig/Models/PostalDest.cs
index b27b71e..82374f1 100644
--- a/Elwig/Models/PostalDest.cs
+++ b/Elwig/Models/PostalDest.cs
@@ -2,15 +2,15 @@ using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Elwig.Models {
-    [Table("postal_dest"), PrimaryKey("CountryCode", "Id")]
+    [Table("postal_dest"), PrimaryKey("CountryNum", "Id")]
     public class PostalDest {
         [Column("country")]
-        public string CountryCode { get; private set; }
+        public int CountryNum { get; private set; }
 
         [Column("id")]
         public string Id { get; private set; }
 
-        [ForeignKey("CountryCode")]
+        [ForeignKey("CountryNum")]
         public virtual Country Country { get; private set; }
 
         [ForeignKey("Id")]
diff --git a/Elwig/Windows/MemberAdminWindow.xaml.cs b/Elwig/Windows/MemberAdminWindow.xaml.cs
index d5bf34c..1a705e7 100644
--- a/Elwig/Windows/MemberAdminWindow.xaml.cs
+++ b/Elwig/Windows/MemberAdminWindow.xaml.cs
@@ -329,7 +329,7 @@ namespace Elwig.Windows {
             m.FamilyName = FamilyNameInput.Text;
             m.Suffix = (SuffixInput.Text == "") ? null : SuffixInput.Text;
             m.Birthday = (BirthdayInput.Text == "") ? null : string.Join("-", BirthdayInput.Text.Split(".").Reverse());
-            m.CountryCode = "AT";
+            m.CountryNum = 40;  // Austria AT AUT
             m.PostalDestId = ((AT_PlzDest)OrtInput.SelectedItem).Id;
             m.Address = AddressInput.Text;
 
@@ -373,7 +373,7 @@ namespace Elwig.Windows {
                     b.Name = BillingNameInput.Text;
                     b.Address = BillingAddressInput.Text;
                     var p = (AT_PlzDest)BillingOrtInput.SelectedItem;
-                    b.CountryCode = p.CountryCode;
+                    b.CountryNum = p.CountryNum;
                     b.PostalDestId = p.Id;
                     if (m.BillingAddress == null) {
                         b.MgNr = newMgNr;