Changed creating operation errors

ita-social-projects · Jan 10, 2022 · 770a252 · 770a252
1 parent f6431f7
commit 770a252
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/OutOfSchool/OutOfSchool.WebApi/Extensions/OperationExtensions.cs b/OutOfSchool/OutOfSchool.WebApi/Extensions/OperationExtensions.cs
@@ -10,19 +10,14 @@ public static class OperationExtensions
     {
         public static OperationError GetOperationError(this ImagesOperationErrorCode code)
         {
-            var resourceKey = code.GetResourceKey();
-
-            _ = resourceKey ?? throw new InvalidOperationException(
-                    $"Unreal to get the resource key from {code} in {nameof(ImagesOperationErrorCode)}.");
-
-            return CreateOperationError(code.ToString(), RetrievingResourcesExtensions.GetStringFromResources(ResourceManagers.ImageResourceManager, resourceKey));
+            return CreateOperationError(code.ToString(), code.GetResourceValue());
         }
 
         public static OperationError CreateOperationError(string code, string description)
         {
             if (string.IsNullOrEmpty(code))
             {
-                throw new ArgumentNullException(nameof(code));
+                throw new ArgumentException(@$"Code [{code}] cannot be null or empty.", nameof(code));
             }
 
             return new OperationError

diff --git a/OutOfSchool/OutOfSchool.WebApi/Extensions/RetrievingResourcesExtensions.cs b/OutOfSchool/OutOfSchool.WebApi/Extensions/RetrievingResourcesExtensions.cs
@@ -1,4 +1,5 @@
-using System.Globalization;
+using System;
+using System.Globalization;
 using System.Resources;
 using Google.Protobuf.WellKnownTypes;
 using OutOfSchool.WebApi.Common;
@@ -21,6 +22,8 @@ public static string GetResourceValue(this ImagesOperationErrorCode code, Cultur
 
         internal static string GetStringFromResources(ResourceManager resourceManager, string resourceKey, CultureInfo culture = null)
         {
+            _ = resourceManager ?? throw new ArgumentNullException(nameof(resourceManager));
+
             return string.IsNullOrEmpty(resourceKey) ? null :
                 resourceManager.GetString(resourceKey, culture);
         }