fix: add step for specifically removing not found orgs if geo search …

…is on (#16)
data-altinn-no · Nov 20, 2024 · 5278320 · 5278320
1 parent 26e1a36
commit 5278320
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/src/Dan.Plugin.Tilda/Extensions/TildaParametersExtensions.cs b/src/Dan.Plugin.Tilda/Extensions/TildaParametersExtensions.cs
@@ -0,0 +1,18 @@
+using Dan.Plugin.Tilda.Models;
+
+namespace Dan.Plugin.Tilda.Extensions;
+
+public static class TildaParametersExtensions
+{
+    public static bool HasGeoSearchParams(this TildaParameters parameters)
+    {
+        if (parameters is null)
+        {
+            return false;
+        }
+
+        return !string.IsNullOrEmpty(parameters.postcode) ||
+               !string.IsNullOrEmpty(parameters.municipalityNumber) ||
+               !string.IsNullOrEmpty(parameters.nace);
+    }
+}
diff --git a/src/Dan.Plugin.Tilda/Tilda.cs b/src/Dan.Plugin.Tilda/Tilda.cs
@@ -713,6 +713,12 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTrendAll(EvidenceHarves
 
             if (result != null)
             {
+                if (param.HasGeoSearchParams())
+                {
+                    var orgNumbers = brResults.Select(br => br.OrganizationNumber).ToList();
+                    result.TrendReports =
+                        result.TrendReports?.Where(r => orgNumbers.Contains(r.ControlObject)).ToList();
+                }
                 var filtered = (TrendReportList)Helpers.Filter(result, brResults);
                 ecb.AddEvidenceValue($"tilsynstrendrapporter", JsonConvert.SerializeObject(filtered, Formatting.None), result.ControlAgency, false);
             }
@@ -771,6 +777,12 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTilsynskoordingeringAll
 
             if (result != null)
             {
+                if (param.HasGeoSearchParams())
+                {
+                    var orgNumbers = brResults.Select(br => br.OrganizationNumber).ToList();
+                    result.AuditCoordinations =
+                        result.AuditCoordinations?.Where(r => orgNumbers.Contains(r.ControlObject)).ToList();
+                }
                 var filtered = (AuditCoordinationList)Helpers.Filter(result, brResults);
                 ecb.AddEvidenceValue($"tilsynskoordineringer", JsonConvert.SerializeObject(filtered, Formatting.None), result.ControlAgency, false);
             }
@@ -825,6 +837,12 @@ private async Task<List<EvidenceValue>> GetEvidenceValuesTilsynsRapportAllAsync(
 
             if (result != null)
             {
+                if (param.HasGeoSearchParams())
+                {
+                    var orgNumbers = brResults.Select(br => br.OrganizationNumber).ToList();
+                    result.AuditReports =
+                        result.AuditReports?.Where(r => orgNumbers.Contains(r.ControlObject)).ToList();
+                }
                 var filtered = (AuditReportList)Helpers.Filter(result, brResults);
                 ecb.AddEvidenceValue($"tilsynsrapporter", JsonConvert.SerializeObject(filtered, Formatting.None), result.ControlAgency, false);
             }