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

add entity name query

Browse source
This commit is contained in:
FH 2022-07-30 03:11:24 +02:00
parent 60c4a86deb
commit 116098e104
4 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
FCS.Lib.Virk.csproj
View file

@ -9,6 +9,8 @@
<ProduceReferenceAssembly>False</ProduceReferenceAssembly> <ProduceReferenceAssembly>False</ProduceReferenceAssembly>
<AssemblyVersion>1.0</AssemblyVersion> <AssemblyVersion>1.0</AssemblyVersion>
<FileVersion>1.0.0.100</FileVersion> <FileVersion>1.0.0.100</FileVersion>
<IsPublishable>False</IsPublishable>
<PackageLicenseExpression> AGPL-3.0-or-later</PackageLicenseExpression>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="NewtonSoft.Json" Version="13.0.1" /> <PackageReference Include="NewtonSoft.Json" Version="13.0.1" />
@ -21,4 +23,8 @@
<Reference Include="System.Net.Http" /> <Reference Include="System.Net.Http" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Service Include="{508349b6-6b84-4df5-91f0-309beebad82d}" />
</ItemGroup>
</Project> </Project>

1
VrQuery.cs
View file

@ -31,5 +31,6 @@ namespace FCS.Lib.Virk
public string StreetName { get; set; } = ""; public string StreetName { get; set; } = "";
public string HouseNumber { get; set; } = ""; public string HouseNumber { get; set; } = "";
public string ZipCode { get; set; } = ""; public string ZipCode { get; set; } = "";
public string EntityName { get; set; } = "";
} }
} }

26
VrQueryMapper.cs
View file

@ -32,7 +32,7 @@ namespace FCS.Lib.Virk
{ {
public JObject VrMapQuery(VrQuery query) public JObject VrMapQuery(VrQuery query)
{ {
if (string.IsNullOrWhiteSpace(query.VatNumber)) if (string.IsNullOrWhiteSpace(query.VatNumber) && string.IsNullOrWhiteSpace(query.EntityName))
{ {
return new JObject( return new JObject(
new JProperty("_source", new JProperty("_source",
@ -71,6 +71,27 @@ namespace FCS.Lib.Virk
new JProperty("size", 50)); new JProperty("size", 50));
} }
if (string.IsNullOrWhiteSpace(query.EntityName))
{
return new JObject(
new JProperty("_source",
new JArray(
"Vrvirksomhed.cvrNummer",
"Vrvirksomhed.virksomhedMetadata.nyesteNavn.navn",
"Vrvirksomhed.virksomhedMetadata.nyesteBeliggenhedsadresse.conavn",
"Vrvirksomhed.virksomhedMetadata.nyesteBeliggenhedsadresse.vejnavn",
"Vrvirksomhed.virksomhedMetadata.nyesteBeliggenhedsadresse.husnummerFra",
"Vrvirksomhed.virksomhedMetadata.nyesteBeliggenhedsadresse.husnummerTil",
"Vrvirksomhed.virksomhedMetadata.nyesteBeliggenhedsadresse.postnummer",
"Vrvirksomhed.virksomhedMetadata.nyesteBeliggenhedsadresse.postdistrikt",
"Vrvirksomhed.virksomhedsstatus",
"Vrvirksomhed.livsforloeb")
),
new JProperty("query",
new JObject(new JProperty("term",
new JObject(new JProperty("Vrvirksomhed.cvrNummer", query.VatNumber))))));
}
return new JObject( return new JObject(
new JProperty("_source", new JProperty("_source",
new JArray( new JArray(
@ -87,7 +108,8 @@ namespace FCS.Lib.Virk
), ),
new JProperty("query", new JProperty("query",
new JObject(new JProperty("term", new JObject(new JProperty("term",
new JObject(new JProperty("Vrvirksomhed.cvrNummer", query.VatNumber)))))); new JObject(new JProperty("Vrvirksomhed.virksomhedMetadata.nyesteNavn.navn", query.EntityName))))));
} }
} }

4
VrQueryValidator.cs
View file

@ -32,8 +32,8 @@ namespace FCS.Lib.Virk
try try
{ {
// Precise lookup // Precise lookup
if (!string.IsNullOrWhiteSpace(query.VatNumber)) return true; if (!string.IsNullOrWhiteSpace(query.VatNumber) || !string.IsNullOrWhiteSpace(query.EntityName)) return true;
// Search lookup // Address lookup
return !string.IsNullOrWhiteSpace(query.StreetName) return !string.IsNullOrWhiteSpace(query.StreetName)
&& !string.IsNullOrWhiteSpace(query.HouseNumber) && !string.IsNullOrWhiteSpace(query.HouseNumber)
&& !string.IsNullOrWhiteSpace(query.ZipCode) && !string.IsNullOrWhiteSpace(query.ZipCode)