Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use business rule validators from Common Packages 📦 #139

Merged
merged 8 commits into from
Jun 8, 2024
Merged

use business rule validators from Common Packages 📦 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
43dbe5b
feat: update packages
kamilbaczek Jun 1, 2024
3093d75
feat: use common bussiness rules
kamilbaczek Jun 1, 2024
3a0fe00
fix: use common error assertions
kamilbaczek Jun 1, 2024
4036e0b
fix: disable paramters checking
kamilbaczek Jun 2, 2024
45d2d63
fix: disable warning
kamilbaczek Jun 5, 2024
62b6006
fix: restore xunit package
kamilbaczek Jun 6, 2024
cfa0cdf
fix: downgrade version
kamilbaczek Jun 6, 2024
db5cfaf
fix: downgrade xunit version
kamilbaczek Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions ...Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/Fitnet.Contracts.Api.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="Bogus" Version="35.4.1" />
<PackageReference Include="Bogus" Version="35.5.1" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.analyzers" Version="1.11.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.analyzers" Version="1.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.categories" Version="2.0.8" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion ...n-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/Common/Errors/ProblemResults.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Api.Common.Errors;

using Core.Common.BussinessRules;
using Fitnet.Common.Core.BussinessRules;
using Microsoft.AspNetCore.Http;
using static ErrorType;

Expand Down
2 changes: 1 addition & 1 deletion ...omain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/Fitnet.Contracts.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions ...ign/Fitnet.Contracts/Src/Fitnet.Contracts.Application/Fitnet.Contracts.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<ItemGroup>
<PackageReference Include="ErrorOr" Version="2.0.1" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.api" Version="4.1.1" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.api" Version="4.1.2" />
<PackageReference Include="evolutionaryarchitecture.fitnet.contracts.integrationevents" Version="1.0.7" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="MassTransit.Abstractions" Version="8.1.3" />
<PackageReference Include="MassTransit.Abstractions" Version="8.2.2" />
<PackageReference Include="MediatR" Version="12.2.0" />
</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions ...ToBindingContract/BusinessRules/AnnexCanOnlyBeAttachedToActiveBindingContractRuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.AttachAnnexToBindingContract.BusinessRules;

using Common.Assertions.ErrorOr;
using Core.AttachAnnexToBindingContract.BusinessRules;
using Core.Common.BussinessRules;
using Fitnet.Common.Core.BussinessRules;

