Merge pull request #1390 from Artsdatabanken/feature/translateEnumsPa…

…rtTwo Feature/translate enums part two
Artsdatabanken · Mar 4, 2024 · e0dd561 · e0dd561
2 parents a0f012b + 33a81f3
commit e0dd561
Show file tree

Hide file tree

Showing 30 changed files with 2,198 additions and 465 deletions.
diff --git a/Assessments.Frontend.Web/Controllers/AlienSpeciesController.cs b/Assessments.Frontend.Web/Controllers/AlienSpeciesController.cs
@@ -183,7 +183,7 @@ public async Task<IActionResult> Suggestion([FromQuery] string search)
                                 area = x.EvaluationContext,
                                 category = x.Category,
                                 speciesGroup = x.SpeciesGroup,
-                                speciesGroupIconUrl = AlienSpeciesHelpers.GetSpeciesGroup(SpeciesGroups.AlienSpecies2023SpeciesGroups.Filters, x.SpeciesGroup).ImageUrl,
+                                speciesGroupIconUrl = AlienSpeciesHelpers.GetSpeciesGroup(x.SpeciesGroup.DisplayName()).ImageUrl,
                                 scientificName = x.ScientificName.ScientificName
                             })
                             .ToArray();

diff --git a/Assessments.Frontend.Web/Infrastructure/AlienSpecies/AlienSpeciesHelpers.cs b/Assessments.Frontend.Web/Infrastructure/AlienSpecies/AlienSpeciesHelpers.cs
@@ -10,9 +10,10 @@ namespace Assessments.Frontend.Web.Infrastructure.AlienSpecies
 {
     public class AlienSpeciesHelpers
     {
-        public static FilterItem GetSpeciesGroup(FilterItem[] speciesGroups, string speciesGroupName)
+        public static FilterItem GetSpeciesGroup(string speciesGroupName)
         {
-            foreach (var speciesGroup in speciesGroups)
+            var speciesGroups = new SpeciesGroups().AlienSpecies2023SpeciesGroups();
+            foreach (var speciesGroup in speciesGroups.Filters)
             {
                 if (speciesGroup.Name == speciesGroupName)
                 {
@@ -33,32 +34,6 @@ public static FilterItem GetSpeciesGroup(FilterItem[] speciesGroups, string spec
             return null;
         }
 
-        public static string GetSpeciesGroupByShortName(string shortName)
-        {
-            var speciesGroups = SpeciesGroups.AlienSpecies2023SpeciesGroups.Filters;
-
-            foreach (var species in speciesGroups)
-            {
-                FilterItem speciesGroup = species;
-                if (speciesGroup.NameShort == shortName)
-                {
-                    return speciesGroup.Name;
-                }
-
-                if (speciesGroup.SubGroup != null)
-                {
-                    foreach (var subGroup in species.SubGroup.Filters)
-                    {
-                        if (subGroup.NameShort == shortName)
-                        {
-                            return subGroup.Name;
-                        }
-                    }
-                }
-            }
-            return string.Empty;
-        }
-
         public static string CriteriaDescription(AlienSpeciesAssessment2023CriteriaLetter letter, int value)
         {
             var description = string.Empty;