Skip to content

Add whitelist for organization numbers to IsPublicSector #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elsand merged 1 commit into from
Nov 24, 2022
Merged

Add whitelist for organization numbers to IsPublicSector #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Dan.Common/Services/EntityRegistryService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ public class EntityRegistryService : IEntityRegistryService
private static readonly string[] PublicSectorUnitTypes = { "ADOS", "FKF", "FYLK", "KF", "KOMM", "ORGL", "STAT", "SF", "SÆR" };
private static readonly string[] PublicSectorSectorCodes = { "1110", "1120", "1510", "1520", "3900", "6100", "6500" };

// A list of various organization numbers that the code heuristics fail to recognize as public sector
private static readonly string[] PublicSectorOrganizations = { "971032146" /*KS-KOMMUNESEKTORENS ORGANISASJON*/ };

private static readonly ConcurrentDictionary<string, (DateTime expiresAt, EntityRegistryUnit? unit)> EntityRegistryUnitsCache = new();

private readonly TimeSpan _cacheEntryTtl = TimeSpan.FromSeconds(600);
Expand Down Expand Up @@ -117,7 +120,8 @@ public bool IsPublicAgency(SimpleEntityRegistryUnit unit)
{
return PublicSectorUnitTypes.Contains(unit.OrganizationForm)
|| unit.IndustrialCodes != null && unit.IndustrialCodes.Any(x => x.StartsWith("84"))
|| PublicSectorSectorCodes.Contains(unit.SectorCode);
|| PublicSectorSectorCodes.Contains(unit.SectorCode)
|| PublicSectorOrganizations.Contains(unit.OrganizationNumber);
}

public bool IsPublicAgency(EntityRegistryUnit unit) => IsPublicAgency(MapToEntityRegistryUnit(unit)!);
Expand Down