Browse Source
Merge branch 'order-processflow-redesign' of https://github.com/dotnet-architecture/eShopOnContainers into order-processflow-redesign
pull/809/head
Eduard Tomas
7 years ago
27 changed files with 539 additions and 13 deletions
Split View
Diff Options
-
+8 -0docker-compose.override.yml
-
+15 -0docker-compose.vs.debug.yml
-
+10 -0docker-compose.vs.release.yml
-
+6 -0docker-compose.yml
-
+55 -1eShopOnContainers-ServicesAndWebApps.sln
-
+1 -0src/Services/Identity/Identity.API/Identity.API.csproj
-
+21 -0src/Services/Ordering/Ordering.API/Application/Commands/CancelOrderCommand.cs
-
+2 -2src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/BuyerAndPaymentMethodVerified/UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler.cs
-
+15 -0src/Services/Ordering/Ordering.API/Application/IntegrationCommands/Commands/ConfirmGracePeriodCommandMsg.cs
-
+14 -0src/Services/Ordering/Ordering.API/Application/IntegrationCommands/Commands/SubmitOrderCommandMsg.cs
-
+1 -1src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs
-
+1 -4src/Services/Ordering/Ordering.API/Application/IntegrationEvents/IOrderingIntegrationEventService.cs
-
+2 -3src/Services/Ordering/Ordering.API/Application/IntegrationEvents/OrderingIntegrationEventService.cs
-
+126 -0src/Services/Ordering/Ordering.API/Application/Sagas/OrderProcessSaga.cs
-
+30 -0src/Services/Ordering/Ordering.API/Application/Sagas/Saga.cs
-
+2 -1src/Services/Ordering/Ordering.API/Ordering.API.csproj
-
+1 -1src/Services/Ordering/Ordering.API/Startup.cs
-
+3 -0src/Services/Payment/Payment.API/.dockerignore
-
+19 -0src/Services/Payment/Payment.API/Controllers/HomeController.cs
-
+46 -0src/Services/Payment/Payment.API/Controllers/PaymentController.cs
-
+6 -0src/Services/Payment/Payment.API/Dockerfile
-
+28 -0src/Services/Payment/Payment.API/Payment.API.csproj
-
+25 -0src/Services/Payment/Payment.API/Program.cs
-
+29 -0src/Services/Payment/Payment.API/Properties/launchSettings.json
-
+55 -0src/Services/Payment/Payment.API/Startup.cs
-
+10 -0src/Services/Payment/Payment.API/appsettings.Development.json
-
+8 -0src/Services/Payment/Payment.API/appsettings.json
+ 8
- 0
docker-compose.override.yml
View File
+ 15
- 0
docker-compose.vs.debug.yml
View File
+ 10
- 0
docker-compose.vs.release.yml
View File
+ 6
- 0
docker-compose.yml
View File
+ 55
- 1
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 1
- 0
src/Services/Identity/Identity.API/Identity.API.csproj
View File
+ 21
- 0
src/Services/Ordering/Ordering.API/Application/Commands/CancelOrderCommand.cs
View File
| @ -0,0 +1,21 @@ | |||
| using MediatR; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Runtime.Serialization; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.Commands | |||
| { | |||
| public class CancelOrderCommand : IAsyncRequest<bool> | |||
| { | |||
| [DataMember] | |||
| public int OrderNumber { get; private set; } | |||
| public CancelOrderCommand(int orderNumber) | |||
| { | |||
| OrderNumber = orderNumber; | |||
| } | |||
| } | |||
| } | |||
+ 2
- 2
src/Services/Ordering/Ordering.API/Application/DomainEventHandlers/BuyerAndPaymentMethodVerified/UpdateOrderWhenBuyerAndPaymentMethodVerifiedDomainEventHandler.cs
View File
+ 15
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationCommands/Commands/ConfirmGracePeriodCommandMsg.cs
View File
| @ -0,0 +1,15 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.IntegrationCommands.Commands | |||
| { | |||
| public class ConfirmGracePeriodCommandMsg : IntegrationEvent | |||
| { | |||
| public int OrderNumber { get; private set; } | |||
| //TODO: message should change to Integration command type once command bus is implemented | |||
| } | |||
| } | |||
+ 14
- 0
src/Services/Ordering/Ordering.API/Application/IntegrationCommands/Commands/SubmitOrderCommandMsg.cs
View File
| @ -0,0 +1,14 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| namespace Ordering.API.Application.IntegrationCommands.Commands | |||
| { | |||
| public class SubmitOrderCommandMsg : IntegrationEvent | |||
| { | |||
| public int OrderNumber { get; private set; } | |||
| //TODO: message should change to Integration command type once command bus is implemented | |||
| } | |||
| } | |||
src/Services/Ordering/Ordering.API/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs → src/Services/Ordering/Ordering.API/Application/IntegrationEvents/Events/OrderStartedIntegrationEvent.cs
View File
src/Services/Ordering/Ordering.API/IntegrationEvents/IOrderingIntegrationEventService.cs → src/Services/Ordering/Ordering.API/Application/IntegrationEvents/IOrderingIntegrationEventService.cs
View File
| @ -1,10 +1,7 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.IntegrationEvents | |||
| namespace Ordering.API.Application.IntegrationEvents | |||
| { | |||
| public interface IOrderingIntegrationEventService | |||
| { | |||
src/Services/Ordering/Ordering.API/IntegrationEvents/OrderingIntegrationEventService.cs → src/Services/Ordering/Ordering.API/Application/IntegrationEvents/OrderingIntegrationEventService.cs
View File
+ 126
- 0
src/Services/Ordering/Ordering.API/Application/Sagas/OrderProcessSaga.cs
View File
| @ -0,0 +1,126 @@ | |||
| using Autofac.Features.OwnedInstances; | |||
| using MediatR; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.API.Application.Commands; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Infrastructure.Idempotency; | |||
| using Ordering.API.Application.Commands; | |||
| using Ordering.API.Application.IntegrationCommands.Commands; | |||
| using Ordering.Domain.Exceptions; | |||
| using System; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.Sagas | |||
| { | |||
| /// <summary> | |||
| /// Saga for handling the place order process | |||
| /// and which is started once the basket.api has | |||
| /// successfully processed the items ordered. | |||
| /// Saga provides a period of grace to give the customer | |||
| /// the opportunity to cancel the order before proceeding | |||
| /// with the validations. | |||
| /// </summary> | |||
| public class OrderProcessSaga : Saga<Order>, | |||
| IIntegrationEventHandler<SubmitOrderCommandMsg>, | |||
| IIntegrationEventHandler<ConfirmGracePeriodCommandMsg>, | |||
| IAsyncRequestHandler<CancelOrderCommand, bool> | |||
| { | |||
| private readonly IMediator _mediator; | |||
| private readonly Func<Owned<OrderingContext>> _dbContextFactory; | |||
| public OrderProcessSaga( | |||
| Func<Owned<OrderingContext>> dbContextFactory, OrderingContext orderingContext, | |||
| IMediator mediator) | |||
| : base(orderingContext) | |||
| { | |||
| _dbContextFactory = dbContextFactory; | |||
| _mediator = mediator; | |||
| } | |||
| /// <summary> | |||
| /// Command handler which starts the create order process | |||
| /// and initializes the saga | |||
| /// </summary> | |||
| /// <param name="command"> | |||
| /// Integration command message which is sent by the | |||
| /// basket.api once it has successfully process the | |||
| /// order items. | |||
| /// </param> | |||
| /// <returns></returns> | |||
| public async Task Handle(SubmitOrderCommandMsg command) | |||
| { | |||
| var orderSaga = FindSagaById(command.OrderNumber); | |||
| CheckValidSagaId(orderSaga); | |||
| // TODO: This handler should change to Integration command handler type once command bus is implemented | |||
| // TODO: Send createOrder Command | |||
| // TODO: Set saga timeout | |||
| } | |||
| /// <summary> | |||
| /// Command handler which confirms that the grace period | |||
| /// has been completed and order has not been cancelled. | |||
| /// If so, the process continues for validation. | |||
| /// </summary> | |||
| /// <param name="command"> | |||
| /// Integration command message which is sent by a saga | |||
| /// scheduler which provides the sagas that its grace | |||
| /// period has completed. | |||
| /// </param> | |||
| /// <returns></returns> | |||
| public async Task Handle(ConfirmGracePeriodCommandMsg command) | |||
| { | |||
| var orderSaga = FindSagaById(command.OrderNumber); | |||
| CheckValidSagaId(orderSaga); | |||
| // TODO: This handler should change to Integration command handler type once command bus is implemented | |||
| // TODO: If order status is not cancelled, change state to awaitingValidation and | |||
| // send ConfirmOrderStockCommandMsg to Inventory api | |||
| } | |||
| /// <summary> | |||
| /// Handler which processes the command when | |||
| /// customer executes cancel order from app | |||
| /// </summary> | |||
| /// <param name="command"></param> | |||
| /// <returns></returns> | |||
| public async Task<bool> Handle(CancelOrderCommand command) | |||
| { | |||
| var orderSaga = FindSagaById(command.OrderNumber); | |||
| CheckValidSagaId(orderSaga); | |||
| // Set order status tu cancelled | |||
| return true; | |||
| } | |||
| private void CheckValidSagaId(Order orderSaga) | |||
| { | |||
| if (orderSaga is null) | |||
| { | |||
| throw new OrderingDomainException("Not able to process order saga event. Reason: no valid orderId"); | |||
| } | |||
| } | |||
| #region CommandHandlerIdentifiers | |||
| public class CancelOrderCommandIdentifiedHandler : IdentifierCommandHandler<CancelOrderCommand, bool> | |||
| { | |||
| public CancelOrderCommandIdentifiedHandler(IMediator mediator, IRequestManager requestManager) : base(mediator, requestManager) | |||
| { | |||
| } | |||
| protected override bool CreateResultForDuplicateRequest() | |||
| { | |||
| return true; // Ignore duplicate requests for processing order. | |||
| } | |||
| } | |||
| #endregion | |||
| } | |||
| } | |||
+ 30
- 0
src/Services/Ordering/Ordering.API/Application/Sagas/Saga.cs
View File
| @ -0,0 +1,30 @@ | |||
| using Microsoft.EntityFrameworkCore; | |||
| using Microsoft.eShopOnContainers.Services.Ordering.Domain.Seedwork; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.API.Application.Sagas | |||
| { | |||
| public abstract class Saga<TEntity> where TEntity : Entity | |||
| { | |||
| private readonly DbContext _dbContext; | |||
| public Saga(DbContext dbContext) | |||
| { | |||
| _dbContext = dbContext; | |||
| } | |||
| protected TEntity FindSagaById(int id, DbContext context = null) | |||
| { | |||
| var ctx = context ?? _dbContext; | |||
| return ctx.Set<TEntity>().Where(x => x.Id == id).SingleOrDefault(); | |||
| } | |||
| protected async Task<bool> SaveChangesAsync(DbContext context = null) | |||
| { | |||
| var ctx = context ?? _dbContext; | |||
| var result = await ctx.SaveChangesAsync(); | |||
| return result > 0; | |||
| } | |||
| } | |||
| } | |||
+ 2
- 1
src/Services/Ordering/Ordering.API/Ordering.API.csproj
View File
+ 1
- 1
src/Services/Ordering/Ordering.API/Startup.cs
View File
+ 3
- 0
src/Services/Payment/Payment.API/.dockerignore
View File
| @ -0,0 +1,3 @@ | |||
| * | |||
| !obj/Docker/publish/* | |||
| !obj/Docker/empty/ | |||
+ 19
- 0
src/Services/Payment/Payment.API/Controllers/HomeController.cs
View File
| @ -0,0 +1,19 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.AspNetCore.Mvc; | |||
| // For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 | |||
| namespace Payment.API.Controllers | |||
| { | |||
| public class HomeController : Controller | |||
| { | |||
| // GET: /<controller>/ | |||
| public IActionResult Index() | |||
| { | |||
| return new RedirectResult("~/swagger/ui"); | |||
| } | |||
| } | |||
| } | |||
+ 46
- 0
src/Services/Payment/Payment.API/Controllers/PaymentController.cs
View File
| @ -0,0 +1,46 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.AspNetCore.Mvc; | |||
| // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 | |||
| namespace Payment.API.Controllers | |||
| { | |||
| [Route("api/v1/[controller]")] | |||
| public class PaymentController : Controller | |||
| { | |||
| // GET: api/values | |||
| [HttpGet] | |||
| public IEnumerable<string> Get() | |||
| { | |||
| return new string[] { "value1", "value2" }; | |||
| } | |||
| // GET api/values/5 | |||
| [HttpGet("{id}")] | |||
| public string Get(int id) | |||
| { | |||
| return "value"; | |||
| } | |||
| // POST api/values | |||
| [HttpPost] | |||
| public void Post([FromBody]string value) | |||
| { | |||
| } | |||
| // PUT api/values/5 | |||
| [HttpPut("{id}")] | |||
| public void Put(int id, [FromBody]string value) | |||
| { | |||
| } | |||
| // DELETE api/values/5 | |||
| [HttpDelete("{id}")] | |||
| public void Delete(int id) | |||
| { | |||
| } | |||
| } | |||
| } | |||
+ 6
- 0
src/Services/Payment/Payment.API/Dockerfile
View File
| @ -0,0 +1,6 @@ | |||
| FROM microsoft/aspnetcore:1.1 | |||
| ARG source | |||
| WORKDIR /app | |||
| EXPOSE 80 | |||
| COPY ${source:-obj/Docker/publish} . | |||
| ENTRYPOINT ["dotnet", "Payment.API.dll"] | |||
+ 28
- 0
src/Services/Payment/Payment.API/Payment.API.csproj
View File
| @ -0,0 +1,28 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp1.1</TargetFramework> | |||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||
| <PackageTargetFallback>portable-net45+win8</PackageTargetFallback> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <Folder Include="wwwroot\" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.0.0" /> | |||
| <PackageReference Include="Microsoft.AspNetCore" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.2" /> | |||
| <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.1" /> | |||
| <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.0" /> | |||
| <PackageReference Include="Swashbuckle" Version="6.0.0-beta902" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="1.0.0" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 25
- 0
src/Services/Payment/Payment.API/Program.cs
View File
| @ -0,0 +1,25 @@ | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.IO; | |||
| using System.Linq; | |||
| using System.Threading.Tasks; | |||
| using Microsoft.AspNetCore.Builder; | |||
| using Microsoft.AspNetCore.Hosting; | |||
| namespace Payment.API | |||
| { | |||
| public class Program | |||
| { | |||
| public static void Main(string[] args) | |||
| { | |||
| var host = new WebHostBuilder() | |||
| .UseKestrel() | |||
| .UseContentRoot(Directory.GetCurrentDirectory()) | |||
| .UseStartup<Startup>() | |||
| .UseApplicationInsights() | |||
| .Build(); | |||
| host.Run(); | |||
| } | |||
| } | |||
| } | |||
+ 29
- 0
src/Services/Payment/Payment.API/Properties/launchSettings.json
View File
| @ -0,0 +1,29 @@ | |||
| { | |||
| "iisSettings": { | |||
| "windowsAuthentication": false, | |||
| "anonymousAuthentication": true, | |||
| "iisExpress": { | |||
| "applicationUrl": "http://localhost:3330/", | |||
| "sslPort": 0 | |||
| } | |||
| }, | |||
| "profiles": { | |||
| "IIS Express": { | |||
| "commandName": "IISExpress", | |||
| "launchBrowser": true, | |||
| "launchUrl": "api/values", | |||
| "environmentVariables": { | |||
| "ASPNETCORE_ENVIRONMENT": "Development" | |||
| } | |||
| }, | |||
| "Payment.API": { | |||
| "commandName": "Project", | |||
| "launchBrowser": true, | |||
| "launchUrl": "api/values", | |||
| "environmentVariables": { | |||
| "ASPNETCORE_ENVIRONMENT": "Development" | |||
| }, | |||
| "applicationUrl": "http://localhost:3331" | |||
| } | |||
| } | |||
| } | |||
+ 55
- 0
src/Services/Payment/Payment.API/Startup.cs
View File
| @ -0,0 +1,55 @@ | |||
| using Microsoft.AspNetCore.Builder; | |||
| using Microsoft.AspNetCore.Hosting; | |||
| using Microsoft.Extensions.Configuration; | |||
| using Microsoft.Extensions.DependencyInjection; | |||
| using Microsoft.Extensions.Logging; | |||
| namespace Payment.API | |||
| { | |||
| public class Startup | |||
| { | |||
| public Startup(IHostingEnvironment env) | |||
| { | |||
| var builder = new ConfigurationBuilder() | |||
| .SetBasePath(env.ContentRootPath) | |||
| .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) | |||
| .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) | |||
| .AddEnvironmentVariables(); | |||
| Configuration = builder.Build(); | |||
| } | |||
| public IConfigurationRoot Configuration { get; } | |||
| // This method gets called by the runtime. Use this method to add services to the container. | |||
| public void ConfigureServices(IServiceCollection services) | |||
| { | |||
| // Add framework services. | |||
| services.AddMvc(); | |||
| services.AddSwaggerGen(); | |||
| services.ConfigureSwaggerGen(options => | |||
| { | |||
| options.DescribeAllEnumsAsStrings(); | |||
| options.SingleApiVersion(new Swashbuckle.Swagger.Model.Info() | |||
| { | |||
| Title = "eShopOnContainers - Payment HTTP API", | |||
| Version = "v1", | |||
| Description = "The Payment Microservice HTTP API. This is a Data-Driven/CRUD microservice sample", | |||
| TermsOfService = "Terms Of Service" | |||
| }); | |||
| }); | |||
| } | |||
| // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. | |||
| public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) | |||
| { | |||
| loggerFactory.AddConsole(Configuration.GetSection("Logging")); | |||
| loggerFactory.AddDebug(); | |||
| app.UseMvcWithDefaultRoute(); | |||
| app.UseSwagger() | |||
| .UseSwaggerUi(); | |||
| } | |||
| } | |||
| } | |||
+ 10
- 0
src/Services/Payment/Payment.API/appsettings.Development.json
View File
| @ -0,0 +1,10 @@ | |||
| { | |||
| "Logging": { | |||
| "IncludeScopes": false, | |||
| "LogLevel": { | |||
| "Default": "Debug", | |||
| "System": "Information", | |||
| "Microsoft": "Information" | |||
| } | |||
| } | |||
| } | |||
+ 8
- 0
src/Services/Payment/Payment.API/appsettings.json
View File
| @ -0,0 +1,8 @@ | |||
| { | |||
| "Logging": { | |||
| "IncludeScopes": false, | |||
| "LogLevel": { | |||
| "Default": "Warning" | |||
| } | |||
| } | |||
| } | |||