Add Redis client

AffirmationGenerator.Client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "affirmation-generator-client",
   "private": true,
-  "version": "1.1.1",
+  "version": "1.4.0",
   "packageManager": "pnpm@10.28.2",
   "type": "module",
   "scripts": {

AffirmationGenerator.Server.Tests/Application/Queries/GetAffirmationQueryTests.cs

@@ -37,7 +37,7 @@ public async Task Handle_WhenLanguageIsEnglish_ShouldReturnUntranslatedAffirmati
         const string affirmationText = "Good day!";
         const int maxRequestsPerDay = 10;
 
-        _affirmationService.Get().Returns(affirmationText);
+        _affirmationService.GetAffirmation().Returns(affirmationText);
 
         var getAffirmationRequest = new GetAffirmationRequest { TargetLanguage = AffirmationLanguage.English };
 
@@ -53,7 +53,7 @@ public async Task Handle_WhenLanguageIsEnglish_ShouldReturnUntranslatedAffirmati
         response.Text.ShouldBe(affirmationText);
         response.RemainingCount.ShouldBeLessThan(maxRequestsPerDay);
 
-        await _affirmationService.Received(1).Get();
+        await _affirmationService.Received(1).GetAffirmation();
         _languageCodeMapper.Received(1).Map(AffirmationLanguage.English);
         await _translatorClient.DidNotReceiveWithAnyArgs().Translate(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
     }
@@ -66,7 +66,7 @@ public async Task Handle_WhenLanguageIsGerman_ShouldReturnTranslatedAffirmationI
         const string affirmationTextInGerman = "Guten Tag!";
         const int maxRequestsPerDay = 10;
 
-        _affirmationService.Get().Returns(affirmationText);
+        _affirmationService.GetAffirmation().Returns(affirmationText);
 
         var getAffirmationRequest = new GetAffirmationRequest { TargetLanguage = AffirmationLanguage.German };
 
@@ -83,7 +83,7 @@ public async Task Handle_WhenLanguageIsGerman_ShouldReturnTranslatedAffirmationI
         response.Text.ShouldBe(affirmationTextInGerman);
         response.RemainingCount.ShouldBeLessThan(maxRequestsPerDay);
 
-        await _affirmationService.Received(1).Get();
+        await _affirmationService.Received(1).GetAffirmation();
         _languageCodeMapper.Received(1).Map(AffirmationLanguage.German);
         await _translatorClient.Received(1).Translate(affirmationText, LanguageCode.English, LanguageCode.German);
     }
@@ -92,7 +92,7 @@ public async Task Handle_WhenLanguageIsGerman_ShouldReturnTranslatedAffirmationI
     public async Task Handle_WhenNoAffirmation_ShouldReturnError()
     {
         // Arrange
-        _affirmationService.Get().Returns(Result<string>.Error(new AffirmationNotFound()));
+        _affirmationService.GetAffirmation().Returns(Result<string>.Error(new AffirmationNotFound()));
 
         var getAffirmationRequest = new GetAffirmationRequest { TargetLanguage = AffirmationLanguage.German };
 
@@ -102,7 +102,7 @@ public async Task Handle_WhenNoAffirmation_ShouldReturnError()
         // Assert
         result.ShouldBeError().ShouldBeOfType<AffirmationNotFound>();
 
-        await _affirmationService.Received(1).Get();
+        await _affirmationService.Received(1).GetAffirmation();
         _languageCodeMapper.DidNotReceiveWithAnyArgs().Map(Arg.Any<AffirmationLanguage>());
         await _translatorClient.DidNotReceiveWithAnyArgs().Translate(Arg.Any<string>(), Arg.Any<string>(), Arg.Any<string>());
     }

AffirmationGenerator.Server.Tests/Application/Queries/GetRemainingAffirmationsQueryTests.cs

@@ -27,7 +27,7 @@ public void SetUp()
     public async Task Handle_ShouldReturnRemainingAffirmationsCount(int maxRequestsPerDay)
     {
         // Arrange
-        _affirmationService.Count().Returns(maxRequestsPerDay);
+        _affirmationService.GetRemainingAffirmationsCount().Returns(maxRequestsPerDay);
 
         // Act
         var result = await _query.Handle();
@@ -37,6 +37,6 @@ public async Task Handle_ShouldReturnRemainingAffirmationsCount(int maxRequestsP
         response.RemainingCount.ShouldBe(maxRequestsPerDay);
         response.RemainingCount.ShouldBeGreaterThanOrEqualTo(0);
 
-        await _affirmationService.Received(1).Count();
+        await _affirmationService.Received(1).GetRemainingAffirmationsCount();
     }
 }

AffirmationGenerator.Server/AffirmationGenerator.Server.csproj

@@ -28,6 +28,9 @@
         <PackageReference Include="Refit.HttpClientFactory">
             <Version>10.0.1</Version>
         </PackageReference>
