From 3decd508c9ff407556e76c80dcbfb8f6bc6a55a6 Mon Sep 17 00:00:00 2001
From: FH <fh@uex.dk>
Date: Fri, 8 Apr 2022 12:26:45 +0200
Subject: [PATCH] fix possible null reference

---
 BrVatInfoMapper.cs       | 41 ++++++++++++++++++++++++++++------------
 Models/BrCompanyModel.cs |  7 ++++---
 2 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/BrVatInfoMapper.cs b/BrVatInfoMapper.cs
index 5821a26..2f08a4b 100644
--- a/BrVatInfoMapper.cs
+++ b/BrVatInfoMapper.cs
@@ -25,7 +25,6 @@
 // ***********************************************************************
 
 using System;
-using System.Globalization;
 using FCS.Lib.BrReg.Models;
 using FCS.Lib.Common;
 
@@ -33,23 +32,41 @@ namespace FCS.Lib.BrReg
 {
     public class BrVatInfoMapper
     {
-        public BaseVatInfo MapBrToCrm(BrCompanyModel brCompany)
+        public VatStateInfo MapBrToCrm(BrCompanyModel brCompany)
         {
+            if (brCompany == null)
+            {
+                return new VatStateInfo
+                {
+                    RequestDate = DateTime.Now
+                };
+            }
 
-            var c = new BaseVatInfo
+            var c = new VatStateInfo
             {
                 Name = brCompany.Navn,
-                Address = string.Join("\n", brCompany.Forretningsadresse.Adresse),
-                ZipCode = brCompany.Forretningsadresse.Postnummer,
-                City = brCompany.Forretningsadresse.Poststed,
                 VatNumber = brCompany.Organisasjonsnummer,
-                RequestDate = DateTime.Now.ToString(CultureInfo.InvariantCulture),
-                CoName = "",
-                VatNumberValid = 1
+                RequestDate = DateTime.Now,
+                VatNumberValid = true
             };
-            if (brCompany.Konkurs || brCompany.UnderAvvikling || brCompany.UnderTvangsavviklingEllerTvangsopplosning ||
-                !string.IsNullOrWhiteSpace(brCompany.Organisasjonsform.Utgaatt))
-                c.HasFolded = 1;
+
+            if (brCompany.Konkurs == "true")
+                c.HasFolded = true;
+
+            if (brCompany.UnderAvvikling == "true")
+                c.HasFolded = true;
+
+            if (brCompany.UnderTvangsavviklingEllerTvangsopplosning == "true")
+                c.HasFolded = true;
+
+            if(!string.IsNullOrWhiteSpace(brCompany.Organisasjonsform.Utgaatt))
+                c.HasFolded = true;
+
+            if (!string.IsNullOrWhiteSpace(brCompany.Slettedato))
+                c.HasFolded = true;
+
+            if (c.HasFolded)
+                c.VatNumberValid = false;
 
             return c;
         }
diff --git a/Models/BrCompanyModel.cs b/Models/BrCompanyModel.cs
index 429f634..65a244a 100644
--- a/Models/BrCompanyModel.cs
+++ b/Models/BrCompanyModel.cs
@@ -30,12 +30,13 @@ namespace FCS.Lib.BrReg.Models
     {
         public string Organisasjonsnummer { get; set; } = "";
         public string Navn { get; set; } = "";
+        public string Slettedato { get; set; } = "";
         public BrCompanyTypeModel Organisasjonsform { get; set; } = new();
         public BrAddressModel Postadresse { get; set; } = new();
         public BrAddressModel Forretningsadresse { get; set; } = new();
-        public bool Konkurs { get; set; }
-        public bool UnderAvvikling { get; set; }
-        public bool UnderTvangsavviklingEllerTvangsopplosning { get; set; }
+        public string Konkurs { get; set; } = "false";
+        public string UnderAvvikling { get; set; } = "false";
+        public string UnderTvangsavviklingEllerTvangsopplosning { get; set; } = "false";
 
     }
 }