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

update

Browse source
This commit is contained in:
FH 2022-07-04 18:20:39 +02:00
parent 5b85cada49
commit 8b30b395d0
8 changed files with 64 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Models/BrAddressModel.cs → BrAddressModel.cs
View file

@ -26,7 +26,7 @@
using System.Collections.Generic; using System.Collections.Generic;
namespace FCS.Lib.BrReg.Models; namespace FCS.Lib.BrReg;
public class BrAddressModel public class BrAddressModel
{ {

8
Models/BrCompanyModel.cs → BrCompanyModel.cs
View file

@ -24,7 +24,7 @@
// <summary></summary> // <summary></summary>
// *********************************************************************** // ***********************************************************************
namespace FCS.Lib.BrReg.Models namespace FCS.Lib.BrReg
{ {
public class BrCompanyModel public class BrCompanyModel
{ {
@ -34,9 +34,9 @@ namespace FCS.Lib.BrReg.Models
public BrCompanyTypeModel Organisasjonsform { get; set; } = new(); public BrCompanyTypeModel Organisasjonsform { get; set; } = new();
public BrAddressModel Postadresse { get; set; } = new(); public BrAddressModel Postadresse { get; set; } = new();
public BrAddressModel Forretningsadresse { get; set; } = new(); public BrAddressModel Forretningsadresse { get; set; } = new();
public string Konkurs { get; set; } = "false"; public bool Konkurs { get; set; }
public string UnderAvvikling { get; set; } = "false"; public bool UnderAvvikling { get; set; }
public string UnderTvangsavviklingEllerTvangsopplosning { get; set; } = "false"; public bool UnderTvangsavviklingEllerTvangsopplosning { get; set; }
} }
} }

2
Models/BrCompanyTypeModel.cs → BrCompanyTypeModel.cs
View file

@ -23,7 +23,7 @@
// </copyright> // </copyright>
// <summary></summary> // <summary></summary>
// *********************************************************************** // ***********************************************************************
namespace FCS.Lib.BrReg.Models; namespace FCS.Lib.BrReg;
public class BrCompanyTypeModel public class BrCompanyTypeModel
{ {

7
BrRegQuery.cs Normal file
View file

@ -0,0 +1,7 @@
namespace FCS.Lib.BrReg;
public class BrRegQuery
{
public string VatNumber { get; set; }
}

1
BrResponseParser.cs
View file

@ -24,7 +24,6 @@
// <summary></summary> // <summary></summary>
// *********************************************************************** // ***********************************************************************
using FCS.Lib.BrReg.Models;
using Newtonsoft.Json; using Newtonsoft.Json;
namespace FCS.Lib.BrReg namespace FCS.Lib.BrReg

49
BrVatInfoMapper.cs
View file

@ -25,14 +25,51 @@
// *********************************************************************** // ***********************************************************************
using System; using System;
using FCS.Lib.BrReg.Models; using System.Collections.Generic;
using FCS.Lib.Common; using FCS.Lib.Common;
namespace FCS.Lib.BrReg namespace FCS.Lib.BrReg
{ {
public class BrVatInfoMapper public class BrVatInfoMapper
{ {
public VatStateInfo MapBrToCrm(BrCompanyModel brCompany)
public VatInfoDto MapBrToCrm(BrCompanyModel brCompany)
{
return new VatInfoDto
{
Name = brCompany.Navn,
Address = string.Join(", ", brCompany.Forretningsadresse.Adresse),
City = brCompany.Forretningsadresse.Poststed,
RequestDate = $"{DateTime.Now:yyyy-MM-dd}",
ZipCode = brCompany.Forretningsadresse.Postnummer,
VatNumber = brCompany.Organisasjonsnummer,
States = new List<VatState>
{
new()
{
LastUpdate = "",
State = MapBrVatState(brCompany).HasFolded ? "LUKKET" : "NORMAL",
TimeFrame = new TimeFrame
{
StartDate = "",
EndDate = ""
}
}
},
LifeCycles = new List<LifeCycle>
{
new()
{
TimeFrame = new TimeFrame
{
EndDate = "NN",
StartDate = "NN"
}
}
}
};
}
public VatStateInfo MapBrVatState(BrCompanyModel brCompany)
{ {
if (brCompany == null) if (brCompany == null)
{ {
@ -50,13 +87,7 @@ namespace FCS.Lib.BrReg
VatNumberValid = true VatNumberValid = true
}; };
if (brCompany.Konkurs == "true") if (brCompany.Konkurs || brCompany.UnderAvvikling || brCompany.UnderTvangsavviklingEllerTvangsopplosning)
c.HasFolded = true;
if (brCompany.UnderAvvikling == "true")
c.HasFolded = true;
if (brCompany.UnderTvangsavviklingEllerTvangsopplosning == "true")
c.HasFolded = true; c.HasFolded = true;
if(!string.IsNullOrWhiteSpace(brCompany.Organisasjonsform.Utgaatt)) if(!string.IsNullOrWhiteSpace(brCompany.Organisasjonsform.Utgaatt))

8
FCS.Lib.BrReg.csproj
View file

@ -47,9 +47,10 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Models\BrAddressModel.cs" /> <Compile Include="BrAddressModel.cs" />
<Compile Include="Models\BrCompanyModel.cs" /> <Compile Include="BrCompanyModel.cs" />
<Compile Include="Models\BrCompanyTypeModel.cs" /> <Compile Include="BrCompanyTypeModel.cs" />
<Compile Include="BrRegQuery.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="BrHttpRequest.cs" /> <Compile Include="BrHttpRequest.cs" />
<Compile Include="BrResponseView.cs" /> <Compile Include="BrResponseView.cs" />
@ -70,5 +71,6 @@
<ItemGroup> <ItemGroup>
<Content Include=".gitignore" /> <Content Include=".gitignore" />
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

6
FCS.Lib.BrReg.csproj.user Normal file
View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectView>ShowAllFiles</ProjectView>
</PropertyGroup>
</Project>