From 912206f52d6285efbcaf5b2fd89ff465b82b6c56 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Tue, 13 Feb 2024 11:29:23 +0100 Subject: [PATCH] Tests: Update DatabaseSetup --- Elwig/App.xaml.cs | 35 ++++++++--------- Tests/DatabaseSetup.cs | 1 + Tests/Resources/Sql/Insert.sql | 71 +++++++++++++++++----------------- 3 files changed, 54 insertions(+), 53 deletions(-) diff --git a/Elwig/App.xaml.cs b/Elwig/App.xaml.cs index 4881bbf..54d6490 100644 --- a/Elwig/App.xaml.cs +++ b/Elwig/App.xaml.cs @@ -141,26 +141,10 @@ namespace Elwig { MessageBox.Show("Invalid branch name in config!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error); Shutdown(); } else { - var entry = branches[Config.Branch.ToLower()]; - ZwstId = entry.Item1; - BranchName = entry.Item2; - BranchPlz = entry.Item3; - BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0]; // FIXME - BranchAddress = entry.Item5; - BranchPhoneNr = entry.Item6; - BranchFaxNr = entry.Item7; - BranchMobileNr = entry.Item8; + SetBranch(branches[Config.Branch.ToLower()]); } } else if (branches.Count == 1) { - var entry = branches.First().Value; - ZwstId = entry.Item1; - BranchName = entry.Item2; - BranchPlz = entry.Item3; - BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0]; // FIXME - BranchAddress = entry.Item5; - BranchPhoneNr = entry.Item6; - BranchFaxNr = entry.Item7; - BranchMobileNr = entry.Item8; + SetBranch(branches.First().Value); } else { MessageBox.Show("Unable to determine local branch!", "Invalid Branch Config", MessageBoxButton.OK, MessageBoxImage.Error); Shutdown(); @@ -169,6 +153,21 @@ namespace Elwig { base.OnStartup(evt); } + public static void SetBranch(Branch b) { + SetBranch((b.ZwstId, b.Name, b.PostalDest?.AtPlz?.Plz, b.PostalDest?.AtPlz?.Ort.Name, b.Address, b.PhoneNr, b.FaxNr, b.MobileNr)); + } + + private static void SetBranch((string, string, int?, string?, string?, string?, string?, string?) entry) { + ZwstId = entry.Item1; + BranchName = entry.Item2; + BranchPlz = entry.Item3; + BranchLocation = entry.Item4?.Split(" im ")[0].Split(" an ")[0].Split(" bei ")[0]; // FIXME + BranchAddress = entry.Item5; + BranchPhoneNr = entry.Item6; + BranchFaxNr = entry.Item7; + BranchMobileNr = entry.Item8; + } + private void PrintingReadyChanged() { Dispatcher.BeginInvoke(OnPrintingReadyChanged, new EventArgs()); } diff --git a/Tests/DatabaseSetup.cs b/Tests/DatabaseSetup.cs index 632bc45..8ae3865 100644 --- a/Tests/DatabaseSetup.cs +++ b/Tests/DatabaseSetup.cs @@ -22,6 +22,7 @@ namespace Tests { public void Setup_2_Client() { using var ctx = new AppDbContext(); App.Client = new ClientParameters(ctx); + App.SetBranch(ctx.Branches.Single()); } [OneTimeSetUp] diff --git a/Tests/Resources/Sql/Insert.sql b/Tests/Resources/Sql/Insert.sql index 2539f0f..f2ebd5a 100644 --- a/Tests/Resources/Sql/Insert.sql +++ b/Tests/Resources/Sql/Insert.sql @@ -1,31 +1,9 @@ -- inserts for DatabaseSetup -INSERT INTO client_parameter (param, value) VALUES -('CLIENT_NAME_TOKEN', 'WGT'), -('CLIENT_NAME_SHORT', 'WG Test'), -('CLIENT_NAME', 'Winzergenossenschaft Test'), -('CLIENT_NAME_SUFFIX', NULL), -('CLIENT_NAME_TYPE', 'reg.Gen.m.b.H.'), -('CLIENT_PLZ', '1234'), -('CLIENT_ORT', 'Musterstadt'), -('CLIENT_ADDRESS', 'Musterstraße 1'), -('CLIENT_IBAN', 'AT12 3456 7890 1234 5678'); - -INSERT INTO branch (zwstid, name) VALUES -('X', 'Test'); - -INSERT INTO wb_gl (glnr, name) VALUES -(1, 'Matzner Hügel'), -(2, 'Wolkersdorfer Hochleithen'); - INSERT INTO AT_gem (gkz, name) VALUES (30828, 'Hohenruppersdorf'), (31655, 'Wolkersdorf im Weinviertel'); -INSERT INTO wb_gem (gkz, hkid) VALUES -(30828, 'WLWV'), -(31655, 'WLWV'); - INSERT INTO AT_kg (kgnr, gkz, name) VALUES (06109, 30828, 'Hohenruppersdorf'), (15209, 31655, 'Münichsthal'), @@ -34,14 +12,6 @@ INSERT INTO AT_kg (kgnr, gkz, name) VALUES (15216, 31655, 'Riedentahl'), (15224, 31655, 'Wolkersdorf'); -INSERT INTO wb_kg (kgnr, glnr) VALUES -(06109, 1), -(15209, 2), -(15211, 2), -(15212, 2), -(15216, 2), -(15224, 2); - INSERT INTO AT_ort (okz, gkz, kgnr, name) VALUES (03524, 30828, 06109, 'Hohenruppersdorf'), (05092, 31655, 15211, 'Obersdorf'), @@ -63,11 +33,42 @@ INSERT INTO AT_plz_dest (plz, okz, dest) VALUES (2122, 05136, 'Pfösing'), (2122, 05137, 'Riedenthal'); -INSERT INTO member (mgnr, given_name, family_name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban) VALUES -(101, 'Max', 'Mustermann', 'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 1', 06109, 'AT123456789012345678'), -(102, 'Wernhardt', 'Weinbauer', 'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 2', 06109, 'AT123456789012345678'), -(103, 'Matthäus', 'Musterbauer', 'X', FALSE, FALSE, 40, 212005138, 'Brünner Straße 10', 15224, 'AT123456789012345678'), -(104, 'Waltraud', 'Winzer', 'X', FALSE, FALSE, 40, 212005138, 'Wiener Straße 15', 15224, 'AT123456789012345678'); +INSERT INTO client_parameter (param, value) VALUES +('CLIENT_NAME_TOKEN', 'WGT'), +('CLIENT_NAME_SHORT', 'WG Test'), +('CLIENT_NAME', 'Winzergenossenschaft Test'), +('CLIENT_NAME_SUFFIX', NULL), +('CLIENT_NAME_TYPE', 'reg.Gen.m.b.H.'), +('CLIENT_PLZ', '2120'), +('CLIENT_ORT', 'Wolkersdorf'), +('CLIENT_ADDRESS', 'Genossenschaftsstraße 1'), +('CLIENT_IBAN', 'AT12 3456 7890 1234 5678'), +('TEXT_DELIVERYNOTE', 'Ich bin der Text, der auf einem Traubenübernahmeschein steht!'); + +INSERT INTO branch (zwstid, name, country, postal_dest, address) VALUES +('X', 'Test', 40, 212005138, 'Genossenschaftsstraße 1'); + +INSERT INTO wb_gl (glnr, name) VALUES +(1, 'Matzner Hügel'), +(2, 'Wolkersdorfer Hochleithen'); + +INSERT INTO wb_gem (gkz, hkid) VALUES +(30828, 'WLWV'), +(31655, 'WLWV'); + +INSERT INTO wb_kg (kgnr, glnr) VALUES +(06109, 1), +(15209, 2), +(15211, 2), +(15212, 2), +(15216, 2), +(15224, 2); + +INSERT INTO member (mgnr, given_name, family_name, zwstid, volllieferant, buchführend, country, postal_dest, address, default_kgnr, iban, lfbis_nr) VALUES +(101, 'Max', 'Mustermann', 'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 1', 06109, 'AT123456789012345678', '1472583'), +(102, 'Wernhardt', 'Weinbauer', 'X', FALSE, FALSE, 40, 222303524, 'Winzerstraße 2', 06109, 'AT123456789012345678', '4725836'), +(103, 'Matthäus', 'Musterbauer', 'X', FALSE, FALSE, 40, 212005138, 'Brünner Straße 10', 15224, 'AT123456789012345678', '7258369'), +(104, 'Waltraud', 'Winzer', 'X', FALSE, FALSE, 40, 212005138, 'Wiener Straße 15', 15224, 'AT123456789012345678', '2583691'); INSERT INTO member_billing_address (mgnr, name, country, postal_dest, address) VALUES (102, 'W&B Weinbauer GesbR', 40, 222303524, 'Winzerstraße 2'),