diff --git a/Api/src/2022-12-21/Controllers/MenusController.cs b/Api/src/2022-12-21/Controllers/MenusController.cs index c856ecf..ce4730f 100644 --- 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 index 187c089..d55c4ce 100644 --- 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 index f0a78ba..7936f50 100644 --- 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 index d045ea7..c344b74 100644 --- 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 index 0599d36..b06a0d9 100644 --- a/Api/src/SwaggerDefaultValues.cs +++ b/Api/src/SwaggerDefaultValues.cs @@ -7,7 +7,7 @@ using System.Text.Json; /// -/// 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. /// /// This is only required due to bugs in the . /// Once they are fixed and published, this class can be removed. diff --git a/Api/tests/2022-12-21/CreateMenuRequestTests.cs b/Api/tests/2022-12-21/CreateMenuRequestTests.cs index 4b046b9..d2a25d9 100644 --- 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 index d80368d..f80bdce 100644 --- a/Api/tests/BuberDinner.Api.Tests.csproj +++ b/Api/tests/BuberDinner.Api.Tests.csproj @@ -6,4 +6,10 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/Api/tests/Neutral/LoginRequestTests.cs b/Api/tests/Neutral/LoginRequestTests.cs index 687f619..5f6e4d3 100644 --- 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 index 351e9f5..56d6791 100644 --- 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 index 7beada2..dbe77bd 100644 --- 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 index 5817302..4565dd5 100644 --- 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 _userRepository; - public LoginQueryHandler(IJwtTokenGenerator jwtTokenGenerator, IRepository userRepository) + public LoginQueryHandler(IJwtTokenGenerator jWtTokenGenerator, IRepository userRepository) { - _jwtTokenGenerator = jwtTokenGenerator; + _jwtTokenGenerator = jWtTokenGenerator; _userRepository = userRepository; } diff --git a/Application/tests/Authentication/AuthenticationTests.cs b/Application/tests/Authentication/AuthenticationTests.cs index 68d2ac9..f994f33 100644 --- 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 index 32337a6..4d4988a 100644 --- a/Application/tests/BuberDinner.Application.Tests.csproj +++ b/Application/tests/BuberDinner.Application.Tests.csproj @@ -15,4 +15,12 @@ + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/Directory.Build.props b/Directory.Build.props index 020c3f7..b343077 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -23,7 +23,7 @@ - + diff --git a/Directory.Packages.props b/Directory.Packages.props index bdb765a..14fc810 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,16 +7,16 @@ - - - - - + + + + + - - - - + + + + @@ -27,17 +27,17 @@ - + - - + + - + \ No newline at end of file diff --git a/Domain/src/Common/Errors/Errors.Authentication.cs b/Domain/src/Common/Errors/Errors.Authentication.cs index 2042d02..cc18acc 100644 --- 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 index 5e10dcf..e06ca17 100644 --- 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 index 57cbf06..5f2b7e7 100644 --- 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 { diff --git a/Domain/src/Common/ValueObjects/Name.cs b/Domain/src/Common/ValueObjects/Name.cs index 9ac62da..d1392c4 100644 --- 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 { diff --git a/Domain/src/Dinner/ValueObjects/DinnerId.cs b/Domain/src/Dinner/ValueObjects/DinnerId.cs index 02bd026..872e1e9 100644 --- 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 { diff --git a/Domain/src/Host/ValueObjects/HostId.cs b/Domain/src/Host/ValueObjects/HostId.cs index 412e683..e852917 100644 --- 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 { diff --git a/Domain/src/Menu/Entities/MenuItem.cs b/Domain/src/Menu/Entities/MenuItem.cs index 17b67f6..d4521fe 100644 --- 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 { diff --git a/Domain/src/Menu/Entities/MenuSection.cs b/Domain/src/Menu/Entities/MenuSection.cs index c957d44..d5ede74 100644 --- 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 { diff --git a/Domain/src/Menu/Menu.cs b/Domain/src/Menu/Menu.cs index 696c7df..e131182 100644 --- 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 +public class Menu : Aggregate { public Name Name { get; } public Description Description { get; } diff --git a/Domain/src/Menu/ValueObjects/MenuId.cs b/Domain/src/Menu/ValueObjects/MenuId.cs index 196b343..796ee92 100644 --- 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 { diff --git a/Domain/src/Menu/ValueObjects/MenuItemId.cs b/Domain/src/Menu/ValueObjects/MenuItemId.cs index 1087b6a..03f4a47 100644 --- 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 { diff --git a/Domain/src/Menu/ValueObjects/MenuSectionId.cs b/Domain/src/Menu/ValueObjects/MenuSectionId.cs index bcd8cf7..a3cbae2 100644 --- 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 { diff --git a/Domain/src/MenuReview/ValueObjects/MenuId.cs b/Domain/src/MenuReview/ValueObjects/MenuId.cs index 8ed7359..acf8c74 100644 --- 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 { diff --git a/Domain/src/User/Entities/User.cs b/Domain/src/User/Entities/User.cs index a71ffc8..2edb5ad 100644 --- 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 { diff --git a/Domain/src/User/ValueObjects/FirstName.cs b/Domain/src/User/ValueObjects/FirstName.cs index 506ce8b..786a770 100644 --- 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 { diff --git a/Domain/src/User/ValueObjects/LastName.cs b/Domain/src/User/ValueObjects/LastName.cs index f86ce5c..916ed87 100644 --- 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 { diff --git a/Domain/src/User/ValueObjects/Password.cs b/Domain/src/User/ValueObjects/Password.cs index 59acabf..62f6725 100644 --- 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 { diff --git a/Domain/src/User/ValueObjects/UserId.cs b/Domain/src/User/ValueObjects/UserId.cs index d07926f..88b0b33 100644 --- 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 { diff --git a/Domain/tests/BuberDinner.Domain.Tests.csproj b/Domain/tests/BuberDinner.Domain.Tests.csproj index ef7d598..102544d 100644 --- a/Domain/tests/BuberDinner.Domain.Tests.csproj +++ b/Domain/tests/BuberDinner.Domain.Tests.csproj @@ -4,4 +4,11 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/Domain/tests/MenuTests.cs b/Domain/tests/MenuTests.cs index 4f88f11..de28f4b 100644 --- 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 index 8e28834..5dccb30 100644 --- 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 index 4c96113..bc1a381 100644 --- 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 index b9fb1f1..6d114bc 100644 --- a/Infrastructure/tests/BuberDinner.Infrastructure.Tests.csproj +++ b/Infrastructure/tests/BuberDinner.Infrastructure.Tests.csproj @@ -6,4 +6,10 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/Infrastructure/tests/UserRespositoryTests.cs b/Infrastructure/tests/UserRespositoryTests.cs index 08a9065..5506abf 100644 --- a/Infrastructure/tests/UserRespositoryTests.cs +++ b/Infrastructure/tests/UserRespositoryTests.cs @@ -3,7 +3,7 @@ using BuberDinner.Domain.User.Entities; using BuberDinner.Domain.User.ValueObjects; using BuberDinner.Infrastructure.Persistence.Cosmos; -using FunctionalDDD.CommonValueObjects; +using FunctionalDDD.Domain; using Xunit.Categories; [Category("ComponentTests")]