Update to FunctionalDDD Version 1.1.0-alpha.13 (#20)

* Update to FunctionalDDD Version 1.1.0-alpha.13
xavierjohn · Sep 17, 2023 · 5a07179 · 5a07179
1 parent 09f70f5
commit 5a07179
Show file tree

Hide file tree

Showing 34 changed files with 77 additions and 25 deletions.
diff --git a/Api/src/2022-12-21/Controllers/MenusController.cs b/Api/src/2022-12-21/Controllers/MenusController.cs
@@ -2,6 +2,7 @@
 
 using Asp.Versioning;
 using BuberDinner.Api._2022_12_21.Models.Menus;
+using FunctionalDDD.Asp;
 using Mapster;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;

diff --git a/Api/src/Neutral/Controllers/AuthenticationController.cs b/Api/src/Neutral/Controllers/AuthenticationController.cs
@@ -2,6 +2,7 @@
 
 using Asp.Versioning;
 using BuberDinner.Api.Neutral.Models.Authentication;
+using FunctionalDDD.Asp;
 using Mapster;
 using Mediator;
 using Microsoft.AspNetCore.Authorization;

diff --git a/Api/src/Neutral/Models/Authentication/RegisterRequest.cs b/Api/src/Neutral/Models/Authentication/RegisterRequest.cs
@@ -1,6 +1,7 @@
 namespace BuberDinner.Api.Neutral.Models.Authentication;
 
 using BuberDinner.Application.Services.Authentication.Commands;
+using FunctionalDDD.CommonValueObjects;
 using FirstNameClass = Domain.User.ValueObjects.FirstName;
 using LastNameClass = Domain.User.ValueObjects.LastName;
 using PasswordClass = Domain.User.ValueObjects.Password;

diff --git a/Api/tests/2022-12-21/CreateMenuRequestTests.cs b/Api/tests/2022-12-21/CreateMenuRequestTests.cs
@@ -4,6 +4,7 @@
 using BuberDinner.Application.Menus.Commands;
 using BuberDinner.Domain.Common.ValueObjects;
 using BuberDinner.Domain.Host.ValueObject;
+using FunctionalDDD.RailwayOrientedProgramming.Errors;
 
 public class CreateMenuRequestTests
 {

diff --git a/Api/tests/Neutral/LoginRequestTests.cs b/Api/tests/Neutral/LoginRequestTests.cs
@@ -2,6 +2,7 @@
 
 using BuberDinner.Api.Neutral.Models.Authentication;
 using BuberDinner.Domain.User.ValueObjects;
+using FunctionalDDD.RailwayOrientedProgramming.Errors;
 
 public class LoginRequestTests
 {

diff --git a/Api/tests/Neutral/RegisterRequestTests.cs b/Api/tests/Neutral/RegisterRequestTests.cs
@@ -2,6 +2,8 @@
 
 using BuberDinner.Api.Neutral.Models.Authentication;
 using BuberDinner.Domain.User.ValueObjects;
+using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.RailwayOrientedProgramming.Errors;
 
 public class RegisterRequestTests
 {

diff --git a/Application/src/Authentication/Commands/RegisterCommand.cs b/Application/src/Authentication/Commands/RegisterCommand.cs
@@ -2,6 +2,7 @@
 
 using BuberDinner.Application.Services.Authentication.Common;
 using BuberDinner.Domain.User.ValueObjects;
+using FunctionalDDD.CommonValueObjects;
 using Mediator;
 
 public class RegisterCommand

diff --git a/Application/tests/Authentication/AuthenticationTests.cs b/Application/tests/Authentication/AuthenticationTests.cs
@@ -3,6 +3,7 @@
     using System.Threading.Tasks;
     using BuberDinner.Application.Services.Authentication.Commands;
     using BuberDinner.Domain.User.ValueObjects;
+    using FunctionalDDD.CommonValueObjects;
     using Mediator;
 
     public class AuthenticationTests

diff --git a/BuberDinner.sln b/BuberDinner.sln
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 		Directory.Build.props = Directory.Build.props
 		Directory.Packages.props = Directory.Packages.props
+		README.md = README.md
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BuberDinner.Api", "Api\src\BuberDinner.Api.csproj", "{116D2DB8-7C91-49CE-8B11-46886C31A113}"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -23,7 +23,7 @@
   <ItemGroup>
     <InternalsVisibleTo Include="$(MSBuildProjectName).Tests" />
     <PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
-    <Using Include="FunctionalDDD" />
+    <Using Include="FunctionalDDD.RailwayOrientedProgramming" />
   </ItemGroup>
 
   <!-- Test projects. -->

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,40 +4,40 @@
   </PropertyGroup>
   <!-- Runtime -->
   <ItemGroup>
-    <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.0.0" />
-    <PackageVersion Include="Azure.Identity" Version="1.9.0" />
+    <PackageVersion Include="Asp.Versioning.Mvc.ApiExplorer" Version="7.0.1" />
+    <PackageVersion Include="Azure.Identity" Version="1.10.1" />
     <PackageVersion Include="FluentValidation" Version="11.3.0" />
-    <PackageVersion Include="FunctionalDDD.Asp" Version="1.1.0-alpha.4" />
-    <PackageVersion Include="FunctionalDDD.CommonValueObjectGenerator" Version="1.1.0-alpha.4" />
-    <PackageVersion Include="FunctionalDDD.CommonValueObjects" Version="1.1.0-alpha.4" />
-    <PackageVersion Include="FunctionalDDD.DomainDrivenDesign" Version="1.1.0-alpha.4" />
-    <PackageVersion Include="FunctionalDDD.FluentValidation" Version="1.1.0-alpha.4" />
+    <PackageVersion Include="FunctionalDDD.Asp" Version="1.1.0-alpha.13" />
+    <PackageVersion Include="FunctionalDDD.CommonValueObjectGenerator" Version="1.1.0-alpha.13" />
+    <PackageVersion Include="FunctionalDDD.CommonValueObjects" Version="1.1.0-alpha.13" />
+    <PackageVersion Include="FunctionalDDD.DomainDrivenDesign" Version="1.1.0-alpha.13" />
+    <PackageVersion Include="FunctionalDDD.FluentValidation" Version="1.1.0-alpha.13" />
     <PackageVersion Include="FunctionalDDD.RailwayOrientedProgramming" Version="$(FunctionalDDDVersion)" />
     <PackageVersion Include="Mapster" Version="7.3.0" />
     <PackageVersion Include="Mapster.DependencyInjection" Version="1.0.0" />
-    <PackageVersion Include="Mediator.Abstractions" Version="2.1.1" />
-    <PackageVersion Include="Mediator.SourceGenerator" Version="2.1.1" />
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.5" />
+    <PackageVersion Include="Mediator.Abstractions" Version="2.1.6" />
+    <PackageVersion Include="Mediator.SourceGenerator" Version="2.1.6" />
+    <PackageVersion Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.11" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.5" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.11" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="7.0.0" />
-    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.33.0" />
+    <PackageVersion Include="Microsoft.Azure.Cosmos" Version="3.35.4" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.132" />
+    <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.30.1" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" />
   </ItemGroup>
   <!-- Test -->
   <ItemGroup>
-    <PackageVersion Include="coverlet.collector" Version="3.2.0" />
-    <PackageVersion Include="FluentAssertions" Version="6.11.0" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageVersion Include="xunit" Version="2.4.2" />
-    <PackageVersion Include="Xunit.DependencyInjection" Version="8.7.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageVersion Include="xunit" Version="2.5.0" />
+    <PackageVersion Include="Xunit.DependencyInjection" Version="8.8.2" />
     <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
-    <PackageVersion Include="xunit.categories" Version="2.0.6" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
+    <PackageVersion Include="xunit.categories" Version="2.0.8" />
   </ItemGroup>
 </Project>
diff --git a/Domain/src/Common/Errors/Errors.Authentication.cs b/Domain/src/Common/Errors/Errors.Authentication.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Errors;
 
+using FunctionalDDD.RailwayOrientedProgramming.Errors;
+
 public partial class Errors
 {
     public static class Authentication

diff --git a/Domain/src/Common/Errors/Errors.User.cs b/Domain/src/Common/Errors/Errors.User.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Errors;
 
+using FunctionalDDD.RailwayOrientedProgramming.Errors;
+
 public partial class Errors
 {
     public static class User

diff --git a/Domain/src/Common/ValueObjects/Description.cs b/Domain/src/Common/ValueObjects/Description.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Common.ValueObjects;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class Description : RequiredString<Description>
 {
 }
diff --git a/Domain/src/Common/ValueObjects/Name.cs b/Domain/src/Common/ValueObjects/Name.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Common.ValueObjects;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class Name : RequiredString<Name>
 {
 }
diff --git a/Domain/src/Dinner/ValueObjects/DinnerId.cs b/Domain/src/Dinner/ValueObjects/DinnerId.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Dinner.ValueObject;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class DinnerId : RequiredGuid<DinnerId>
 {
 }
diff --git a/Domain/src/Host/ValueObjects/HostId.cs b/Domain/src/Host/ValueObjects/HostId.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Host.ValueObject;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class HostId : RequiredGuid<HostId>
 {
 }
diff --git a/Domain/src/Menu/Entities/MenuItem.cs b/Domain/src/Menu/Entities/MenuItem.cs
@@ -3,6 +3,8 @@
 using BuberDinner.Domain.Common.ValueObjects;
 using BuberDinner.Domain.Menu.ValueObject;
 using FluentValidation;
+using FunctionalDDD.DomainDrivenDesign;
+using FunctionalDDD.FluentValidation;
 
 public class MenuItem : Entity<MenuItemId>
 {

diff --git a/Domain/src/Menu/Entities/MenuSection.cs b/Domain/src/Menu/Entities/MenuSection.cs
@@ -3,6 +3,8 @@
 using BuberDinner.Domain.Common.ValueObjects;
 using BuberDinner.Domain.Menu.ValueObject;
 using FluentValidation;
+using FunctionalDDD.DomainDrivenDesign;
+using FunctionalDDD.FluentValidation;
 
 public class MenuSection : Entity<MenuSectionId>
 {

diff --git a/Domain/src/Menu/Menu.cs b/Domain/src/Menu/Menu.cs
@@ -7,6 +7,9 @@
 using BuberDinner.Domain.Menu.Entities;
 using BuberDinner.Domain.Menu.ValueObject;
 using FluentValidation;
+using FunctionalDDD.DomainDrivenDesign;
+using FunctionalDDD.FluentValidation;
+
 public class Menu : AggregateRoot<MenuId>
 {
     public Name Name { get; }

diff --git a/Domain/src/Menu/ValueObjects/MenuId.cs b/Domain/src/Menu/ValueObjects/MenuId.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Menu.ValueObject;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class MenuId : RequiredGuid<MenuId>
 {
 }
diff --git a/Domain/src/Menu/ValueObjects/MenuItemId.cs b/Domain/src/Menu/ValueObjects/MenuItemId.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Menu.ValueObject;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class MenuItemId : RequiredGuid<MenuItemId>
 {
 }
diff --git a/Domain/src/Menu/ValueObjects/MenuSectionId.cs b/Domain/src/Menu/ValueObjects/MenuSectionId.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Menu.ValueObject;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class MenuSectionId : RequiredGuid<MenuSectionId>
 {
 }
diff --git a/Domain/src/MenuReview/ValueObjects/MenuId.cs b/Domain/src/MenuReview/ValueObjects/MenuId.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.Menu.ValueObject;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class MenuReviewId : RequiredGuid<MenuReviewId>
 {
 }
diff --git a/Domain/src/User/Entities/User.cs b/Domain/src/User/Entities/User.cs
@@ -2,6 +2,9 @@
 
 using BuberDinner.Domain.User.ValueObjects;
 using FluentValidation;
+using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.DomainDrivenDesign;
+using FunctionalDDD.FluentValidation;
 
 public class User : Entity<UserId>
 {

diff --git a/Domain/src/User/ValueObjects/FirstName.cs b/Domain/src/User/ValueObjects/FirstName.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class FirstName : RequiredString<FirstName>
 {
 }
diff --git a/Domain/src/User/ValueObjects/LastName.cs b/Domain/src/User/ValueObjects/LastName.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class LastName : RequiredString<LastName>
 {
 }
diff --git a/Domain/src/User/ValueObjects/Password.cs b/Domain/src/User/ValueObjects/Password.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class Password : RequiredString<Password>
 {
 }
diff --git a/Domain/src/User/ValueObjects/UserId.cs b/Domain/src/User/ValueObjects/UserId.cs
@@ -1,5 +1,7 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
+using FunctionalDDD.CommonValueObjects;
+
 public partial class UserId : RequiredString<UserId>
 {
 }
diff --git a/Domain/tests/MenuTests.cs b/Domain/tests/MenuTests.cs
@@ -5,6 +5,7 @@
 using BuberDinner.Domain.Menu;
 using BuberDinner.Domain.Menu.Entities;
 using BuberDinner.Domain.Menu.ValueObject;
+using FunctionalDDD.RailwayOrientedProgramming.Errors;
 
 public class MenuTests
 {

diff --git a/Domain/tests/UserTests.cs b/Domain/tests/UserTests.cs
@@ -2,6 +2,8 @@
 
 using BuberDinner.Domain.User.Entities;
 using BuberDinner.Domain.User.ValueObjects;
+using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.RailwayOrientedProgramming.Errors;
 #pragma warning disable IDE0007 // Use var keyword
 
 public class UserTests

diff --git a/Infrastructure/src/Persistence/Dto/UserDto.cs b/Infrastructure/src/Persistence/Dto/UserDto.cs
@@ -2,6 +2,7 @@
 
 using BuberDinner.Domain.User.Entities;
 using BuberDinner.Domain.User.ValueObjects;
+using FunctionalDDD.CommonValueObjects;
 
 public class UserDto
 {

diff --git a/Infrastructure/tests/UserRespositoryTests.cs b/Infrastructure/tests/UserRespositoryTests.cs
@@ -3,6 +3,7 @@
 using BuberDinner.Domain.User.Entities;
 using BuberDinner.Domain.User.ValueObjects;
 using BuberDinner.Infrastructure.Persistence.Cosmos;
+using FunctionalDDD.CommonValueObjects;
 using Xunit.Categories;
 
 [Category("ComponentTests")]

diff --git a/README.md b/README.md
@@ -9,14 +9,13 @@ Watch these YouTube vidoes for the background.
 
 [![REST API following CLEAN ARCHITECTURE & DDD Tutorial](https://img.youtube.com/vi/fhM0V2N1GpY/0.jpg)](https://www.youtube.com/watch?v=fhM0V2N1GpY&list=PLzYkqgWkHPKBcDIP5gzLfASkQyTdy0t4k)
 
-
-This project is also a sample for [FunctionalDDD](https://github.com/xavierjohn/FunctionalDDD) which is a library that helps you to implement Domain-Driven Design in a functional way.
+This is a sample project to showcase the power of the [FunctionalDDD](https://github.com/xavierjohn/FunctionalDDD) library.
 
 ## Concepts & Tech used
 
 * .NET 7, EF Core
 * Clean Architecture & Domain-Driven Design principles
-* Common patterns such as CQRS, unit of work, repository, mediator
+* Common patterns such as CQRS, repository, mediator
 * Open source libraries such as Mediator, FluentValidation, FunctionalDDD, Mapster
 * Authentication: JWT tokens