+        <PackageReference Include="StackExchange.Redis">
+            <Version>2.11.8</Version>
+        </PackageReference>
         <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI">
             <Version>10.1.4</Version>
         </PackageReference>

AffirmationGenerator.Server/Application/DiConfig.cs

@@ -15,7 +15,6 @@ public IServiceCollection AddApplication(IConfiguration configuration)
             services.Configure<ClientOptions>(configurationSection.GetSection(nameof(ClientOptions)));
 
             services.AddHttpContextAccessor();
-            services.AddMemoryCache();
 
             services.AddScoped<GetAffirmationQuery>();
             services.AddScoped<GetRemainingAffirmationsQuery>();

AffirmationGenerator.Server/Application/Queries/GetAffirmationQuery.cs

@@ -17,7 +17,7 @@ ILanguageCodeMapper<AffirmationLanguage> languageCodeMapper
 {
     public async Task<Result<AffirmationResponse>> Handle(GetAffirmationRequest request) =>
         await (
-            from affirmation in affirmationService.Get()
+            from affirmation in affirmationService.GetAffirmation()
             from targetLanguageCode in languageCodeMapper.Map(request.TargetLanguage)
             from translatedAffirmation in Translate(affirmation, targetLanguageCode)
             select ToResponse(request.TargetLanguage, translatedAffirmation)
@@ -40,6 +40,6 @@ private async Task<AffirmationResponse> ToResponse(AffirmationLanguage targetLan
         {
             TargetLanguage = targetLanguage,
             Text = affirmation,
-            RemainingCount = await affirmationService.Count(),
+            RemainingCount = await affirmationService.GetRemainingAffirmationsCount(),
         };
 }

AffirmationGenerator.Server/Application/Queries/GetRemainingAffirmationsQuery.cs

@@ -8,7 +8,7 @@ public sealed class GetRemainingAffirmationsQuery(IAffirmationService affirmatio
 {
     public async Task<Result<RemainingAffirmationsResponse>> Handle()
     {
-        var remainingCount = await affirmationService.Count();
+        var remainingCount = await affirmationService.GetRemainingAffirmationsCount();
         return new RemainingAffirmationsResponse { RemainingCount = remainingCount };
     }
 }

AffirmationGenerator.Server/Application/Services/Affirmation/AffirmationService.cs

@@ -1,16 +1,17 @@
 using AffirmationGenerator.Server.Application.Extensions;
 using AffirmationGenerator.Server.Core;
+using AffirmationGenerator.Server.Core.Extensions;
 using AffirmationGenerator.Server.Domain;
 using AffirmationGenerator.Server.Infrastructure.Affirmation;
-using Microsoft.Extensions.Caching.Memory;
+using AffirmationGenerator.Server.Infrastructure.Redis;
 using Microsoft.Extensions.Options;
 
 namespace AffirmationGenerator.Server.Application.Services.Affirmation;
 
 public sealed class AffirmationService(
     ILogger<AffirmationService> logger,
     IAffirmationClient affirmationClient,
-    IMemoryCache memoryCache,
+    IRedisClient redisClient,
     IHttpContextAccessor httpContextAccessor,
     IOptions<ClientOptions> clientOptions
 ) : IAffirmationService
@@ -21,11 +22,9 @@ IOptions<ClientOptions> clientOptions
 
     private string CacheKey => $"{ClientIpAddress}";
 
-    private static TimeSpan OneDay => TimeSpan.FromDays(1);
-
-    public async Task<Result<string>> Get()
+    public async Task<Result<string>> GetAffirmation()
     {
-        var remainingAffirmations = await Count();
+        var remainingAffirmations = await GetRemainingAffirmationsCount();
 
         var affirmationResponse = await affirmationClient.GetAffirmation();
         var affirmation = affirmationResponse.Affirmation ?? string.Empty;
@@ -36,29 +35,28 @@ public async Task<Result<string>> Get()
             return Result<string>.Error(new AffirmationNotFound());
         }
 
-        SetCount(remainingAffirmations);
+        await SetRemainingAffirmationsCount(remainingAffirmations);
 
         return Result<string>.Success(affirmation);
     }
 
-    public async Task<int> Count()
+    public async Task<int> GetRemainingAffirmationsCount()
     {
-        var remainingCount = await memoryCache.GetOrCreateAsync(
-            CacheKey,
-            entry =>
-            {
-                entry.SetAbsoluteExpiration(OneDay);
-                return Task.FromResult(ClientOptions.MaxRequestsPerDay);
-            }
-        );
+        var cachedValue = await redisClient.GetString(CacheKey);
+
+        if (int.TryParse(cachedValue, out var remainingCount) == false)
+        {
+            remainingCount = ClientOptions.MaxRequestsPerDay;
+            await redisClient.SetString(CacheKey, $"{remainingCount}", TimeSpan.OneDay);
+        }
 
         if (logger.IsEnabled(LogLevel.Information))
             logger.LogInformation("{RemainingCount} affirmations remain for user {ClientIpAddress}", remainingCount, ClientIpAddress);
 
         return remainingCount;
     }
 
-    private void SetCount(int count)
+    private async Task SetRemainingAffirmationsCount(int count)
     {
         if (count <= 0)
             return;
@@ -68,6 +66,6 @@ private void SetCount(int count)
         if (count <= 0)
             count = 0;
 
-        memoryCache.Set(CacheKey, count, OneDay);
+        await redisClient.SetString(CacheKey, $"{count}", TimeSpan.OneDay);
     }
 }

AffirmationGenerator.Server/Application/Services/Affirmation/IAffirmationService.cs

@@ -4,7 +4,7 @@ namespace AffirmationGenerator.Server.Application.Services.Affirmation;
 
 public interface IAffirmationService
 {
-    Task<Result<string>> Get();
+    Task<Result<string>> GetAffirmation();
 
-    Task<int> Count();
+    Task<int> GetRemainingAffirmationsCount();
 }

AffirmationGenerator.Server/Core/Extensions/TimeSpanExtensions.cs

@@ -0,0 +1,9 @@
+namespace AffirmationGenerator.Server.Core.Extensions;
+
+public static class TimeSpanExtensions
+{
+    extension(TimeSpan)
+    {
+        public static TimeSpan OneDay => TimeSpan.FromDays(1);
+    }
+}

AffirmationGenerator.Server/Infrastructure/DiConfig.cs

@@ -1,7 +1,9 @@
 using AffirmationGenerator.Server.Infrastructure.Affirmation;
 using AffirmationGenerator.Server.Infrastructure.DeepL;
+using AffirmationGenerator.Server.Infrastructure.Redis;
 using Microsoft.Extensions.Options;
 using Refit;
+using StackExchange.Redis;
 
 namespace AffirmationGenerator.Server.Infrastructure;
 
@@ -12,8 +14,10 @@ public static class DiConfig
         public IServiceCollection AddInfrastructure(IConfiguration configuration)
         {
             var configurationSection = configuration.GetSection("Infrastructure");
-
-            return services.AddDeepLTranslatorClient(configurationSection).AddAffirmationClient(configurationSection);
+            return services
+                .AddDeepLTranslatorClient(configurationSection)
+                .AddAffirmationClient(configurationSection)
+                .AddRedis(configurationSection);
         }
 
         private IServiceCollection AddDeepLTranslatorClient(IConfiguration configuration)
@@ -36,6 +40,17 @@ private IServiceCollection AddAffirmationClient(IConfiguration configuration)
                         httpClient.BaseAddress = new Uri(baseUrl);
                     }
                 );
