From 60c4a86deb1154fb65b5af8d26b1bebd707face9 Mon Sep 17 00:00:00 2001
From: FH <fh@uex.dk>
Date: Mon, 4 Jul 2022 18:27:52 +0200
Subject: [PATCH] update

---
 FCS.Lib.Virk.csproj                                            | 2 +-
 Models/LivsforloebModel.cs => LivsforloebModel.cs              | 2 +-
 ...yesteBeliggenhedsadresse.cs => NyesteBeliggenhedsadresse.cs | 2 +-
 Models/NyesteNavn.cs => NyesteNavn.cs                          | 2 +-
 Models/Periode.cs => Periode.cs                                | 2 +-
 Models/VirksomhedMetadata.cs => VirksomhedMetadata.cs          | 2 +-
 Models/VirksomhedsStatus.cs => VirksomhedsStatus.cs            | 2 +-
 VrQueryValidator.cs                                            | 3 ++-
 VrResponseParser.cs                                            | 1 -
 VrVatInfoMapper.cs                                             | 1 -
 Models/VrVirksomhed.cs => VrVirksomhed.cs                      | 2 +-
 11 files changed, 10 insertions(+), 11 deletions(-)
 rename Models/LivsforloebModel.cs => LivsforloebModel.cs (97%)
 rename Models/NyesteBeliggenhedsadresse.cs => NyesteBeliggenhedsadresse.cs (98%)
 rename Models/NyesteNavn.cs => NyesteNavn.cs (97%)
 rename Models/Periode.cs => Periode.cs (97%)
 rename Models/VirksomhedMetadata.cs => VirksomhedMetadata.cs (97%)
 rename Models/VirksomhedsStatus.cs => VirksomhedsStatus.cs (97%)
 rename Models/VrVirksomhed.cs => VrVirksomhed.cs (98%)

diff --git a/FCS.Lib.Virk.csproj b/FCS.Lib.Virk.csproj
index 488e0bf..7439ed5 100644
--- a/FCS.Lib.Virk.csproj
+++ b/FCS.Lib.Virk.csproj
@@ -11,7 +11,7 @@
     <FileVersion>1.0.0.100</FileVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NewtonSoft.Json" Version="13.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\fcs-common\FCS.Lib.Common.csproj" />
diff --git a/Models/LivsforloebModel.cs b/LivsforloebModel.cs
similarity index 97%
rename from Models/LivsforloebModel.cs
rename to LivsforloebModel.cs
index f2fdaf3..df3a28a 100644
--- a/Models/LivsforloebModel.cs
+++ b/LivsforloebModel.cs
@@ -23,7 +23,7 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-namespace FCS.Lib.Virk.Models
+namespace FCS.Lib.Virk
 {
     public class LivsforloebModel
     {
diff --git a/Models/NyesteBeliggenhedsadresse.cs b/NyesteBeliggenhedsadresse.cs
similarity index 98%
rename from Models/NyesteBeliggenhedsadresse.cs
rename to NyesteBeliggenhedsadresse.cs
index 445d3c8..39a7602 100644
--- a/Models/NyesteBeliggenhedsadresse.cs
+++ b/NyesteBeliggenhedsadresse.cs
@@ -23,7 +23,7 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-namespace FCS.Lib.Virk.Models
+namespace FCS.Lib.Virk
 {
     public class NyesteBeliggenhedsadresse
     {
diff --git a/Models/NyesteNavn.cs b/NyesteNavn.cs
similarity index 97%
rename from Models/NyesteNavn.cs
rename to NyesteNavn.cs
index bb581d9..db8b634 100644
--- a/Models/NyesteNavn.cs
+++ b/NyesteNavn.cs
@@ -24,7 +24,7 @@
 // <summary></summary>
 // ***********************************************************************
 
-namespace FCS.Lib.Virk.Models
+namespace FCS.Lib.Virk
 {
     public class NyesteNavn
     {
diff --git a/Models/Periode.cs b/Periode.cs
similarity index 97%
rename from Models/Periode.cs
rename to Periode.cs
index a590be0..370eb88 100644
--- a/Models/Periode.cs
+++ b/Periode.cs
@@ -23,7 +23,7 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-namespace FCS.Lib.Virk.Models
+namespace FCS.Lib.Virk
 {
     public class Periode
     {
diff --git a/Models/VirksomhedMetadata.cs b/VirksomhedMetadata.cs
similarity index 97%
rename from Models/VirksomhedMetadata.cs
rename to VirksomhedMetadata.cs
index d0e8764..c5b01af 100644
--- a/Models/VirksomhedMetadata.cs
+++ b/VirksomhedMetadata.cs
@@ -23,7 +23,7 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-namespace FCS.Lib.Virk.Models
+namespace FCS.Lib.Virk
 {
     public class VirksomhedMetadata
     {
diff --git a/Models/VirksomhedsStatus.cs b/VirksomhedsStatus.cs
similarity index 97%
rename from Models/VirksomhedsStatus.cs
rename to VirksomhedsStatus.cs
index cf31b65..d968c12 100644
--- a/Models/VirksomhedsStatus.cs
+++ b/VirksomhedsStatus.cs
@@ -23,7 +23,7 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-namespace FCS.Lib.Virk.Models
+namespace FCS.Lib.Virk
 {
     public class VirksomhedsStatus
     {
diff --git a/VrQueryValidator.cs b/VrQueryValidator.cs
index 6a9c804..a717db8 100644
--- a/VrQueryValidator.cs
+++ b/VrQueryValidator.cs
@@ -36,7 +36,8 @@ namespace FCS.Lib.Virk
                 // Search lookup
                 return !string.IsNullOrWhiteSpace(query.StreetName)
                        && !string.IsNullOrWhiteSpace(query.HouseNumber)
-                       && !string.IsNullOrWhiteSpace(query.ZipCode);
+                       && !string.IsNullOrWhiteSpace(query.ZipCode)
+                       && int.TryParse(query.HouseNumber, out _);
             }
             catch
             {
diff --git a/VrResponseParser.cs b/VrResponseParser.cs
index 990acc1..1eeca15 100644
--- a/VrResponseParser.cs
+++ b/VrResponseParser.cs
@@ -24,7 +24,6 @@
 // <summary></summary>
 // ***********************************************************************
 
-using FCS.Lib.Virk.Models;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
diff --git a/VrVatInfoMapper.cs b/VrVatInfoMapper.cs
index a497329..f14ea05 100644
--- a/VrVatInfoMapper.cs
+++ b/VrVatInfoMapper.cs
@@ -25,7 +25,6 @@
 // ***********************************************************************
 
 using FCS.Lib.Common;
-using FCS.Lib.Virk.Models;
 
 namespace FCS.Lib.Virk
 {
diff --git a/Models/VrVirksomhed.cs b/VrVirksomhed.cs
similarity index 98%
rename from Models/VrVirksomhed.cs
rename to VrVirksomhed.cs
index 5002498..e600452 100644
--- a/Models/VrVirksomhed.cs
+++ b/VrVirksomhed.cs
@@ -23,7 +23,7 @@
 // </copyright>
 // <summary></summary>
 // ***********************************************************************
-namespace FCS.Lib.Virk.Models
+namespace FCS.Lib.Virk
 {
     public class VrVirksomhed
     {