root/fcs-brreg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix possible null reference

Browse source
This commit is contained in:
FH 2022-04-08 12:26:45 +02:00
parent 4f32e47109
commit 3decd508c9
2 changed files with 33 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
BrVatInfoMapper.cs
View file

@ -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;
}

7
Models/BrCompanyModel.cs
View file

@ -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";
}
}