Merge pull request #25 from Byndyusoft/feautue/forbidden

Добавлена общая ошибка Forbidden
Byndyusoft · Jun 25, 2024 · ba0c918 · ba0c918
2 parents 8c1f8fc + bed3350
commit ba0c918
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <Version>1.3.0</Version>
+    <Version>1.4.0</Version>
     <RootNamespace>Byndyusoft.ModelResult</RootNamespace>
     <Authors>Byndyusoft</Authors>
     <PackageTags>Byndyusoft;ModelResult</PackageTags>

diff --git a/src/ModelResult.AspNetCore/Extensions/ControllerModelResultExtensions.cs b/src/ModelResult.AspNetCore/Extensions/ControllerModelResultExtensions.cs
@@ -27,6 +27,9 @@ private static ActionResult GetErrorResult(ModelResult modelResult)
             if (modelResult.IsNotFound())
                 return new NotFoundResult();
 
+            if (modelResult.IsForbidden())
+                return new ForbidResult();
+
             return new BadRequestObjectResult(modelResult.GetError());
         }
     }

diff --git a/src/ModelResult/Common/CommonErrorCodes.cs b/src/ModelResult/Common/CommonErrorCodes.cs
@@ -3,5 +3,7 @@
     public static class CommonErrorCodes
     {
         public static string NotFound => "Common.NotFound";
+
+        public static string Forbidden => "Common.Forbidden";
     }
 }
diff --git a/src/ModelResult/Common/CommonErrorMessages.cs b/src/ModelResult/Common/CommonErrorMessages.cs
@@ -3,5 +3,7 @@
     public static class CommonErrorMessages
     {
         public static string NotFound => "Not found";
+
+        public static string Forbidden => "Forbidden";
     }
 }
diff --git a/src/ModelResult/Common/CommonErrorResult.cs b/src/ModelResult/Common/CommonErrorResult.cs
@@ -5,5 +5,7 @@
     public static class CommonErrorResult
     {
         public static ErrorModelResult NotFound { get; } = new ErrorModelResult(CommonErrorCodes.NotFound, CommonErrorMessages.NotFound);
+
+        public static ErrorModelResult Forbidden { get; } = new ErrorModelResult(CommonErrorCodes.Forbidden, CommonErrorMessages.Forbidden);
     }
 }
diff --git a/src/ModelResult/Common/CommonErrorResultExtensions.cs b/src/ModelResult/Common/CommonErrorResultExtensions.cs
@@ -9,9 +9,19 @@ public static bool IsNotFound(this ModelResult modelResult)
             return modelResult.IsError() && modelResult.GetError().Code == CommonErrorCodes.NotFound;
         }
 
+        public static bool IsForbidden(this ModelResult modelResult)
+        {
+            return modelResult.IsError() && modelResult.GetError().Code == CommonErrorCodes.Forbidden;
+        }
+
         public static bool IsNotFound<T>(this ModelResult<T> modelResult)
         {
             return IsNotFound(modelResult.AsSimple());
         }
+
+        public static bool IsForbidden<T>(this ModelResult<T> modelResult)
+        {
+            return IsForbidden(modelResult.AsSimple());
+        }
     }
 }