Unai Zorrilla Castro
7 years ago
20 changed files with 730 additions and 131 deletions
Split View
Diff Options
-
+20 -1docker-compose.override.yml
-
+18 -0docker-compose.prod.yml
-
+10 -1docker-compose.yml
-
+52 -1eShopOnContainers-ServicesAndWebApps.sln
-
+7 -1src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
-
+54 -54src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/BackgroundService.cs
-
+66 -66src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/GracePeriodManagerService.cs
-
+2 -2src/Services/Ordering/Ordering.API/Startup.cs
-
+13 -0src/Services/Ordering/Ordering.BackgroundTasks/Configuration/BackgroundTaskSettings.cs
-
+18 -0src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
-
+12 -0src/Services/Ordering/Ordering.BackgroundTasks/IntegrationEvents/GracePeriodConfirmedIntegrationEvent.cs
-
+31 -0src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
-
+24 -0src/Services/Ordering/Ordering.BackgroundTasks/Program.cs
-
+29 -0src/Services/Ordering/Ordering.BackgroundTasks/Properties/launchSettings.json
-
+158 -0src/Services/Ordering/Ordering.BackgroundTasks/Startup.cs
-
+81 -0src/Services/Ordering/Ordering.BackgroundTasks/Tasks/Base/BackgroundTask.cs
-
+92 -0src/Services/Ordering/Ordering.BackgroundTasks/Tasks/GracePeriodManagerTask.cs
-
+10 -0src/Services/Ordering/Ordering.BackgroundTasks/appsettings.Development.json
-
+27 -0src/Services/Ordering/Ordering.BackgroundTasks/appsettings.json
-
+6 -5src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs
+ 20
- 1
docker-compose.override.yml
View File
+ 18
- 0
docker-compose.prod.yml
View File
+ 10
- 1
docker-compose.yml
View File
+ 52
- 1
eShopOnContainers-ServicesAndWebApps.sln
View File
+ 7
- 1
src/BuildingBlocks/EventBus/EventBusRabbitMQ/EventBusRabbitMQ.cs
View File
+ 54
- 54
src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/BackgroundService.cs
View File
+ 66
- 66
src/Services/Ordering/Ordering.API/Infrastructure/HostedServices/GracePeriodManagerService.cs
View File
+ 2
- 2
src/Services/Ordering/Ordering.API/Startup.cs
View File
+ 13
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Configuration/BackgroundTaskSettings.cs
View File
| @ -0,0 +1,13 @@ | |||
| namespace Ordering.BackgroundTasks.Configuration | |||
| { | |||
| public class BackgroundTaskSettings | |||
| { | |||
| public string ConnectionString { get; set; } | |||
| public string EventBusConnection { get; set; } | |||
| public int GracePeriodTime { get; set; } | |||
| public int CheckUpdateTime { get; set; } | |||
| } | |||
| } | |||
+ 18
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Dockerfile
View File
| @ -0,0 +1,18 @@ | |||
| FROM microsoft/aspnetcore:2.0.3 AS base | |||
| WORKDIR /app | |||
| EXPOSE 80 | |||
| FROM microsoft/aspnetcore-build:2.0 AS build | |||
| WORKDIR /src | |||
| COPY . . | |||
| RUN dotnet restore -nowarn:msb3202,nu1503 | |||
| WORKDIR /src/src/Services/Ordering/Ordering.BackgroundTasks | |||
| RUN dotnet build --no-restore -c Release -o /app | |||
| FROM build AS publish | |||
| RUN dotnet publish --no-restore -c Release -o /app | |||
| FROM base AS final | |||
| WORKDIR /app | |||
| COPY --from=publish /app . | |||
| ENTRYPOINT ["dotnet", "Ordering.BackgroundTasks.dll"] | |||
+ 12
- 0
src/Services/Ordering/Ordering.BackgroundTasks/IntegrationEvents/GracePeriodConfirmedIntegrationEvent.cs
View File
| @ -0,0 +1,12 @@ | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Events; | |||
| namespace Ordering.BackgroundTasks.IntegrationEvents | |||
| { | |||
| public class GracePeriodConfirmedIntegrationEvent : IntegrationEvent | |||
| { | |||
| public int OrderId { get; } | |||
| public GracePeriodConfirmedIntegrationEvent(int orderId) => | |||
| OrderId = orderId; | |||
| } | |||
| } | |||
+ 31
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Ordering.BackgroundTasks.csproj
View File
| @ -0,0 +1,31 @@ | |||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | |||
| <PropertyGroup> | |||
| <TargetFramework>netcoreapp2.0</TargetFramework> | |||
| <DockerComposeProjectPath>..\..\..\..\docker-compose.dcproj</DockerComposeProjectPath> | |||
| </PropertyGroup> | |||
| <ItemGroup> | |||
| <Folder Include="wwwroot\" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="4.2.0" /> | |||
| <PackageReference Include="Dapper" Version="1.50.4" /> | |||
| <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" /> | |||
| </ItemGroup> | |||
| <ItemGroup> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusRabbitMQ\EventBusRabbitMQ.csproj" /> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBusServiceBus\EventBusServiceBus.csproj" /> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\EventBus\EventBus\EventBus.csproj" /> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.AspNetCore.HealthChecks\Microsoft.AspNetCore.HealthChecks.csproj" /> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks.SqlServer\Microsoft.Extensions.HealthChecks.SqlServer.csproj" /> | |||
| <ProjectReference Include="..\..\..\BuildingBlocks\HealthChecks\src\Microsoft.Extensions.HealthChecks\Microsoft.Extensions.HealthChecks.csproj" /> | |||
| </ItemGroup> | |||
| </Project> | |||
+ 24
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Program.cs
View File
| @ -0,0 +1,24 @@ | |||
| using Microsoft.AspNetCore; | |||
| using Microsoft.AspNetCore.Hosting; | |||
| using Microsoft.Extensions.Logging; | |||
| namespace Ordering.BackgroundTasks | |||
| { | |||
| public class Program | |||
| { | |||
| public static void Main(string[] args) | |||
| { | |||
| BuildWebHost(args).Run(); | |||
| } | |||
| public static IWebHost BuildWebHost(string[] args) => | |||
| WebHost.CreateDefaultBuilder(args) | |||
| .UseStartup<Startup>() | |||
| .ConfigureLogging((hostingContext, builder) => | |||
| { | |||
| builder.AddConfiguration(hostingContext.Configuration.GetSection("Logging")); | |||
| builder.AddDebug(); | |||
| builder.AddConsole(); | |||
| }).Build(); | |||
| } | |||
| } | |||
+ 29
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Properties/launchSettings.json
View File
| @ -0,0 +1,29 @@ | |||
| { | |||
| "iisSettings": { | |||
| "windowsAuthentication": false, | |||
| "anonymousAuthentication": true, | |||
| "iisExpress": { | |||
| "applicationUrl": "http://localhost:5161/", | |||
| "sslPort": 0 | |||
| } | |||
| }, | |||
| "profiles": { | |||
| "IIS Express": { | |||
| "commandName": "IISExpress", | |||
| "launchBrowser": true, | |||
| "launchUrl": "api/values", | |||
| "environmentVariables": { | |||
| "ASPNETCORE_ENVIRONMENT": "Development" | |||
| } | |||
| }, | |||
| "Ordering.BackgroundTasks": { | |||
| "commandName": "Project", | |||
| "launchBrowser": true, | |||
| "launchUrl": "api/values", | |||
| "environmentVariables": { | |||
| "ASPNETCORE_ENVIRONMENT": "Development" | |||
| }, | |||
| "applicationUrl": "http://localhost:5162/" | |||
| } | |||
| } | |||
| } | |||
+ 158
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Startup.cs
View File
| @ -0,0 +1,158 @@ | |||
| using Autofac; | |||
| using Autofac.Extensions.DependencyInjection; | |||
| using Microsoft.AspNetCore.Builder; | |||
| using Microsoft.AspNetCore.Hosting; | |||
| using Microsoft.Azure.ServiceBus; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBusRabbitMQ; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBusServiceBus; | |||
| using Microsoft.Extensions.Configuration; | |||
| using Microsoft.Extensions.DependencyInjection; | |||
| using Microsoft.Extensions.HealthChecks; | |||
| using Microsoft.Extensions.Hosting; | |||
| using Microsoft.Extensions.Logging; | |||
| using Ordering.BackgroundTasks.Configuration; | |||
| using Ordering.BackgroundTasks.Tasks; | |||
| using RabbitMQ.Client; | |||
| using System; | |||
| namespace Ordering.BackgroundTasks | |||
| { | |||
| public class Startup | |||
| { | |||
| public Startup(IConfiguration configuration) | |||
| { | |||
| Configuration = configuration; | |||
| } | |||
| public IConfiguration Configuration { get; } | |||
| // This method gets called by the runtime. Use this method to add services to the container. | |||
| public IServiceProvider ConfigureServices(IServiceCollection services) | |||
| { | |||
| //add health check for this service | |||
| services.AddHealthChecks(checks => | |||
| { | |||
| var minutes = 1; | |||
| if (int.TryParse(Configuration["HealthCheck:Timeout"], out var minutesParsed)) | |||
| { | |||
| minutes = minutesParsed; | |||
| } | |||
| checks.AddSqlCheck("OrderingDb", Configuration["ConnectionString"], TimeSpan.FromMinutes(minutes)); | |||
| }); | |||
| //configure settings | |||
| services.Configure<BackgroundTaskSettings>(Configuration); | |||
| services.AddOptions(); | |||
| //configure background task | |||
| services.AddSingleton<IHostedService, GracePeriodManagerService>(); | |||
| //configure event bus related services | |||
| if (Configuration.GetValue<bool>("AzureServiceBusEnabled")) | |||
| { | |||
| services.AddSingleton<IServiceBusPersisterConnection>(sp => | |||
| { | |||
| var logger = sp.GetRequiredService<ILogger<DefaultServiceBusPersisterConnection>>(); | |||
| var serviceBusConnectionString = Configuration["EventBusConnection"]; | |||
| var serviceBusConnection = new ServiceBusConnectionStringBuilder(serviceBusConnectionString); | |||
| return new DefaultServiceBusPersisterConnection(serviceBusConnection, logger); | |||
| }); | |||
| } | |||
| else | |||
| { | |||
| services.AddSingleton<IRabbitMQPersistentConnection>(sp => | |||
| { | |||
| var logger = sp.GetRequiredService<ILogger<DefaultRabbitMQPersistentConnection>>(); | |||
| var factory = new ConnectionFactory() | |||
| { | |||
| HostName = Configuration["EventBusConnection"] | |||
| }; | |||
| if (!string.IsNullOrEmpty(Configuration["EventBusUserName"])) | |||
| { | |||
| factory.UserName = Configuration["EventBusUserName"]; | |||
| } | |||
| if (!string.IsNullOrEmpty(Configuration["EventBusPassword"])) | |||
| { | |||
| factory.Password = Configuration["EventBusPassword"]; | |||
| } | |||
| var retryCount = 5; | |||
| if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"])) | |||
| { | |||
| retryCount = int.Parse(Configuration["EventBusRetryCount"]); | |||
| } | |||
| return new DefaultRabbitMQPersistentConnection(factory, logger, retryCount); | |||
| }); | |||
| } | |||
| RegisterEventBus(services); | |||
| //create autofac based service provider | |||
| var container = new ContainerBuilder(); | |||
| container.Populate(services); | |||
| return new AutofacServiceProvider(container.Build()); | |||
| } | |||
| // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. | |||
| public void Configure(IApplicationBuilder app, IHostingEnvironment env) | |||
| { | |||
| } | |||
| private void RegisterEventBus(IServiceCollection services) | |||
| { | |||
| var subscriptionClientName = Configuration["SubscriptionClientName"]; | |||
| if (Configuration.GetValue<bool>("AzureServiceBusEnabled")) | |||
| { | |||
| services.AddSingleton<IEventBus, EventBusServiceBus>(sp => | |||
| { | |||
| var serviceBusPersisterConnection = sp.GetRequiredService<IServiceBusPersisterConnection>(); | |||
| var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>(); | |||
| var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>(); | |||
| var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>(); | |||
| return new EventBusServiceBus(serviceBusPersisterConnection, logger, | |||
| eventBusSubcriptionsManager, subscriptionClientName, iLifetimeScope); | |||
| }); | |||
| } | |||
| else | |||
| { | |||
| services.AddSingleton<IEventBus, EventBusRabbitMQ>(sp => | |||
| { | |||
| var rabbitMQPersistentConnection = sp.GetRequiredService<IRabbitMQPersistentConnection>(); | |||
| var iLifetimeScope = sp.GetRequiredService<ILifetimeScope>(); | |||
| var logger = sp.GetRequiredService<ILogger<EventBusRabbitMQ>>(); | |||
| var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>(); | |||
| var retryCount = 5; | |||
| if (!string.IsNullOrEmpty(Configuration["EventBusRetryCount"])) | |||
| { | |||
| retryCount = int.Parse(Configuration["EventBusRetryCount"]); | |||
| } | |||
| return new EventBusRabbitMQ(rabbitMQPersistentConnection, logger, iLifetimeScope, eventBusSubcriptionsManager, subscriptionClientName, retryCount); | |||
| }); | |||
| } | |||
| services.AddSingleton<IEventBusSubscriptionsManager, InMemoryEventBusSubscriptionsManager>(); | |||
| } | |||
| } | |||
| } | |||
+ 81
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Tasks/Base/BackgroundTask.cs
View File
| @ -0,0 +1,81 @@ | |||
| using Microsoft.Extensions.Hosting; | |||
| using System; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.BackgroundTasks.Tasks.Base | |||
| { | |||
| // Copyright(c) .NET Foundation.All rights reserved. | |||
| // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. | |||
| /// <summary> | |||
| /// Base class for implementing a long running <see cref="IHostedService"/>. | |||
| /// IMPORTANT: This base class is implemented in .NET Core 2.1 - Since this microservice is still in .NET Core 2.0, we're using the class within the project | |||
| /// When .NET Core 2.1 is released, this class should be removed and you should use the use implemented by the framework | |||
| /// https://github.com/aspnet/Hosting/blob/712c992ca827576c05923e6a134ca0bec87af4df/src/Microsoft.Extensions.Hosting.Abstractions/BackgroundService.cs | |||
| /// | |||
| /// </summary> | |||
| public abstract class BackgroundService : IHostedService, IDisposable | |||
| { | |||
| private Task _executingTask; | |||
| private readonly CancellationTokenSource _stoppingCts = new CancellationTokenSource(); | |||
| /// <summary> | |||
| /// This method is called when the <see cref="IHostedService"/> starts. The implementation should return a task that represents | |||
| /// the lifetime of the long running operation(s) being performed. | |||
| /// </summary> | |||
| /// <param name="stoppingToken">Triggered when <see cref="IHostedService.StopAsync(CancellationToken)"/> is called.</param> | |||
| /// <returns>A <see cref="Task"/> that represents the long running operations.</returns> | |||
| protected abstract Task ExecuteAsync(CancellationToken stoppingToken); | |||
| /// <summary> | |||
| /// Triggered when the application host is ready to start the service. | |||
| /// </summary> | |||
| /// <param name="cancellationToken">Indicates that the start process has been aborted.</param> | |||
| public virtual Task StartAsync(CancellationToken cancellationToken) | |||
| { | |||
| // Store the task we're executing | |||
| _executingTask = ExecuteAsync(_stoppingCts.Token); | |||
| // If the task is completed then return it, this will bubble cancellation and failure to the caller | |||
| if (_executingTask.IsCompleted) | |||
| { | |||
| return _executingTask; | |||
| } | |||
| // Otherwise it's running | |||
| return Task.CompletedTask; | |||
| } | |||
| /// <summary> | |||
| /// Triggered when the application host is performing a graceful shutdown. | |||
| /// </summary> | |||
| /// <param name="cancellationToken">Indicates that the shutdown process should no longer be graceful.</param> | |||
| public virtual async Task StopAsync(CancellationToken cancellationToken) | |||
| { | |||
| // Stop called without start | |||
| if (_executingTask == null) | |||
| { | |||
| return; | |||
| } | |||
| try | |||
| { | |||
| // Signal cancellation to the executing method | |||
| _stoppingCts.Cancel(); | |||
| } | |||
| finally | |||
| { | |||
| // Wait until the task completes or the stop token triggers | |||
| await Task.WhenAny(_executingTask, Task.Delay(Timeout.Infinite, cancellationToken)); | |||
| } | |||
| } | |||
| public virtual void Dispose() | |||
| { | |||
| _stoppingCts.Cancel(); | |||
| } | |||
| } | |||
| } | |||
+ 92
- 0
src/Services/Ordering/Ordering.BackgroundTasks/Tasks/GracePeriodManagerTask.cs
View File
| @ -0,0 +1,92 @@ | |||
| using Dapper; | |||
| using Microsoft.eShopOnContainers.BuildingBlocks.EventBus.Abstractions; | |||
| using Microsoft.Extensions.Logging; | |||
| using Microsoft.Extensions.Options; | |||
| using Ordering.BackgroundTasks.Configuration; | |||
| using Ordering.BackgroundTasks.IntegrationEvents; | |||
| using Ordering.BackgroundTasks.Tasks.Base; | |||
| using System; | |||
| using System.Collections.Generic; | |||
| using System.Data.SqlClient; | |||
| using System.Threading; | |||
| using System.Threading.Tasks; | |||
| namespace Ordering.BackgroundTasks.Tasks | |||
| { | |||
| public class GracePeriodManagerService | |||
| : BackgroundService | |||
| { | |||
| private readonly ILogger<GracePeriodManagerService> _logger; | |||
| private readonly BackgroundTaskSettings _settings; | |||
| private readonly IEventBus _eventBus; | |||
| public GracePeriodManagerService(IOptions<BackgroundTaskSettings> settings, | |||
| IEventBus eventBus, | |||
| ILogger<GracePeriodManagerService> logger) | |||
| { | |||
| _settings = settings?.Value ?? throw new ArgumentNullException(nameof(settings)); | |||
| _eventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus)); | |||
| _logger = logger ?? throw new ArgumentNullException(nameof(logger)); | |||
| } | |||
| protected override async Task ExecuteAsync(CancellationToken stoppingToken) | |||
| { | |||
| _logger.LogDebug($"GracePeriodManagerService is starting."); | |||
| stoppingToken.Register(() => _logger.LogDebug($"#1 GracePeriodManagerService background task is stopping.")); | |||
| while (!stoppingToken.IsCancellationRequested) | |||
| { | |||
| _logger.LogDebug($"GracePeriodManagerService background task is doing background work."); | |||
| CheckConfirmedGracePeriodOrders(); | |||
| await Task.Delay(_settings.CheckUpdateTime, stoppingToken); | |||
| } | |||
| _logger.LogDebug($"GracePeriodManagerService background task is stopping."); | |||
| await Task.CompletedTask; | |||
| } | |||
| private void CheckConfirmedGracePeriodOrders() | |||
| { | |||
| _logger.LogDebug($"Checking confirmed grace period orders"); | |||
| var orderIds = GetConfirmedGracePeriodOrders(); | |||
| foreach (var orderId in orderIds) | |||
| { | |||
| var confirmGracePeriodEvent = new GracePeriodConfirmedIntegrationEvent(orderId); | |||
| _eventBus.Publish(confirmGracePeriodEvent); | |||
| } | |||
| } | |||
| private IEnumerable<int> GetConfirmedGracePeriodOrders() | |||
| { | |||
| IEnumerable<int> orderIds = new List<int>(); | |||
| using (var conn = new SqlConnection(_settings.ConnectionString)) | |||
| { | |||
| try | |||
| { | |||
| conn.Open(); | |||
| orderIds = conn.Query<int>( | |||
| @"SELECT Id FROM [ordering].[orders] | |||
| WHERE DATEDIFF(minute, [OrderDate], GETDATE()) >= @GracePeriodTime | |||
| AND [OrderStatusId] = 1", | |||
| new { GracePeriodTime = _settings.GracePeriodTime }); | |||
| } | |||
| catch (SqlException exception) | |||
| { | |||
| _logger.LogCritical($"FATAL ERROR: Database connections could not be opened: {exception.Message}"); | |||
| } | |||
| } | |||
| return orderIds; | |||
| } | |||
| } | |||
| } | |||
+ 10
- 0
src/Services/Ordering/Ordering.BackgroundTasks/appsettings.Development.json
View File
| @ -0,0 +1,10 @@ | |||
| { | |||
| "Logging": { | |||
| "IncludeScopes": false, | |||
| "LogLevel": { | |||
| "Default": "Debug", | |||
| "System": "Information", | |||
| "Microsoft": "Information" | |||
| } | |||
| } | |||
| } | |||
+ 27
- 0
src/Services/Ordering/Ordering.BackgroundTasks/appsettings.json
View File
| @ -0,0 +1,27 @@ | |||
| { | |||
| "ConnectionString": "Server=tcp:127.0.0.1,5433;Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id=sa;Password=Pass@word;", | |||
| "Logging": { | |||
| "IncludeScopes": false, | |||
| "Debug": { | |||
| "LogLevel": { | |||
| "Default": "Debug" | |||
| } | |||
| }, | |||
| "Console": { | |||
| "LogLevel": { | |||
| "Default": "Debug" | |||
| } | |||
| } | |||
| }, | |||
| "SubscriptionClientName": "Ordering", | |||
| "GracePeriodTime": "1", | |||
| "CheckUpdateTime": "1000", | |||
| "ApplicationInsights": { | |||
| "InstrumentationKey": "" | |||
| }, | |||
| "AzureServiceBusEnabled": false, | |||
| "EventBusRetryCount": 5, | |||
| "EventBusConnection": "", | |||
| "EventBusUserName": "", | |||
| "EventBusPassword": "" | |||
| } | |||