xavierjohn · xavierjohn · Sep 29, 2023 · Sep 29, 2023
diff --git a/Api/src/2022-12-21/Controllers/MenusController.cs b/Api/src/2022-12-21/Controllers/MenusController.cs
@@ -2,7 +2,7 @@
 
 using Asp.Versioning;
 using BuberDinner.Api._2022_12_21.Models.Menus;
-using FunctionalDDD.Asp;
+using FunctionalDDD.Results.Asp;
 using Mapster;
 using Mediator;
 using Microsoft.AspNetCore.Mvc;

diff --git a/Api/src/2022-12-21/Models/Menus/CreateMenuRequest.cs b/Api/src/2022-12-21/Models/Menus/CreateMenuRequest.cs
@@ -2,7 +2,6 @@
 
 using BuberDinner.Application.Menus.Commands;
 using BuberDinner.Domain.Host.ValueObject;
-using FunctionalDDD;
 using DescriptionClass = Domain.Common.ValueObjects.Description;
 using NameClass = Domain.Common.ValueObjects.Name;
 

diff --git a/Api/src/Neutral/Controllers/AuthenticationController.cs b/Api/src/Neutral/Controllers/AuthenticationController.cs
@@ -2,7 +2,7 @@
 
 using Asp.Versioning;
 using BuberDinner.Api.Neutral.Models.Authentication;
-using FunctionalDDD.Asp;
+using FunctionalDDD.Results.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,7 +1,7 @@
 namespace BuberDinner.Api.Neutral.Models.Authentication;
 
 using BuberDinner.Application.Services.Authentication.Commands;
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 using FirstNameClass = Domain.User.ValueObjects.FirstName;
 using LastNameClass = Domain.User.ValueObjects.LastName;
 using PasswordClass = Domain.User.ValueObjects.Password;

diff --git a/Api/src/SwaggerDefaultValues.cs b/Api/src/SwaggerDefaultValues.cs
@@ -7,7 +7,7 @@
 using System.Text.Json;
 
 /// <summary>
-/// Represents the OpenAPI/Swashbuckle operation filter used to document information provided, but not used.
+/// Represents the OpenAPI/Swash-buckle operation filter used to document information provided, but not used.
 /// </summary>
 /// <remarks>This <see cref="IOperationFilter"/> is only required due to bugs in the <see cref="SwaggerGenerator"/>.
 /// Once they are fixed and published, this class can be removed.</remarks>

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

diff --git a/Api/tests/BuberDinner.Api.Tests.csproj b/Api/tests/BuberDinner.Api.Tests.csproj
@@ -6,4 +6,10 @@
    <ItemGroup>
       <ProjectReference Include="..\src\BuberDinner.Api.csproj" />
    </ItemGroup>
+   <ItemGroup>
+     <PackageReference Update="xunit.runner.visualstudio">
+       <PrivateAssets>all</PrivateAssets>
+       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+     </PackageReference>
+   </ItemGroup>
 </Project>
diff --git a/Api/tests/Neutral/LoginRequestTests.cs b/Api/tests/Neutral/LoginRequestTests.cs
@@ -2,7 +2,7 @@
 
 using BuberDinner.Api.Neutral.Models.Authentication;
 using BuberDinner.Domain.User.ValueObjects;
