Skip to content

Commit

Permalink
merge options
Browse files Browse the repository at this point in the history
  • Loading branch information
Twinki14 committed Dec 7, 2023
1 parent 32543d7 commit 459a76a
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 29 deletions.
26 changes: 25 additions & 1 deletion src/Miha.Redis/RedisOptions.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,33 @@
namespace Miha.Redis;
using Microsoft.Extensions.Configuration;

namespace Miha.Redis;

public class RedisOptions
{
public const string Section = "Redis";

public string Host { get; set; } = "localhost";
public int Port { get; set; } = 6379;

[ConfigurationKeyName("Seeding")]
public RedisSeedOptions SeedOptions { get; set; } = new();
}

public class RedisSeedOptions
{
[ConfigurationKeyName("Guild")]
public RedisSeedGuildOptions? GuildOptions { get; set; }
}

public class RedisSeedGuildOptions
{
public ulong? AnnouncementChannel { get; set; }

public ulong? AnnouncementRoleId { get; set; }

public ulong? BirthdayAnnouncementChannel { get; set; }

public ulong? WeeklyScheduleChannel { get; set; }

public ulong? LogChannel { get; set; }
}
24 changes: 0 additions & 24 deletions src/Miha.Redis/RedisSeedOptions.cs

This file was deleted.

2 changes: 0 additions & 2 deletions src/Miha.Redis/ServiceCollectionExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,10 @@ public static class ServiceCollectionExtensions
public static IServiceCollection AddRedis(this IServiceCollection services, IConfiguration configuration)
{
var redisOptions = configuration.GetSection(RedisOptions.Section);
var redisSeedOptions = configuration.GetSection(RedisSeedOptions.Section);

RedisSerializationSettings.JsonSerializerOptions.ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);

services.AddOptions<RedisOptions>().Bind(redisOptions);
services.AddOptions<RedisSeedOptions>().Bind(redisSeedOptions);

services.AddSingleton<IRedisConnectionProvider>(provider =>
{
Expand Down
4 changes: 2 additions & 2 deletions src/Miha.Redis/Services/RedisSeedService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ public class RedisSeedService
private readonly ILogger<RedisSeedService> _logger;

public RedisSeedService(
IOptions<RedisSeedOptions> seedOptions,
IOptions<RedisOptions> redisOptions,
IGuildRepository guildRepository,
ILogger<RedisSeedService> logger)
{
_seedOptions = seedOptions.Value;
_seedOptions = redisOptions.Value.SeedOptions;
_guildRepository = guildRepository;
_logger = logger;
}
Expand Down

0 comments on commit 459a76a

Please sign in to comment.