From d210d3ba33c0c871a5d19816276e42175de6404f Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <22748698+fhdk@users.noreply.github.com>
Date: Sun, 29 May 2022 13:40:06 +0200
Subject: [PATCH] public v0.2.44-beta

---
 Wonky.Client/Components/AppVersion.razor      | 2 +-
 Wonky.Client/Models/VatAddress.cs             | 6 +++---
 Wonky.Client/Pages/CompanyUpdate.razor.cs     | 7 ++++---
 Wonky.Client/Services/VatInfoLookupService.cs | 9 +++++----
 Wonky.Client/wwwroot/appsettings.json         | 2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/Wonky.Client/Components/AppVersion.razor b/Wonky.Client/Components/AppVersion.razor
index db7ba224..4be7a093 100644
--- a/Wonky.Client/Components/AppVersion.razor
+++ b/Wonky.Client/Components/AppVersion.razor
@@ -17,7 +17,7 @@
 <span class="version">@Name</span> <span class="version">@Version</span>@if(IsBeta){<span class="version">-beta</span>}
 @code
 {
-    private const string Version = "0.2.43";
+    private const string Version = "0.2.44";
     private const string Name = "wwo";
     private const bool IsBeta = true;
 }
diff --git a/Wonky.Client/Models/VatAddress.cs b/Wonky.Client/Models/VatAddress.cs
index 28eeb170..2cc311c3 100644
--- a/Wonky.Client/Models/VatAddress.cs
+++ b/Wonky.Client/Models/VatAddress.cs
@@ -4,7 +4,7 @@ namespace Wonky.Client.Models;
 
 public class VatAddress
 {
-    [Required] public string? StreetName { get; set; }
-    [Required] public string? HouseNumber { get; set; }
-    [Required] public string? ZipCode { get; set; }
+    [Required] public string StreetName { get; set; } = "";
+    [Required] public string HouseNumber { get; set; } = "";
+    [Required] public string ZipCode { get; set; } = "";
 }
\ No newline at end of file
diff --git a/Wonky.Client/Pages/CompanyUpdate.razor.cs b/Wonky.Client/Pages/CompanyUpdate.razor.cs
index 3905bc8d..e8271aab 100644
--- a/Wonky.Client/Pages/CompanyUpdate.razor.cs
+++ b/Wonky.Client/Pages/CompanyUpdate.razor.cs
@@ -15,6 +15,7 @@
 
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
 using Blazored.LocalStorage;
 using Blazored.Toast.Services;
 using Wonky.Client.HttpInterceptors;
@@ -91,7 +92,7 @@ public partial class CompanyUpdate : IDisposable
             {
                 ZipCode = DtoNgCompany.ZipCode,
                 StreetName = DtoNgCompany.Address1[..pos1],
-                HouseNumber = DtoNgCompany.Address1[pos1..]
+                HouseNumber = Regex.Replace(DtoNgCompany.Address1[pos1..], "[^0-9]", "")
             };
         }
         var pos2 = DtoNgCompany.Address2.IndexOfAny(digits);
@@ -101,7 +102,7 @@ public partial class CompanyUpdate : IDisposable
             {
                 ZipCode = DtoNgCompany.ZipCode,
                 StreetName = DtoNgCompany.Address2[..pos2],
-                HouseNumber = DtoNgCompany.Address2[pos2..]
+                HouseNumber = Regex.Replace(DtoNgCompany.Address2[pos2..], "[^0-9]", "")
             };
         }
         return vatAddress;
@@ -135,7 +136,7 @@ public partial class CompanyUpdate : IDisposable
             .QueryVirkRegistry(
                 new VirkParams
                 {
-                    VatNumber = vatNumber
+                    VatNumber = vatNumber.Trim()
                 });
         if (string.IsNullOrWhiteSpace(VInfos[0].VatNumber))
         {
diff --git a/Wonky.Client/Services/VatInfoLookupService.cs b/Wonky.Client/Services/VatInfoLookupService.cs
index c1df70bc..32db088a 100644
--- a/Wonky.Client/Services/VatInfoLookupService.cs
+++ b/Wonky.Client/Services/VatInfoLookupService.cs
@@ -13,6 +13,7 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 //
 
+using System.Text.Encodings.Web;
 using System.Text.Json;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
@@ -43,10 +44,10 @@ public class VatInfoLookupService
         }
         var queryString = new Dictionary<string, string>
         {
-            ["vatNumber"] = query.VatNumber,
-            ["streetName"] = query.StreetName,
-            ["houseNumber"] = query.HouseNumber,
-            ["zipCode"] = query.ZipCode
+            ["vatNumber"] = $"{query.VatNumber}",
+            ["streetName"] = $"{query.StreetName}",
+            ["houseNumber"] = $"{query.HouseNumber}",
+            ["zipCode"] = $"{query.ZipCode}"
         };
         var endpoint = QueryHelpers.AddQueryString(_apiConfig.Value.CvrLookup, queryString);
         var response = await _client.GetAsync(endpoint);
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index 571b106b..895f21b0 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -7,7 +7,7 @@
         }
     },
     "apiConfig": {
-        "baseAddress": "https://app.innotec.dk",
+        "baseAddress": "https://staging.innotec.dk",
         "tokenPath": "token",
         "userInfo": "api/auth/userinfo",
         "customerEndpoint": "api/v2/crm/companies",