fix: remove unnecessary calls to regnskap if subunit

data-altinn-no · Sep 10, 2024 · d84d058 · d84d058
1 parent 87f4d7c
commit d84d058
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 28 deletions.
diff --git a/src/Dan.Plugin.Tilda/Tilda.cs b/src/Dan.Plugin.Tilda/Tilda.cs
@@ -442,36 +442,16 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesStorulykkevirksomhet(Ev
 
         private async Task<List<TildaRegistryEntry>> GetOrganizationsFromBR(string organizationNumber, TildaParameters param)
         {
-            var brResultTask = Helpers.GetFromBR(organizationNumber, _erClient, false, _policyRegistry);
-
-            //var entityServiceTask = _entityRegistryService.GetFull(organizationNumber, true, false, false);
-
-            var accountsInformationTask = Helpers.GetAnnualTurnoverFromBR(organizationNumber, _client, _policyRegistry);
             var result = new List<TildaRegistryEntry>();
-
-            await Task.WhenAll(accountsInformationTask, brResultTask);
-            if (brResultTask.Result.Count > 1)
-            {
-                // TODO! Does RR return data for subunits or should this just be null?
-                var isMainUnit = true;
-                foreach (var brResult in brResultTask.Result)
-                {
-                    if (isMainUnit)
-                    {
-                        result.Add(await ConvertBRtoTilda(brResult, accountsInformationTask.Result));
-                        isMainUnit = false;
-                    }
-                    else
-                    {
-                        result.Add(await ConvertBRtoTilda(brResult, null));
-                    }
-                }
-            }
-            else
+            var brResult = await Helpers.GetFromBR(organizationNumber, _erClient, false, _policyRegistry);
+            AccountsInformation accountsInformation = null;
+            if (string.IsNullOrEmpty(brResult.First().OverordnetEnhet))
             {
-                result.Add(await ConvertBRtoTilda(brResultTask.Result.First(), accountsInformationTask.Result));
+                accountsInformation = await Helpers.GetAnnualTurnoverFromBR(organizationNumber, _client, _policyRegistry);
             }
 
+            result.Add(await ConvertBRtoTilda(brResult.First(), accountsInformation));
+
             return result;
         }
 

diff --git a/src/Dan.Plugin.Tilda/Utils/Helpers.cs b/src/Dan.Plugin.Tilda/Utils/Helpers.cs
@@ -275,8 +275,8 @@ public static async Task<BREntityRegisterEntry> GetOrganizationInfoFromBR(string
             try
             {
                 var cachePolicy = policyRegistry.Get<AsyncPolicy<string>>("ERCachePolicy");
-                var mainUnitUrl = $"http://data.brreg.no/enhetsregisteret/api/enheter/{organizationNumber}";
-                var subUnitUrl = $"http://data.brreg.no/enhetsregisteret/api/underenheter/{organizationNumber}";
+                var mainUnitUrl = $"https://data.brreg.no/enhetsregisteret/api/enheter/{organizationNumber}";
+                var subUnitUrl = $"https://data.brreg.no/enhetsregisteret/api/underenheter/{organizationNumber}";
                 var cacheKey = $"Cache_Absolute_GET_{mainUnitUrl}";
 
                 rawResult = await cachePolicy.ExecuteAsync(async context =>