Compare commits
2 Commits
8ff8a9e58b
...
8cfa803cd3
| Author | SHA1 | Date | |
|---|---|---|---|
| 8cfa803cd3 | |||
| 82be3c5a4f |
@@ -38,14 +38,5 @@ public static class DependencyInjection
|
||||
|
||||
return services;
|
||||
}
|
||||
|
||||
public static IServiceCollection AddMessagingServiceApplication(this IServiceCollection services, IConfiguration configuration)
|
||||
{
|
||||
return services.AddMessagingServiceApplication(cfg =>
|
||||
{
|
||||
cfg.SetLuckyPennySoftLicenseKey(configuration);
|
||||
cfg.ConfigureEmailAccounts(configuration);
|
||||
});
|
||||
}
|
||||
}
|
||||
#endif
|
||||
@@ -1,5 +1,4 @@
|
||||
#if NET
|
||||
using DigitalData.MessagingService.Application.Common.Options;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
@@ -9,7 +8,7 @@ public partial class MessagingServiceApplicationConfiguration
|
||||
{
|
||||
private IServiceCollection Services { get; }
|
||||
|
||||
private (bool LuckyPennySoftLicenseKey, bool EmailAccounts) _configured = (LuckyPennySoftLicenseKey: false, EmailAccounts: false);
|
||||
private bool _luckyPennySoftLicenseKeyAdded = false;
|
||||
|
||||
internal MessagingServiceApplicationConfiguration(IServiceCollection services)
|
||||
{
|
||||
@@ -18,14 +17,10 @@ public partial class MessagingServiceApplicationConfiguration
|
||||
|
||||
internal void EnsureConfigured()
|
||||
{
|
||||
if (!_configured.LuckyPennySoftLicenseKey)
|
||||
if (!_luckyPennySoftLicenseKeyAdded)
|
||||
{
|
||||
throw new InvalidOperationException("LuckyPennySoftLicenseKey is not configured. Please call SetLuckyPennySoftLicenseKey() or SetLuckyPennySoftLicenseKey(IConfiguration) in DI configuration.");
|
||||
}
|
||||
if (!_configured.EmailAccounts)
|
||||
{
|
||||
throw new InvalidOperationException("EmailAccountsOptions is not configured. Please call ConfigureEmailAccountsOptions() or ConfigureEmailAccounts(IConfiguration) in DI configuration.");
|
||||
}
|
||||
}
|
||||
|
||||
#region LuckyPennySoftLicenseKey
|
||||
@@ -37,7 +32,7 @@ public partial class MessagingServiceApplicationConfiguration
|
||||
throw new InvalidOperationException("LuckyPennySoftLicenseKey is not configured. Please call SetLuckyPennySoftLicenseKey() or SetLuckyPennySoftLicenseKey(IConfiguration) in DI configuration.");
|
||||
|
||||
LuckyPennySoftLicenseKey = licenseKey;
|
||||
_configured.LuckyPennySoftLicenseKey = true;
|
||||
_luckyPennySoftLicenseKeyAdded = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -46,33 +41,5 @@ public partial class MessagingServiceApplicationConfiguration
|
||||
return SetLuckyPennySoftLicenseKey(configuration.GetValue<string>(key) ?? string.Empty);
|
||||
}
|
||||
#endregion LuckyPennySoftLicenseKey
|
||||
|
||||
#region EmailAccountsOptions
|
||||
/// <summary>
|
||||
/// Ignores whether EmailAccountsOptions is configured or not. Use this method if you just want to publish messages to the messaging service; not to send
|
||||
/// emails. If you want to consume the messaging service to send emails, you must configure EmailAccountsOptions using ConfigureEmailAccountsOptions() or
|
||||
/// ConfigureEmailAccounts(IConfiguration).
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public MessagingServiceApplicationConfiguration PublishOnly()
|
||||
{
|
||||
_configured.EmailAccounts = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessagingServiceApplicationConfiguration ConfigureEmailAccountsOptions(Action<EmailAccountsOptions> configureOptions)
|
||||
{
|
||||
Services.Configure(configureOptions);
|
||||
_configured.EmailAccounts = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessagingServiceApplicationConfiguration ConfigureEmailAccounts(IConfiguration configuration, string sectionName = EmailAccountsOptions.SectionName)
|
||||
{
|
||||
Services.Configure<EmailAccountsOptions>(configuration.GetSection(sectionName));
|
||||
_configured.EmailAccounts = true;
|
||||
return this;
|
||||
}
|
||||
#endregion EmailAccountsOptions
|
||||
}
|
||||
#endif
|
||||
@@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace DigitalData.MessagingService.Infrastructure;
|
||||
namespace DigitalData.MessagingService.Infrastructure.DependencyInjection;
|
||||
|
||||
/// <summary>
|
||||
/// Dependency injection configuration for Infrastructure layer
|
||||
@@ -0,0 +1,61 @@
|
||||
using DigitalData.MessagingService.Infrastructure.Options;
|
||||
using DigitalData.MessagingService.RabbitMQ;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace DigitalData.MessagingService.Infrastructure.DependencyInjection;
|
||||
|
||||
public class MessagingServiceInfrastructureConfiguration
|
||||
{
|
||||
internal IServiceCollection Services { get; }
|
||||
|
||||
private (bool RabbitMqConnectionFactory, bool EmailAccounts) _configured = (false, false);
|
||||
|
||||
internal MessagingServiceInfrastructureConfiguration(IServiceCollection services)
|
||||
{
|
||||
Services = services;
|
||||
}
|
||||
|
||||
public void EnsureRabbitMqConnectionFactoryAdded()
|
||||
{
|
||||
if (!_configured.RabbitMqConnectionFactory)
|
||||
{
|
||||
throw new InvalidOperationException("RabbitMQ connection factory has not been added. Please call AddRabbitMqConnectionFactory() before using this configuration.");
|
||||
}
|
||||
if(!_configured.EmailAccounts)
|
||||
{
|
||||
throw new InvalidOperationException("Email accounts options have not been configured. Please call ConfigureEmailAccountsOptions() or ConfigureEmailAccounts() before using this configuration.");
|
||||
}
|
||||
}
|
||||
|
||||
public MessagingServiceInfrastructureConfiguration AddRabbitMqConnectionFactory(Action<RabbitMqConfiguration> configure)
|
||||
{
|
||||
Services.AddRabbitMqConnectionFactory(configure);
|
||||
_configured.RabbitMqConnectionFactory = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessagingServiceInfrastructureConfiguration AddRabbitMqConnectionFactory(IConfiguration configuration, string sectionName = RabbitMqConfiguration.SectionName)
|
||||
{
|
||||
Services.AddRabbitMqConnectionFactory(configuration, sectionName);
|
||||
_configured.RabbitMqConnectionFactory = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
#region EmailAccountsOptions
|
||||
public MessagingServiceInfrastructureConfiguration ConfigureEmailAccountsOptions(Action<EmailAccountsOptions> configureOptions)
|
||||
{
|
||||
Services.Configure(configureOptions);
|
||||
_configured.EmailAccounts = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessagingServiceInfrastructureConfiguration ConfigureEmailAccounts(IConfiguration configuration, string sectionName = EmailAccountsOptions.SectionName)
|
||||
{
|
||||
Services.Configure<EmailAccountsOptions>(configuration.GetSection(sectionName));
|
||||
_configured.EmailAccounts = true;
|
||||
return this;
|
||||
}
|
||||
#endregion EmailAccountsOptions
|
||||
|
||||
}
|
||||
@@ -38,8 +38,4 @@
|
||||
</Reference>
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="Messaging\" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
using DigitalData.MessagingService.RabbitMQ;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace DigitalData.MessagingService.Infrastructure;
|
||||
|
||||
public class MessagingServiceInfrastructureConfiguration
|
||||
{
|
||||
internal IServiceCollection Services { get; }
|
||||
|
||||
private bool _rabbitMqConnectionFactoryAdded = false;
|
||||
|
||||
internal MessagingServiceInfrastructureConfiguration(IServiceCollection services)
|
||||
{
|
||||
Services = services;
|
||||
}
|
||||
|
||||
public void EnsureRabbitMqConnectionFactoryAdded()
|
||||
{
|
||||
if (!_rabbitMqConnectionFactoryAdded)
|
||||
{
|
||||
throw new InvalidOperationException("RabbitMQ connection factory has not been added. Please call AddRabbitMqConnectionFactory() before using this configuration.");
|
||||
}
|
||||
}
|
||||
|
||||
public MessagingServiceInfrastructureConfiguration AddRabbitMqConnectionFactory(Action<RabbitMqConfiguration> configure)
|
||||
{
|
||||
Services.AddRabbitMqConnectionFactory(configure);
|
||||
_rabbitMqConnectionFactoryAdded = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
public MessagingServiceInfrastructureConfiguration AddRabbitMqConnectionFactory(IConfiguration configuration, string sectionName = RabbitMqConfiguration.SectionName)
|
||||
{
|
||||
Services.AddRabbitMqConnectionFactory(configuration, sectionName);
|
||||
_rabbitMqConnectionFactoryAdded = true;
|
||||
return this;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,10 +1,7 @@
|
||||
#if NET
|
||||
using DigitalData.MessagingService.Application.Common.Dto;
|
||||
using DigitalData.MessagingService.Application.Common.Dto.EmailAccounts;
|
||||
using DigitalData.MessagingService.Application.EmailAccounts.Commands;
|
||||
using DigitalData.MessagingService.Domain.Entities;
|
||||
|
||||
namespace DigitalData.MessagingService.Application.Common.Options;
|
||||
namespace DigitalData.MessagingService.Infrastructure.Options;
|
||||
|
||||
/// <summary>
|
||||
/// Wrapper options class that holds a list of <see cref="Dto.EmailAccount"/> entries
|
||||
@@ -1,8 +1,8 @@
|
||||
using DigitalData.MessagingService.Application.Common.Interfaces;
|
||||
using DigitalData.MessagingService.Application.Common.Interfaces.Repositories;
|
||||
using DigitalData.MessagingService.Application.Common.Options;
|
||||
using DigitalData.MessagingService.Domain.Entities;
|
||||
using DigitalData.MessagingService.Domain.Enums;
|
||||
using DigitalData.MessagingService.Infrastructure.Options;
|
||||
using Microsoft.Extensions.Caching.Memory;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
using DigitalData.MessagingService.API.Middleware;
|
||||
using DigitalData.MessagingService.Application.DependencyInjection;
|
||||
using DigitalData.MessagingService.Infrastructure;
|
||||
using DigitalData.MessagingService.Infrastructure.DependencyInjection;
|
||||
using DigitalData.MessagingService.Infrastructure.Services.Background;
|
||||
using HealthChecks.UI.Client;
|
||||
using Microsoft.AspNetCore.Diagnostics.HealthChecks;
|
||||
@@ -65,10 +65,12 @@ try
|
||||
builder.Configuration.AddJsonFile("appsettings.Secrets.json", optional: true, reloadOnChange: true);
|
||||
|
||||
// Register Application layer (MediatR, AutoMapper, FluentValidation)
|
||||
builder.Services.AddMessagingServiceApplication(builder.Configuration);
|
||||
builder.Services.AddMessagingServiceApplication(cfg => cfg.SetLuckyPennySoftLicenseKey(builder.Configuration));
|
||||
|
||||
// Register Infrastructure layer (RabbitMQ, Repositories, etc.)
|
||||
builder.Services.AddInfrastructure(cfg => cfg.AddRabbitMqConnectionFactory(builder.Configuration));
|
||||
builder.Services.AddInfrastructure(cfg => cfg
|
||||
.AddRabbitMqConnectionFactory(builder.Configuration)
|
||||
.ConfigureEmailAccounts(builder.Configuration));
|
||||
|
||||
// Health checks — each check corresponds to a singleton registered in the Infrastructure layer
|
||||
builder.Services.AddHealthChecks()
|
||||
|
||||
@@ -0,0 +1,10 @@
|
||||
#if NET
|
||||
namespace DigitalData.MessagingService.Client.DependencyInjection;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public static class DependencyInjectionExtensions
|
||||
{
|
||||
}
|
||||
#endif
|
||||
@@ -0,0 +1,10 @@
|
||||
#if NET
|
||||
namespace DigitalData.MessagingService.Client.DependencyInjection;
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
public class MessagingServiceConfiguration
|
||||
{
|
||||
}
|
||||
#endif
|
||||
@@ -61,7 +61,7 @@
|
||||
|
||||
<Target Name="EmbedProjectReferences" DependsOnTargets="ResolveReferences">
|
||||
<ItemGroup>
|
||||
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget','ProjectReference'))" />
|
||||
<BuildOutputInPackage Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget','ProjectReference'))" />
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user