From 6819cfa7c0d9830907857092fdffb78e43a20917 Mon Sep 17 00:00:00 2001
From: Konrad-Simso <konrad.simso@digdir.no>
Date: Fri, 11 Oct 2024 22:34:35 +0200
Subject: [PATCH] - Less generic catch. - Reformat foreach and if into where
 statement.

---
 backend/src/Designer/Controllers/OptionsController.cs    | 3 ++-
 .../Designer/Services/Implementation/OptionsService.cs   | 9 ++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/Designer/Controllers/OptionsController.cs b/backend/src/Designer/Controllers/OptionsController.cs
index 797943a6b59..306a517a802 100644
--- a/backend/src/Designer/Controllers/OptionsController.cs
+++ b/backend/src/Designer/Controllers/OptionsController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using Altinn.Studio.Designer.Helpers;
@@ -149,7 +150,7 @@ public async Task<IActionResult> UploadFile(string org, string repo, [FromForm]
             List<Option> newOptionsList = await _optionsService.UploadNewOption(org, repo, developer, fileName, file, cancellationToken);
             return Ok(newOptionsList);
         }
-        catch (Exception e)
+        catch (JsonException e)
         {
             return BadRequest(e.Message);
         }
diff --git a/backend/src/Designer/Services/Implementation/OptionsService.cs b/backend/src/Designer/Services/Implementation/OptionsService.cs
index 835a7ba71d1..c4e74b17433 100644
--- a/backend/src/Designer/Services/Implementation/OptionsService.cs
+++ b/backend/src/Designer/Services/Implementation/OptionsService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
@@ -73,12 +74,10 @@ public async Task<List<Option>> UploadNewOption(string org, string repo, string
         List<Option> deserializedOptions = JsonSerializer.Deserialize<List<Option>>(payload.OpenReadStream(),
             new JsonSerializerOptions { WriteIndented = true, AllowTrailingCommas = true });
 
-        foreach (Option option in deserializedOptions)
+        IEnumerable<Option> result = deserializedOptions.Where(option => string.IsNullOrEmpty(option.Value) || string.IsNullOrEmpty(option.Label));
+        if (result.Any())
         {
-            if (string.IsNullOrEmpty(option.Value) || string.IsNullOrEmpty(option.Label))
-            {
-                throw new Exception("Uploaded file is missing one of the following attributes for a option: value or label.");
-            }
+            throw new JsonException("Uploaded file is missing one of the following attributes for a option: value or label.");
         }
 
         var altinnAppGitRepository = _altinnGitRepositoryFactory.GetAltinnAppGitRepository(org, repo, developer);