-using FunctionalDDD.RailwayOrientedProgramming.Errors;
+using FunctionalDDD.Results.Errors;
 
 public class LoginRequestTests
 {

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

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

diff --git a/Application/src/Authentication/Queries/LoginQueryHandler.cs b/Application/src/Authentication/Queries/LoginQueryHandler.cs
@@ -15,9 +15,9 @@ internal class LoginQueryHandler :
         private readonly IJwtTokenGenerator _jwtTokenGenerator;
         private readonly IRepository<User> _userRepository;
 
-        public LoginQueryHandler(IJwtTokenGenerator jwtTokenGenerator, IRepository<User> userRepository)
+        public LoginQueryHandler(IJwtTokenGenerator jWtTokenGenerator, IRepository<User> userRepository)
         {
-            _jwtTokenGenerator = jwtTokenGenerator;
+            _jwtTokenGenerator = jWtTokenGenerator;
             _userRepository = userRepository;
         }
 

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

diff --git a/Application/tests/BuberDinner.Application.Tests.csproj b/Application/tests/BuberDinner.Application.Tests.csproj
@@ -15,4 +15,12 @@
     </None>
   </ItemGroup>
 
+
+  <ItemGroup>
+    <PackageReference Update="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
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.RailwayOrientedProgramming" />
+    <Using Include="FunctionalDDD.Results" />
   </ItemGroup>
 
   <!-- Test projects. -->

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -7,16 +7,16 @@
     <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.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.Asp" Version="1.1.0-alpha.18" />
+    <PackageVersion Include="FunctionalDDD.CommonValueObjectGenerator" Version="1.1.0-alpha.18" />
+    <PackageVersion Include="FunctionalDDD.CommonValueObjects" Version="1.1.0-alpha.18" />
+    <PackageVersion Include="FunctionalDDD.DomainDrivenDesign" Version="1.1.0-alpha.18" />
+    <PackageVersion Include="FunctionalDDD.FluentValidation" Version="1.1.0-alpha.18" />
     <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.6" />
-    <PackageVersion Include="Mediator.SourceGenerator" Version="2.1.6" />
+    <PackageVersion Include="Mapster" Version="7.4.0" />
+    <PackageVersion Include="Mapster.DependencyInjection" Version="1.0.1" />
+    <PackageVersion Include="Mediator.Abstractions" Version="2.1.7" />
+    <PackageVersion Include="Mediator.SourceGenerator" Version="2.1.7" />
     <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.11" />
@@ -27,17 +27,17 @@
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.0.0" />
+    <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="7.0.1" />
   </ItemGroup>
   <!-- Test -->
   <ItemGroup>
     <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" Version="2.5.1" />
+    <PackageVersion Include="Xunit.DependencyInjection" Version="8.9.0" />
     <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.1" />
     <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,6 +1,6 @@
 namespace BuberDinner.Domain.Errors;
 
-using FunctionalDDD.RailwayOrientedProgramming.Errors;
+using FunctionalDDD.Results.Errors;
 
 public partial class Errors
 {

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

diff --git a/Domain/src/Common/ValueObjects/Description.cs b/Domain/src/Common/ValueObjects/Description.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.Common.ValueObjects;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class Description : RequiredString<Description>
 {

diff --git a/Domain/src/Common/ValueObjects/Name.cs b/Domain/src/Common/ValueObjects/Name.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.Common.ValueObjects;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class Name : RequiredString<Name>
 {

diff --git a/Domain/src/Dinner/ValueObjects/DinnerId.cs b/Domain/src/Dinner/ValueObjects/DinnerId.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.Dinner.ValueObject;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class DinnerId : RequiredGuid<DinnerId>
 {

diff --git a/Domain/src/Host/ValueObjects/HostId.cs b/Domain/src/Host/ValueObjects/HostId.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.Host.ValueObject;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class HostId : RequiredGuid<HostId>
 {

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

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

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

diff --git a/Domain/src/Menu/ValueObjects/MenuId.cs b/Domain/src/Menu/ValueObjects/MenuId.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.Menu.ValueObject;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class MenuId : RequiredGuid<MenuId>
 {

diff --git a/Domain/src/Menu/ValueObjects/MenuItemId.cs b/Domain/src/Menu/ValueObjects/MenuItemId.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.Menu.ValueObject;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class MenuItemId : RequiredGuid<MenuItemId>
 {

diff --git a/Domain/src/Menu/ValueObjects/MenuSectionId.cs b/Domain/src/Menu/ValueObjects/MenuSectionId.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.Menu.ValueObject;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class MenuSectionId : RequiredGuid<MenuSectionId>
 {

diff --git a/Domain/src/MenuReview/ValueObjects/MenuId.cs b/Domain/src/MenuReview/ValueObjects/MenuId.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.Menu.ValueObject;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class MenuReviewId : RequiredGuid<MenuReviewId>
 {

diff --git a/Domain/src/User/Entities/User.cs b/Domain/src/User/Entities/User.cs
@@ -2,9 +2,7 @@
 
 using BuberDinner.Domain.User.ValueObjects;
 using FluentValidation;
-using FunctionalDDD.CommonValueObjects;
-using FunctionalDDD.DomainDrivenDesign;
-using FunctionalDDD.FluentValidation;
+using FunctionalDDD.Domain;
 
 public class User : Entity<UserId>
 {

diff --git a/Domain/src/User/ValueObjects/FirstName.cs b/Domain/src/User/ValueObjects/FirstName.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class FirstName : RequiredString<FirstName>
 {

diff --git a/Domain/src/User/ValueObjects/LastName.cs b/Domain/src/User/ValueObjects/LastName.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class LastName : RequiredString<LastName>
 {

diff --git a/Domain/src/User/ValueObjects/Password.cs b/Domain/src/User/ValueObjects/Password.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class Password : RequiredString<Password>
 {

diff --git a/Domain/src/User/ValueObjects/UserId.cs b/Domain/src/User/ValueObjects/UserId.cs
@@ -1,6 +1,6 @@
 namespace BuberDinner.Domain.User.ValueObjects;
 
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public partial class UserId : RequiredString<UserId>
 {

diff --git a/Domain/tests/BuberDinner.Domain.Tests.csproj b/Domain/tests/BuberDinner.Domain.Tests.csproj
@@ -4,4 +4,11 @@
     <ProjectReference Include="..\src\BuberDinner.Domain.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Update="xunit.runner.visualstudio">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>
diff --git a/Domain/tests/MenuTests.cs b/Domain/tests/MenuTests.cs
@@ -5,7 +5,7 @@
 using BuberDinner.Domain.Menu;
 using BuberDinner.Domain.Menu.Entities;
 using BuberDinner.Domain.Menu.ValueObject;
-using FunctionalDDD.RailwayOrientedProgramming.Errors;
+using FunctionalDDD.Results.Errors;
 
 public class MenuTests
 {

diff --git a/Domain/tests/UserTests.cs b/Domain/tests/UserTests.cs
@@ -2,8 +2,8 @@
 
 using BuberDinner.Domain.User.Entities;
 using BuberDinner.Domain.User.ValueObjects;
-using FunctionalDDD.CommonValueObjects;
-using FunctionalDDD.RailwayOrientedProgramming.Errors;
+using FunctionalDDD.Domain;
+using FunctionalDDD.Results.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
@@ -1,8 +1,10 @@
-namespace BuberDinner.Infrastructure.Persistence.Dto;
+// Ignore Spelling: Dto
+
+namespace BuberDinner.Infrastructure.Persistence.Dto;
 
 using BuberDinner.Domain.User.Entities;
 using BuberDinner.Domain.User.ValueObjects;
-using FunctionalDDD.CommonValueObjects;
+using FunctionalDDD.Domain;
 
 public class UserDto
 {

diff --git a/Infrastructure/tests/BuberDinner.Infrastructure.Tests.csproj b/Infrastructure/tests/BuberDinner.Infrastructure.Tests.csproj
@@ -6,4 +6,10 @@
    <ItemGroup>
     <ProjectReference Include="..\src\BuberDinner.Infrastructure.csproj" />
   </ItemGroup>
+   <ItemGroup>
+     <PackageReference Update="xunit.runner.visualstudio">
+       <PrivateAssets>all</PrivateAssets>
+       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+     </PackageReference>
+   </ItemGroup>
 </Project>