diff --git a/.github/workflows/chapter-4-contracts-workflow.yml b/.github/workflows/chapter-4-contracts-workflow.yml index ba6a14aa..545aa3b2 100644 --- a/.github/workflows/chapter-4-contracts-workflow.yml +++ b/.github/workflows/chapter-4-contracts-workflow.yml @@ -12,7 +12,7 @@ on: env: CHAPTER_DIR: "Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src" - NUGET_SOURCE_NAME: "evolutionaryArchitecture" + NUGET_SOURCE_NAME: "EvolutionaryArchitecture" jobs: build: @@ -27,14 +27,14 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 9.0.x - - name: Add Evolutionary Architecture Nuget Source - uses: evolutionary-architecture/evolutionary-architecture-by-example/.github@main - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - owner: ${{ github.repository_owner }} - path: ${{ env.CHAPTER_DIR }} - nuget-source-name: ${{ env.NUGET_SOURCE_NAME }} + dotnet-version: 10.0.x + - name: Authenticate to GitHub Packages + run: | + dotnet nuget update source ${{ env.NUGET_SOURCE_NAME }} \ + --username ${{ github.actor }} \ + --password ${{ secrets.GITHUB_TOKEN }} \ + --store-password-in-clear-text \ + --configfile nuget.config - name: Restore dependencies run: dotnet restore - name: Build @@ -52,14 +52,14 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 9.0.x - - name: Add Evolutionary Architecture Nuget Source - uses: evolutionary-architecture/evolutionary-architecture-by-example/.github@main - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - owner: ${{ github.repository_owner }} - path: ${{ env.CHAPTER_DIR }} - nuget-source-name: ${{ env.NUGET_SOURCE_NAME }} + dotnet-version: 10.0.x + - name: Authenticate to GitHub Packages + run: | + dotnet nuget update source ${{ env.NUGET_SOURCE_NAME }} \ + --username ${{ github.actor }} \ + --password ${{ secrets.GITHUB_TOKEN }} \ + --store-password-in-clear-text \ + --configfile nuget.config - name: Restore dependencies run: dotnet restore - name: Test diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Directory.Build.props b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Directory.Build.props index 32629cc7..21ff713d 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Directory.Build.props +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Directory.Build.props @@ -3,7 +3,7 @@ EvolutionaryArchitecture.$(MSBuildProjectName) $(AssemblyName) - net9.0 + net10.0 latest true true diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Directory.Packages.props b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Directory.Packages.props new file mode 100644 index 00000000..11015fa7 --- /dev/null +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Directory.Packages.props @@ -0,0 +1,41 @@ + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/Fitnet.Contracts.Api.UnitTests.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/Fitnet.Contracts.Api.UnitTests.csproj index 3ceeeb28..08049d07 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/Fitnet.Contracts.Api.UnitTests.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/Fitnet.Contracts.Api.UnitTests.csproj @@ -1,20 +1,19 @@ - - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/SignContract/Signatures/SignatureTests.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/SignContract/Signatures/SignatureTests.cs index 1ead2d8d..258fe53d 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/SignContract/Signatures/SignatureTests.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api.UnitTests/SignContract/Signatures/SignatureTests.cs @@ -1,4 +1,5 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Api.UnitTests.SignContract.Signatures; + using EvolutionaryArchitecture.Fitnet.Contracts.Core.SignContract.Signatures; using Core.SignContract.Signatures.Exceptions; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/AttachAnnexToBindingContract/AttachAnnexToBindingContractEndpoint.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/AttachAnnexToBindingContract/AttachAnnexToBindingContractEndpoint.cs index 6bd85529..02b4f087 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/AttachAnnexToBindingContract/AttachAnnexToBindingContractEndpoint.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/AttachAnnexToBindingContract/AttachAnnexToBindingContractEndpoint.cs @@ -18,11 +18,8 @@ internal static void MapAttachAnnexToBindingContract(this IEndpointRouteBuilder await contractsModule.ExecuteCommandAsync(request.ToCommand(id), cancellationToken) .Match(annexId => Results.Created(BuildUrl(id, annexId), annexId), errors => errors.ToProblem())) - .WithOpenApi(operation => new(operation) - { - Summary = "Attach annex to existing binding contract", - Description = "This endpoint is used to attach an annex to an existing binding contract.", - }) + .WithSummary("Attach annex to existing binding contract") + .WithDescription("This endpoint is used to attach an annex to an existing binding contract.") .Produces(StatusCodes.Status201Created) .Produces(StatusCodes.Status404NotFound) .Produces(StatusCodes.Status409Conflict) diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/Fitnet.Contracts.Api.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/Fitnet.Contracts.Api.csproj index 001181fb..d0abec72 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/Fitnet.Contracts.Api.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/Fitnet.Contracts.Api.csproj @@ -1,4 +1,5 @@ + @@ -7,8 +8,6 @@ - - @@ -17,7 +16,7 @@ - + \ No newline at end of file diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/PrepareContract/PrepareContractEndpoint.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/PrepareContract/PrepareContractEndpoint.cs index 92f6fcd7..4f636d1f 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/PrepareContract/PrepareContractEndpoint.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/PrepareContract/PrepareContractEndpoint.cs @@ -17,12 +17,8 @@ await contractsModule.ExecuteCommandAsync(request.ToCommand(), cancellationToken contractId => Results.Created(ContractsApiPaths.GetPreparedContractPath(contractId), (object?)contractId), errors => errors.ToProblem())) .ValidateRequest() - .WithOpenApi(operation => new(operation) - { - Summary = "Triggers preparation of a new contract for new or existing customer", - Description = - "This endpoint is used to prepare a new contract for new and existing customers.", - }) + .WithSummary("Triggers preparation of a new contract for new or existing customer") + .WithDescription("This endpoint is used to prepare a new contract for new and existing customers.") .Produces(StatusCodes.Status201Created) .Produces(StatusCodes.Status409Conflict) .Produces(StatusCodes.Status500InternalServerError); diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/SignContract/SignContractEndpoint.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/SignContract/SignContractEndpoint.cs index 64ed579d..2499e7b1 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/SignContract/SignContractEndpoint.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/SignContract/SignContractEndpoint.cs @@ -20,12 +20,8 @@ await contractsModule bindingContractId => Results.Created($"/{ContractsApiPaths.BindingContracts}/{bindingContractId}", bindingContractId), errors => errors.ToProblem())) .ValidateRequest() - .WithOpenApi(operation => new(operation) - { - Summary = "Signs prepared contract", - Description = - "This endpoint is used to sign prepared contract by customer.", - }) + .WithSummary("Signs prepared contract") + .WithDescription("This endpoint is used to sign prepared contract by customer.") .Produces(StatusCodes.Status201Created) .Produces(StatusCodes.Status404NotFound) .Produces(StatusCodes.Status409Conflict) diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/TerminateBindingContract/TerminateBindingContractEndpoint.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/TerminateBindingContract/TerminateBindingContractEndpoint.cs index f81312a7..ea2257a9 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/TerminateBindingContract/TerminateBindingContractEndpoint.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/TerminateBindingContract/TerminateBindingContractEndpoint.cs @@ -19,11 +19,8 @@ await contractsModule.ExecuteCommandAsync(new TerminateBindingContractCommand(bi .Match( _ => Results.NoContent(), errors => errors.ToProblem())) - .WithOpenApi(operation => new(operation) - { - Summary = "Terminates binding contract", - Description = "This endpoint is used to terminate an existing binding contract." - }) + .WithSummary("Terminates binding contract") + .WithDescription("This endpoint is used to terminate an existing binding contract.") .Produces(StatusCodes.Status204NoContent) .Produces(StatusCodes.Status404NotFound) .Produces(StatusCodes.Status409Conflict) diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/TerminateBindingContract/TerminateContractEndpoint.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/TerminateBindingContract/TerminateContractEndpoint.cs index 35f8132e..d2dddcff 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/TerminateBindingContract/TerminateContractEndpoint.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Api/TerminateBindingContract/TerminateContractEndpoint.cs @@ -19,11 +19,8 @@ internal static void MapTerminateContract(this IEndpointRouteBuilder app) => app return response; }) - .WithOpenApi(operation => new(operation) - { - Summary = "Terminate Binding Contract", - Description = "This endpoint is used to terminate a binding contract by invoking a termination.", - }) + .WithSummary("Terminate Binding Contract") + .WithDescription("This endpoint is used to terminate a binding contract by invoking a termination.") .Produces(StatusCodes.Status204NoContent) .Produces(StatusCodes.Status404NotFound) .Produces(StatusCodes.Status409Conflict) diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Application/Fitnet.Contracts.Application.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Application/Fitnet.Contracts.Application.csproj index 1294f88a..3e4e73a8 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Application/Fitnet.Contracts.Application.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Application/Fitnet.Contracts.Application.csproj @@ -1,11 +1,10 @@ - - - - - - + + + + + diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Application/IBindingContractsRepository.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Application/IBindingContractsRepository.cs index cbeb4dec..e06b045b 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Application/IBindingContractsRepository.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Application/IBindingContractsRepository.cs @@ -4,7 +4,7 @@ public interface IBindingContractsRepository { - Task> GetByIdAsync(Guid bindingContract, CancellationToken cancellationToken = default); + Task> GetByIdAsync(Guid bindingContractId, CancellationToken cancellationToken = default); Task AddAsync(BindingContract bindingContract, CancellationToken cancellationToken = default); Task CommitAsync(CancellationToken cancellationToken = default); } diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/AttachAnnexToBindingContract/BusinessRules/AnnexCanOnlyStartDuringBindingContractPeriodRuleTests.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/AttachAnnexToBindingContract/BusinessRules/AnnexCanOnlyStartDuringBindingContractPeriodRuleTests.cs index d52a4de0..c3162dc2 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/AttachAnnexToBindingContract/BusinessRules/AnnexCanOnlyStartDuringBindingContractPeriodRuleTests.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/AttachAnnexToBindingContract/BusinessRules/AnnexCanOnlyStartDuringBindingContractPeriodRuleTests.cs @@ -46,7 +46,9 @@ internal void [Fact] internal void +#pragma warning disable S4144 Given_attach_annex_When_annex_valid_from_is_equal_to_binding_contract_expired_Then_it_is_possible_to_attach() +#pragma warning restore S4144 { // Arrange var bindingContractExpiringAt = _now; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Common/EntityExtensions.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Common/EntityExtensions.cs index 1962d7da..146b95bf 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Common/EntityExtensions.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Common/EntityExtensions.cs @@ -1,6 +1,6 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.UnitTests.Common; -using DomainDrivenDesign.BuildingBlocks; +using Fitnet.Common.Core; internal static class EntityExtensions { diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Fitnet.Contracts.Core.UnitTests.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Fitnet.Contracts.Core.UnitTests.csproj index d2d4b430..b359f3ff 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Fitnet.Contracts.Core.UnitTests.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core.UnitTests/Fitnet.Contracts.Core.UnitTests.csproj @@ -5,22 +5,22 @@ - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Annex.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Annex.cs index fd68627a..c3ad1e68 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Annex.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Annex.cs @@ -1,7 +1,7 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Core; using AttachAnnexToBindingContract; -using DomainDrivenDesign.BuildingBlocks; +using Common.Core; public sealed class Annex : Entity { diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/AttachAnnexToBindingContract/AnnexAttachedToBindingContractEvent.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/AttachAnnexToBindingContract/AnnexAttachedToBindingContractEvent.cs index c8b40405..20f9d01f 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/AttachAnnexToBindingContract/AnnexAttachedToBindingContractEvent.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/AttachAnnexToBindingContract/AnnexAttachedToBindingContractEvent.cs @@ -1,6 +1,6 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.AttachAnnexToBindingContract; -using DomainDrivenDesign.BuildingBlocks; +using Common.Core; public sealed record AnnexAttachedToBindingContractEvent( Guid Id, diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/BindingContract.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/BindingContract.cs index 632850eb..b83a5b64 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/BindingContract.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/BindingContract.cs @@ -1,8 +1,8 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Core; using AttachAnnexToBindingContract.BusinessRules; +using Common.Core; using Common.Core.BussinessRules; -using DomainDrivenDesign.BuildingBlocks; using SignContract; using TerminateBindingContract; using TerminateBindingContract.BusinessRules; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Contract.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Contract.cs index 334f26ba..c91f154c 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Contract.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Contract.cs @@ -1,7 +1,7 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Core; +using Common.Core; using Common.Core.BussinessRules; -using DomainDrivenDesign.BuildingBlocks; using PrepareContract; using PrepareContract.BusinessRules; using SignContract.BusinessRules; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Fitnet.Contracts.Core.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Fitnet.Contracts.Core.csproj index ea07f1c6..b8bfacc0 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Fitnet.Contracts.Core.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/Fitnet.Contracts.Core.csproj @@ -5,9 +5,8 @@ - - - + + \ No newline at end of file diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/PrepareContract/ContractPreparedEvent.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/PrepareContract/ContractPreparedEvent.cs index c1fa8aad..c1081a06 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/PrepareContract/ContractPreparedEvent.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/PrepareContract/ContractPreparedEvent.cs @@ -1,6 +1,6 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.PrepareContract; -using DomainDrivenDesign.BuildingBlocks; +using Common.Core; public sealed record ContractPreparedEvent( Guid Id, diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/SignContract/BindingContractStartedEvent.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/SignContract/BindingContractStartedEvent.cs index c245e150..7187c0d2 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/SignContract/BindingContractStartedEvent.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/SignContract/BindingContractStartedEvent.cs @@ -1,6 +1,6 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.SignContract; -using DomainDrivenDesign.BuildingBlocks; +using Common.Core; public sealed record BindingContractStartedEvent( Guid Id, diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/TerminateBindingContract/BindingContractTerminatedEvent.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/TerminateBindingContract/BindingContractTerminatedEvent.cs index 274b2af9..6d983699 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/TerminateBindingContract/BindingContractTerminatedEvent.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Core/TerminateBindingContract/BindingContractTerminatedEvent.cs @@ -1,6 +1,6 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Core.TerminateBindingContract; -using DomainDrivenDesign.BuildingBlocks; +using Common.Core; public sealed record BindingContractTerminatedEvent( Guid Id, diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184153_MakeSignedAtColumnNullable.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184153_MakeSignedAtColumnNullable.cs index 8b35b64c..9edfabc1 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184153_MakeSignedAtColumnNullable.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184153_MakeSignedAtColumnNullable.cs @@ -1,6 +1,7 @@ #nullable disable namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database.Migrations; + using System; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184328_AddCustomerIdColumn.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184328_AddCustomerIdColumn.cs index cf6a802e..9d2c633a 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184328_AddCustomerIdColumn.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184328_AddCustomerIdColumn.cs @@ -1,6 +1,7 @@ #nullable disable namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database.Migrations; + using System; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230624171216_ContractsAddColumnsToSupportContractExpiration.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230624171216_ContractsAddColumnsToSupportContractExpiration.cs index 9afbaab9..609ed7f7 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230624171216_ContractsAddColumnsToSupportContractExpiration.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20230624171216_ContractsAddColumnsToSupportContractExpiration.cs @@ -1,6 +1,7 @@ #nullable disable namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database.Migrations; + using System; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20240314062526_AddBindingContractTable.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20240314062526_AddBindingContractTable.cs index 693d8108..d7016004 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20240314062526_AddBindingContractTable.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20240314062526_AddBindingContractTable.cs @@ -1,6 +1,7 @@ #nullable disable namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database.Migrations; + using System; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20240507073145_ChangeBindingContractTerminatedAtToNullable.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20240507073145_ChangeBindingContractTerminatedAtToNullable.cs index 35168c70..19bf460f 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20240507073145_ChangeBindingContractTerminatedAtToNullable.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20240507073145_ChangeBindingContractTerminatedAtToNullable.cs @@ -1,6 +1,7 @@ #nullable disable namespace EvolutionaryArchitecture.Fitnet.Contracts.Infrastructure.Database.Migrations; + using System; using Microsoft.EntityFrameworkCore.Migrations; diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20241026165318_AddSignature.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20241026165318_AddSignature.cs index f5f85dd2..1effbd74 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20241026165318_AddSignature.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/Migrations/20241026165318_AddSignature.cs @@ -1,6 +1,7 @@ #nullable disable namespace EvolutionaryArchitecture.Fitnet.Contracts.Infrastructure.Database.Migrations; + using Microsoft.EntityFrameworkCore.Migrations; /// diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Fitnet.Contracts.Infrastructure.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Fitnet.Contracts.Infrastructure.csproj index dbb232f3..f871542c 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Fitnet.Contracts.Infrastructure.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Fitnet.Contracts.Infrastructure.csproj @@ -5,13 +5,11 @@ - - - - - - - + + + + + diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationEvents/Fitnet.Contracts.IntegrationEvents.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationEvents/Fitnet.Contracts.IntegrationEvents.csproj index ebdf6f17..c4b844a9 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationEvents/Fitnet.Contracts.IntegrationEvents.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationEvents/Fitnet.Contracts.IntegrationEvents.csproj @@ -1,10 +1,9 @@ https://github.com/evolutionary-architecture/evolutionary-architecture-by-example - 1.0.7 + 1.0.8 - - + \ No newline at end of file diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationTests/Fitnet.Contracts.IntegrationTests.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationTests/Fitnet.Contracts.IntegrationTests.csproj index 31cf1a79..7240619f 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationTests/Fitnet.Contracts.IntegrationTests.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.IntegrationTests/Fitnet.Contracts.IntegrationTests.csproj @@ -5,14 +5,11 @@ - - - - - - - - + + + + + diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.sln b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.sln deleted file mode 100644 index 0e93a9f8..00000000 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.sln +++ /dev/null @@ -1,71 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts.Api", "Fitnet.Contracts.Api\Fitnet.Contracts.Api.csproj", "{90539889-7E95-44C5-9429-6360CA4C13D9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts.Application", "Fitnet.Contracts.Application\Fitnet.Contracts.Application.csproj", "{5D7233F3-CA9B-4E24-BFD1-B45DD72A51B9}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts.Core", "Fitnet.Contracts.Core\Fitnet.Contracts.Core.csproj", "{2137CAB0-A8FB-4DC0-A6E3-79AE7DDEB74F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{FA67FD7C-D24A-4733-B6A5-FF78713CBFCD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts.Core.UnitTests", "Fitnet.Contracts.Core.UnitTests\Fitnet.Contracts.Core.UnitTests.csproj", "{ABC9D0F9-7D4F-4C89-8A68-B2DCB5DF93A8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts.IntegrationTests", "Fitnet.Contracts.IntegrationTests\Fitnet.Contracts.IntegrationTests.csproj", "{D806ACEB-452F-4216-9E20-7B85A761A5ED}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts", "Fitnet.Contracts\Fitnet.Contracts.csproj", "{47457A86-2B57-4212-9DD1-C32CC360D1AF}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts.Infrastructure", "Fitnet.Contracts.Infrastructure\Fitnet.Contracts.Infrastructure.csproj", "{6B7A0868-E3D4-41C7-AE5C-C6D2FAD24314}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts.Api.UnitTests", "Fitnet.Contracts.Api.UnitTests\Fitnet.Contracts.Api.UnitTests.csproj", "{27C6CD2F-9252-42F0-B952-188F848FBD39}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fitnet.Contracts.IntegrationEvents", "Fitnet.Contracts.IntegrationEvents\Fitnet.Contracts.IntegrationEvents.csproj", "{0A0A7C05-D0FB-4FC3-95D3-1B1511D0B24D}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {90539889-7E95-44C5-9429-6360CA4C13D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {90539889-7E95-44C5-9429-6360CA4C13D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {90539889-7E95-44C5-9429-6360CA4C13D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {90539889-7E95-44C5-9429-6360CA4C13D9}.Release|Any CPU.Build.0 = Release|Any CPU - {5D7233F3-CA9B-4E24-BFD1-B45DD72A51B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5D7233F3-CA9B-4E24-BFD1-B45DD72A51B9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5D7233F3-CA9B-4E24-BFD1-B45DD72A51B9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5D7233F3-CA9B-4E24-BFD1-B45DD72A51B9}.Release|Any CPU.Build.0 = Release|Any CPU - {2137CAB0-A8FB-4DC0-A6E3-79AE7DDEB74F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2137CAB0-A8FB-4DC0-A6E3-79AE7DDEB74F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2137CAB0-A8FB-4DC0-A6E3-79AE7DDEB74F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2137CAB0-A8FB-4DC0-A6E3-79AE7DDEB74F}.Release|Any CPU.Build.0 = Release|Any CPU - {ABC9D0F9-7D4F-4C89-8A68-B2DCB5DF93A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ABC9D0F9-7D4F-4C89-8A68-B2DCB5DF93A8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ABC9D0F9-7D4F-4C89-8A68-B2DCB5DF93A8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ABC9D0F9-7D4F-4C89-8A68-B2DCB5DF93A8}.Release|Any CPU.Build.0 = Release|Any CPU - {D806ACEB-452F-4216-9E20-7B85A761A5ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D806ACEB-452F-4216-9E20-7B85A761A5ED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D806ACEB-452F-4216-9E20-7B85A761A5ED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D806ACEB-452F-4216-9E20-7B85A761A5ED}.Release|Any CPU.Build.0 = Release|Any CPU - {47457A86-2B57-4212-9DD1-C32CC360D1AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {47457A86-2B57-4212-9DD1-C32CC360D1AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {47457A86-2B57-4212-9DD1-C32CC360D1AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {47457A86-2B57-4212-9DD1-C32CC360D1AF}.Release|Any CPU.Build.0 = Release|Any CPU - {6B7A0868-E3D4-41C7-AE5C-C6D2FAD24314}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6B7A0868-E3D4-41C7-AE5C-C6D2FAD24314}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6B7A0868-E3D4-41C7-AE5C-C6D2FAD24314}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6B7A0868-E3D4-41C7-AE5C-C6D2FAD24314}.Release|Any CPU.Build.0 = Release|Any CPU - {27C6CD2F-9252-42F0-B952-188F848FBD39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27C6CD2F-9252-42F0-B952-188F848FBD39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27C6CD2F-9252-42F0-B952-188F848FBD39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27C6CD2F-9252-42F0-B952-188F848FBD39}.Release|Any CPU.Build.0 = Release|Any CPU - {0A0A7C05-D0FB-4FC3-95D3-1B1511D0B24D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0A0A7C05-D0FB-4FC3-95D3-1B1511D0B24D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0A0A7C05-D0FB-4FC3-95D3-1B1511D0B24D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0A0A7C05-D0FB-4FC3-95D3-1B1511D0B24D}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {ABC9D0F9-7D4F-4C89-8A68-B2DCB5DF93A8} = {FA67FD7C-D24A-4733-B6A5-FF78713CBFCD} - {D806ACEB-452F-4216-9E20-7B85A761A5ED} = {FA67FD7C-D24A-4733-B6A5-FF78713CBFCD} - {27C6CD2F-9252-42F0-B952-188F848FBD39} = {FA67FD7C-D24A-4733-B6A5-FF78713CBFCD} - EndGlobalSection -EndGlobal diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.slnx b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.slnx new file mode 100644 index 00000000..5d06360a --- /dev/null +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts.slnx @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Fitnet.Contracts.csproj b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Fitnet.Contracts.csproj index d1d1b3fd..570da883 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Fitnet.Contracts.csproj +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Fitnet.Contracts.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Program.cs b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Program.cs index a39a6ebe..55dbd503 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Program.cs +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/Fitnet.Contracts/Program.cs @@ -26,7 +26,7 @@ app.MapControllers(); app.RegisterContractsApi(); -app.Run(); +await app.RunAsync(); namespace EvolutionaryArchitecture.Fitnet.Contracts { diff --git a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/nuget.config b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/nuget.config index ebc8ad3a..d167d5f4 100644 --- a/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/nuget.config +++ b/Chapter-4-applying-tactical-domain-driven-design/Fitnet.Contracts/Src/nuget.config @@ -7,13 +7,17 @@ - - + + + - - - - - - + + + + + + + + + \ No newline at end of file