Merge pull request #32 from codepb/develop

Querying Improvements and Validation

Author: codepb

DDDToolkit.sln

@@ -37,7 +37,9 @@ Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "DDDToolkit.Samples.Library.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.Querying", "src\DDDToolkit.Querying\DDDToolkit.Querying.csproj", "{AAAF943F-C3DE-4BD5-BC2D-850E77A9B607}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDDToolkit.Querying.Tests", "DDDToolkit.Querying.Tests\DDDToolkit.Querying.Tests.csproj", "{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DDDToolkit.Querying.Tests", "tests\DDDToolkit.Querying.Tests\DDDToolkit.Querying.Tests.csproj", "{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DDDToolkit.Validation", "src\DDDToolkit.Validation\DDDToolkit.Validation.csproj", "{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -103,6 +105,10 @@ Global
 		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -123,6 +129,7 @@ Global
 		{1D41D8D2-B6A5-47DD-8E98-9512EC48B429} = {BDD881C3-118B-42D6-9D77-DDAB213CA4B0}
 		{AAAF943F-C3DE-4BD5-BC2D-850E77A9B607} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
 		{4D18A7F4-169C-4399-BFF3-F2F8AE665C55} = {57967491-B4BB-44B9-B270-6533A1E388B0}
+		{0D0A57EF-3B95-4D6B-A3E6-0217FEB0DC6F} = {EF054C6D-056E-417A-A40A-376A20DF90A6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {E3DCC906-DD65-4478-A617-AC943C719834}

README.md

@@ -1,2 +1,6 @@
 # DDDToolkit
 [<img src="https://ninthlight.visualstudio.com/_apis/public/build/definitions/2a0b2dd5-5fb3-41e4-a3bb-09ae80277b94/6/badge"/>](https://ninthlight.visualstudio.com/2a0b2dd5-5fb3-41e4-a3bb-09ae80277b94/_build/index?definitionId=6)
+
+DDD Toolkit is a collection of libraries to support development following a Domain Driven Design pattern, using dotnet standard. The libraries are designed to support development by providing the building blocks for you to build on.
+
+Find more in the [Wiki](https://github.com/codepb/DDDToolkit/wiki)

samples/library/DDDToolkit.Samples.Library.Domain/DDDToolkit.Samples.Library.Domain.csproj

@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\DDDToolkit.Core\DDDToolkit.Core.csproj" />
+    <ProjectReference Include="..\..\..\src\DDDToolkit.Validation\DDDToolkit.Validation.csproj" />
   </ItemGroup>
 
   <ItemGroup>

samples/library/DDDToolkit.Samples.Library.Domain/ISBN.cs

@@ -15,10 +15,7 @@ protected ISBN() { }
         [JsonConstructor]
         public ISBN(string value)
         {
-            if(!IsValid(value))
-            {
-                throw new ArgumentException($"{value} is not a valid ISBN.", nameof(value));
-            }
+            
             _value = value;
         }
 

samples/library/DDDToolkit.Samples.Library.Domain/Validation/AuthorHasFirstName.cs

@@ -0,0 +1,11 @@
+using DDDToolkit.Querying;
+
+namespace DDDToolkit.Samples.Library.Domain
+{
+    public class AuthorHasFirstName : Query<Author>
+    {
+        public AuthorHasFirstName() : base(Has(a => a.FirstName).Satisfying(x => !string.IsNullOrWhiteSpace(x)))
+        {
+        }
+    }
+}

samples/library/DDDToolkit.Samples.Library.Domain/Validation/AuthorHasLastName.cs

@@ -0,0 +1,11 @@
+using DDDToolkit.Querying;
+
+namespace DDDToolkit.Samples.Library.Domain
+{
+    internal class AuthorHasLastName : Query<Author>
+    {
+        public AuthorHasLastName() : base(Has(a => a.LastName).Satisfying(x => !string.IsNullOrWhiteSpace(x)))
+        {
+        }
+    }
+}

samples/library/DDDToolkit.Samples.Library.Domain/Validation/AuthorHasName.cs

@@ -0,0 +1,16 @@
+using DDDToolkit.Querying;
+
+namespace DDDToolkit.Samples.Library.Domain
+{
+    public class AuthorHasName : Query<Author>
+    {
+        public AuthorHasName(string firstName, string lastName)
+            : base(
+                  Has(a => a.FirstName)
+                  .EqualTo(firstName)
+                  .And()
+                  .Has(a => a.LastName)
+                  .EqualTo(lastName)
+                  ) { }
+    }
+}

samples/library/DDDToolkit.Samples.Library.Domain/Validation/BookValidator.cs

@@ -0,0 +1,22 @@
+using DDDToolkit.Validation;
+using DDDToolkit.Querying;
+using DDDToolkit.Samples.Library.Domain.Validation;
+using System;
+
+namespace DDDToolkit.Samples.Library.Domain
+{
+    public class BookValidator : Validator<Book>
+    {
+        public BookValidator()
+        {
+            Property(b => b.ISBN)
+                .HasRule<IsbnIsNumeric>("ISBN is not numeric")
+                .HasRule<IsbnIsOfValidLength>();
+            Property(b => b.Author)
+                .HasRule<AuthorHasFirstName>()
+                .HasRule<AuthorHasLastName>();
+            Property(b => b.Title)
+                .HasRule(Query<string>.Is.Satisfying(s => !string.IsNullOrEmpty(s)), "Title is required");
+        }
+    }
+}

samples/library/DDDToolkit.Samples.Library.Domain/Validation/IsbnIsNumeric.cs

@@ -0,0 +1,17 @@
+using DDDToolkit.Querying;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq.Expressions;
+using System.Text.RegularExpressions;
+
+namespace DDDToolkit.Samples.Library.Domain.Validation
+{
+    public class IsbnIsNumeric : Query<ISBN>
+    {
+        public IsbnIsNumeric() :
+            base(Has(i => i.Value).Satisfying(i => Regex.IsMatch(i, @"^\d+$")))
+        {
+        }
+    }
+}

samples/library/DDDToolkit.Samples.Library.Domain/Validation/IsbnIsOfValidLength.cs

@@ -0,0 +1,17 @@
+using DDDToolkit.Querying;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Linq.Expressions;
+
+namespace DDDToolkit.Samples.Library.Domain.Validation
+{
+    public class IsbnIsOfValidLength : Query<ISBN>
+    {
+        public IsbnIsOfValidLength()
+            : base(Has(i => i.Value.Length)
+                  .EqualToAnyOf(10, 13))                  
+        {
+        }
+    }
+}