Splitting the validation result models from the main package

Yuck · Dec 11, 2020 · ce181f7 · ce181f7
1 parent 6f70a84
commit ce181f7
Show file tree

Hide file tree

Showing 11 changed files with 125 additions and 27 deletions.
diff --git a/YuckQi.Domain.sln b/YuckQi.Domain.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.30804.86
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "YuckQi.Domain", "src\YuckQi.Domain\YuckQi.Domain.csproj", "{D1B3FB54-0212-41AE-AB29-30AD97269375}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YuckQi.Domain.Validation", "src\YuckQi.Domain.Validation\YuckQi.Domain.Validation.csproj", "{A620A320-F2E9-43A7-858C-9BAF1D76CD8E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
 		{D1B3FB54-0212-41AE-AB29-30AD97269375}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D1B3FB54-0212-41AE-AB29-30AD97269375}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D1B3FB54-0212-41AE-AB29-30AD97269375}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A620A320-F2E9-43A7-858C-9BAF1D76CD8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A620A320-F2E9-43A7-858C-9BAF1D76CD8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A620A320-F2E9-43A7-858C-9BAF1D76CD8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A620A320-F2E9-43A7-858C-9BAF1D76CD8E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/src/YuckQi.Domain.Validation/Extensions/AbstractValidatorExtensions.cs b/src/YuckQi.Domain.Validation/Extensions/AbstractValidatorExtensions.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Linq;
+using FluentValidation;
+
+namespace YuckQi.Domain.Validation.Extensions
+{
+    public static class AbstractValidatorExtensions
+    {
+        private const string AbstractValidatorFailedMessageId = "YQDV.01";
+
+        public static Result<T> GetResult<T>(this AbstractValidator<T> validator, T item)
+        {
+            var result = validator.Validate(item);
+            if (result == null)
+                throw new ArgumentNullException(nameof(result));
+
+            if (result.IsValid)
+                return new Result<T>(item);
+
+            return new Result<T>(default, result.Errors.Select(t => new ResultDetail(ResultCode.InvalidRequestDetail, new ResultMessage(AbstractValidatorFailedMessageId, t.ErrorMessage), t.PropertyName)).ToList());
+        }
+    }
+}
diff --git a/...ckQi.Domain/Application/Results/Result.cs → src/YuckQi.Domain.Validation/Result.cs b/...ckQi.Domain/Application/Results/Result.cs → src/YuckQi.Domain.Validation/Result.cs
@@ -1,17 +1,27 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace YuckQi.Domain.Application.Results
+namespace YuckQi.Domain.Validation
 {
     public class Result
     {
         #region Properties
 
-        public IEnumerable<ResultDetail> Detail { get; }
+        public IReadOnlyCollection<ResultDetail> Detail { get; }
 
         public bool IsValid => Detail.All(t => t.Type != ResultType.Error);
 
         #endregion
+
+
+        #region Constructors
+
+        public Result(IReadOnlyCollection<ResultDetail> detail)
+        {
+            Detail = detail;
+        }
+
+        #endregion
     }
 
     public class Result<T> : Result
@@ -25,7 +35,7 @@ public class Result<T> : Result
 
         #region Constructors
 
-        public Result(T payload)
+        public Result(T payload, IReadOnlyCollection<ResultDetail> detail = null) : base(detail)
         {
             Payload = payload;
         }

diff --git a/....Domain/Application/Results/ResultCode.cs → src/YuckQi.Domain.Validation/ResultCode.cs b/....Domain/Application/Results/ResultCode.cs → src/YuckQi.Domain.Validation/ResultCode.cs
@@ -1,4 +1,4 @@
-namespace YuckQi.Domain.Application.Results
+namespace YuckQi.Domain.Validation
 {
     public readonly struct ResultCode
     {
@@ -19,6 +19,13 @@ public static implicit operator string(ResultCode resultCode)
         #endregion
 
 
+        #region Constants
+
+        public static readonly ResultCode InvalidRequestDetail = new ResultCode("invalidRequestDetail");
+
+        #endregion
+
+
         #region Constructors
 
         public ResultCode(string code)

diff --git a/src/YuckQi.Domain.Validation/ResultDetail.cs b/src/YuckQi.Domain.Validation/ResultDetail.cs
@@ -0,0 +1,27 @@
+namespace YuckQi.Domain.Validation
+{
+    public class ResultDetail
+    {
+        #region Properties
+
+        public ResultCode Code { get; }
+        public ResultMessage Message { get; }
+        public string Property { get; }
+        public ResultType Type { get; }
+
+        #endregion
+
+
+        #region Constructors
+
+        public ResultDetail(ResultCode code, ResultMessage message, string property = null, ResultType type = ResultType.Error)
+        {
+            Code = code;
+            Message = message;
+            Property = property;
+            Type = type;
+        }
+
+        #endregion
+    }
+}
diff --git a/src/YuckQi.Domain.Validation/ResultMessage.cs b/src/YuckQi.Domain.Validation/ResultMessage.cs
@@ -0,0 +1,23 @@
+namespace YuckQi.Domain.Validation
+{
+    public readonly struct ResultMessage
+    {
+        #region Properties
+
+        public string Id { get; }
+        public string Text { get; }
+
+        #endregion
+
+
+        #region Constructors
+
+        public ResultMessage(string id, string text = null)
+        {
+            Id = id;
+            Text = text;
+        }
+
+        #endregion
+    }
+}
diff --git a/....Domain/Application/Results/ResultType.cs → src/YuckQi.Domain.Validation/ResultType.cs b/....Domain/Application/Results/ResultType.cs → src/YuckQi.Domain.Validation/ResultType.cs
@@ -1,4 +1,4 @@
-namespace YuckQi.Domain.Application.Results
+namespace YuckQi.Domain.Validation
 {
     public enum ResultType
     {

diff --git a/src/YuckQi.Domain.Validation/YuckQi.Domain.Validation.csproj b/src/YuckQi.Domain.Validation/YuckQi.Domain.Validation.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>Kevin J Lambert</Authors>
+    <Version>0.2.0</Version>
+    <PackageLicenseFile>LICENSE</PackageLicenseFile>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Include="..\..\LICENSE">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentValidation" Version="9.3.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/...YuckQi.Domain/Application/Results/Page.cs → ...omain/Application/Queries/Results/Page.cs b/...YuckQi.Domain/Application/Results/Page.cs → ...omain/Application/Queries/Results/Page.cs
@@ -2,7 +2,7 @@
 using YuckQi.Domain.Application.Abstract;
 using YuckQi.Domain.Entities.Abstract;
 
-namespace YuckQi.Domain.Application.Results
+namespace YuckQi.Domain.Application.Queries.Results
 {
     public class Page<TEntity, TKey> : IPage where TEntity : class, IEntity<TKey> where TKey : struct
     {

diff --git a/src/YuckQi.Domain/Application/Results/ResultDetail.cs b/src/YuckQi.Domain/Application/Results/ResultDetail.cs
diff --git a/src/YuckQi.Domain/YuckQi.Domain.csproj b/src/YuckQi.Domain/YuckQi.Domain.csproj
@@ -5,7 +5,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Kevin J Lambert</Authors>
     <Company />
-    <Version>0.1.1</Version>
+    <Version>0.2.0</Version>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
   </PropertyGroup>