+            return services;
+        }
+
+        private IServiceCollection AddRedis(IConfiguration configuration)
+        {
+            var connectionString =
+                configuration.GetSection(nameof(RedisClientOptions)).GetValue<string>(nameof(RedisClientOptions.ConnectionString))
+                ?? string.Empty;
+
+            services.AddSingleton<IConnectionMultiplexer>(ConnectionMultiplexer.Connect(connectionString));
+            services.AddScoped<IRedisClient, RedisClient>();
 
             return services;
         }

AffirmationGenerator.Server/Infrastructure/Redis/IRedisClient.cs

@@ -0,0 +1,8 @@
+namespace AffirmationGenerator.Server.Infrastructure.Redis;
+
+public interface IRedisClient
+{
+    Task<string?> GetString(string key);
+
+    Task<bool> SetString(string key, string value, TimeSpan expiration);
+}

AffirmationGenerator.Server/Infrastructure/Redis/RedisClient.cs

@@ -0,0 +1,19 @@
+using StackExchange.Redis;
+
+namespace AffirmationGenerator.Server.Infrastructure.Redis;
+
+public sealed class RedisClient(IConnectionMultiplexer redis) : IRedisClient
+{
+    private IDatabase Database => redis.GetDatabase();
+
+    public async Task<string?> GetString(string key)
+    {
+        var value = await Database.StringGetAsync(GetPrefixKey(key));
+        return value.HasValue == false ? null : value.ToString();
+    }
+
+    public async Task<bool> SetString(string key, string value, TimeSpan expiration) =>
+        await Database.StringSetAsync(GetPrefixKey(key), value, expiration);
+
+    private static string GetPrefixKey(string key) => $"{nameof(RedisClient)}:{key}";
+}

AffirmationGenerator.Server/Infrastructure/Redis/RedisClientOptions.cs

@@ -0,0 +1,6 @@
+namespace AffirmationGenerator.Server.Infrastructure.Redis;
+
+public sealed record RedisClientOptions
+{
+    public required string ConnectionString { get; init; }
+}

AffirmationGenerator.Server/appsettings.json

@@ -21,6 +21,9 @@
     },
     "AffirmationClientOptions": {
       "BaseUrl": "https://www.affirmations.dev"
+    },
+    "RedisClientOptions": {
+      "ConnectionString": ""
     }
   }
 }