public sealed class AnnexCanOnlyBeAttachedToActiveBindingContractRuleTests
{
Expand Down
3 changes: 1 addition & 2 deletions ...xToBindingContract/BusinessRules/AnnexCanOnlyStartDuringBindingContractPeriodRuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.AttachAnnexToBindingContract.BusinessRules;

using Common.Assertions.ErrorOr;
using Core.AttachAnnexToBindingContract.BusinessRules;
using Core.Common.BussinessRules;
using Fitnet.Common.Core.BussinessRules;

public sealed class AnnexCanOnlyStartDuringBindingContractPeriodRuleTests
{
Expand Down
18 changes: 11 additions & 7 deletions ...tnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Fitnet.Contracts.Core.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,22 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Bogus" Version="35.4.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.1" />
<PackageReference Include="Bogus" Version="35.5.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.2" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.UnitTesting" Version="4.1.5" />
<PackageReference Include="FluentAssertions" Version="6.12.0" />
<PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.analyzers" Version="1.11.0" />
<PackageReference Include="xunit" Version="2.6.6" />
<PackageReference Include="xunit.analyzers" Version="1.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="xunit.categories" Version="2.0.8" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="coverlet.collector" Version="6.0.1">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
<PackageReference Include="coverlet.collector" Version="6.0.2">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
1 change: 1 addition & 0 deletions ...domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/GlobalUsings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
global using ErrorOr;
global using EvolutionaryArchitecture.Fitnet.Common.UnitTesting.Assertions.ErrorOr;
global using FluentAssertions;
global using Xunit;
3 changes: 1 addition & 2 deletions ...ore.UnitTests/PrepareContract/BusinessRules/ContractCanBePreparedOnlyForAdultRuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.PrepareContract.BusinessRules;

using Common.Assertions.ErrorOr;
using Core.Common.BussinessRules;
using Core.PrepareContract.BusinessRules;
using Fitnet.Common.Core.BussinessRules;

public sealed class ContractCanBePreparedOnlyForAdultRuleTests
{
Expand Down
3 changes: 1 addition & 2 deletions ...sts/PrepareContract/BusinessRules/CustomerMustBeSmallerThanMaximumHeightLimitRuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.PrepareContract.BusinessRules;

using Common.Assertions.ErrorOr;
using Core.Common.BussinessRules;
using Core.PrepareContract.BusinessRules;
using Fitnet.Common.Core.BussinessRules;

public sealed class CustomerMustBeSmallerThanMaximumHeightLimitRuleTests
{
Expand Down
3 changes: 1 addition & 2 deletions ...ts.Core.UnitTests/PrepareContract/BusinessRules/PreviousContractHasToBeSignedRuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.PrepareContract.BusinessRules;

using Common.Assertions.ErrorOr;
using Core.Common.BussinessRules;
using Core.PrepareContract.BusinessRules;
using Fitnet.Common.Core.BussinessRules;

public sealed class PreviousContractHasToBeSignedRuleTests
{
Expand Down
3 changes: 1 addition & 2 deletions ...SignContract/BusinessRules/ContractCanOnlyBeSignedWithin30DaysFromPreparationRuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.SignContract.BusinessRules;

using Common.Assertions.ErrorOr;
using Core.Common.BussinessRules;
using Core.SignContract.BusinessRules;
using Fitnet.Common.Core.BussinessRules;

public sealed class ContractCanOnlyBeSignedWithin30DaysFromPreparationRuleTests
{
Expand Down
3 changes: 1 addition & 2 deletions ...acts.Core.UnitTests/SignContract/BusinessRules/ContractMustNotBeAlreadySignedRuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.SignContract.BusinessRules;

using Common.Assertions.ErrorOr;
using Core.Common.BussinessRules;
using Core.SignContract.BusinessRules;
using Fitnet.Common.Core.BussinessRules;

public sealed class ContractMustNotBeAlreadySignedRuleTests
{
Expand Down
3 changes: 1 addition & 2 deletions ...BindingContract/BusinessRules/TerminationIsPossibleOnlyAfterThreeMonthsHavePassedTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.TerminateBindingContract.BusinessRules;

using Common.Assertions.ErrorOr;
using Core.Common.BussinessRules;
using Core.TerminateBindingContract.BusinessRules;
using Fitnet.Common.Core.BussinessRules;
using TerminationIsPossibleOnlyAfterThreeMonthsHavePassed.TestData;

public sealed class TerminationIsPossibleOnlyAfterThreeMonthsHavePassedTests
Expand Down
2 changes: 1 addition & 1 deletion ...AnnexToBindingContract/BusinessRules/AnnexCanOnlyBeAttachedToActiveBindingContractRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.AttachAnnexToBindingContract.BusinessRules;

using Common.BussinessRules;
using Common.Core.BussinessRules;

internal sealed class AnnexCanOnlyBeAttachedToActiveBindingContractRule : IBusinessRule
{
Expand Down
2 changes: 1 addition & 1 deletion ...hAnnexToBindingContract/BusinessRules/AnnexCanOnlyStartDuringBindingContractPeriodRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.AttachAnnexToBindingContract.BusinessRules;

using Common.BussinessRules;
using Common.Core.BussinessRules;

internal sealed class AnnexCanOnlyStartDuringBindingContractPeriodRule : IBusinessRule
{
Expand Down
2 changes: 1 addition & 1 deletion ...ctical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/BindingContract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core;

using AttachAnnexToBindingContract.BusinessRules;
using Common.BussinessRules;
using Common.Core.BussinessRules;
using DomainDrivenDesign.BuildingBlocks;
using SignContract;
using TerminateBindingContract;
Expand Down
7 changes: 0 additions & 7 deletions ...design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Common/BussinessRules/BusinessErrors.cs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...Fitnet.Contracts/Src/Fitnet.Contracts.Core/Common/BussinessRules/BusinessRuleValidator.cs
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ...-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Common/BussinessRules/IBusinessRule.cs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...ying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Contract.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core;

using Common.BussinessRules;
using Common.Core.BussinessRules;
using DomainDrivenDesign.BuildingBlocks;
using PrepareContract;
using PrepareContract.BusinessRules;
Expand Down
2 changes: 1 addition & 1 deletion ...ain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Fitnet.Contracts.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<ItemGroup>
<PackageReference Include="ErrorOr" Version="2.0.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Core" Version="4.1.2" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.DomainDrivenDesign.BuildingBlocks" Version="1.2.1" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion ...net.Contracts.Core/PrepareContract/BusinessRules/ContractCanBePreparedOnlyForAdultRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.PrepareContract.BusinessRules;

using Common.BussinessRules;
using Common.Core.BussinessRules;

internal sealed class ContractCanBePreparedOnlyForAdultRule : IBusinessRule
{
Expand Down
2 changes: 1 addition & 1 deletion ...cts.Core/PrepareContract/BusinessRules/CustomerMustBeSmallerThanMaximumHeightLimitRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.PrepareContract.BusinessRules;

using Common.BussinessRules;
using Common.Core.BussinessRules;

internal sealed class CustomerMustBeSmallerThanMaximumHeightLimitRule : IBusinessRule
{
Expand Down
2 changes: 1 addition & 1 deletion .../Fitnet.Contracts.Core/PrepareContract/BusinessRules/PreviousContractHasToBeSignedRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.PrepareContract.BusinessRules;

using Common.BussinessRules;
using Common.Core.BussinessRules;

internal sealed class PreviousContractHasToBeSignedRule : IBusinessRule
{
Expand Down
2 changes: 1 addition & 1 deletion ...Core/SignContract/BusinessRules/ContractCanOnlyBeSignedWithin30DaysFromPreparationRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.SignContract.BusinessRules;

using Common.BussinessRules;
using Common.Core.BussinessRules;

internal sealed class ContractCanOnlyBeSignedWithin30DaysFromPreparationRule : IBusinessRule
{
Expand Down
2 changes: 1 addition & 1 deletion ...rc/Fitnet.Contracts.Core/SignContract/BusinessRules/ContractMustNotBeAlreadySignedRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.SignContract.BusinessRules;

using Common.BussinessRules;
using Common.Core.BussinessRules;

internal sealed class ContractMustNotBeAlreadySignedRule(bool signed) : IBusinessRule
{
Expand Down
2 changes: 1 addition & 1 deletion ...eBindingContract/BusinessRules/TerminationIsPossibleOnlyAfterThreeMonthsHavePassedRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.TerminateBindingContract.BusinessRules;

using Common.BussinessRules;
using Common.Core.BussinessRules;

internal sealed class TerminationIsPossibleOnlyAfterThreeMonthsHavePassedRule(DateTimeOffset bindingFrom, DateTimeOffset terminatedAt)
: IBusinessRule
Expand Down
8 changes: 4 additions & 4 deletions ...tnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Fitnet.Contracts.Infrastructure.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MassTransit" Version="8.1.3" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.1.3" />
<PackageReference Include="MassTransit" Version="8.2.2" />
<PackageReference Include="MassTransit.RabbitMQ" Version="8.2.2" />
<PackageReference Include="MediatR" Version="12.2.0" />
<PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.2" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ontracts/Src/Fitnet.Contracts.IntegrationEvents/Fitnet.Contracts.IntegrationEvents.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
<Version>1.0.7</Version>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Infrastructure" Version="4.1.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Infrastructure" Version="4.1.2" />
</ItemGroup>
</Project>
6 changes: 3 additions & 3 deletions ....Contracts/Src/Fitnet.Contracts.IntegrationTests/Fitnet.Contracts.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="evolutionaryarchitecture.fitnet.common.api" Version="4.1.1" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.integrationteststoolbox" Version="4.1.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.api" Version="4.1.2" />
<PackageReference Include="evolutionaryarchitecture.fitnet.common.integrationteststoolbox" Version="4.1.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions ...ctical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Fitnet.Contracts.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="4.1.1" />
<PackageReference Include="EvolutionaryArchitecture.Fitnet.Common.Api" Version="4.1.2" />
<PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading