Fixed tests

DFE-Digital · Mar 4, 2025 · 8f99f7b · 8f99f7b
1 parent 39b10d2
commit 8f99f7b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 27 deletions.
diff --git a/src/Dfe.PlanTech.Infrastructure.Redis/GZipRedisValueCompressor.cs b/src/Dfe.PlanTech.Infrastructure.Redis/GZipRedisValueCompressor.cs
@@ -59,7 +59,6 @@ public static RedisValue Compress(RedisValue redisValue)
     /// <returns>True if decompressed, false if not.</returns>
     public static bool Decompress(ref byte[] value)
     {
-
         if (value == null || value.Length == 0 || !value.Take(_gzipHeader.Length).SequenceEqual(_gzipHeader))
         {
             return false;

diff --git a/src/Dfe.PlanTech.Infrastructure.Redis/RedisCache.cs b/src/Dfe.PlanTech.Infrastructure.Redis/RedisCache.cs
@@ -47,33 +47,22 @@ public RedisCache(IRedisConnectionManager connectionManager, ILogger<RedisCache>
             var db = await _connectionManager.GetDatabaseAsync(databaseId);
             var redisResult = await GetAsync<T>(db, key);
 
-            var existedInCache = redisResult.ExistedInCache == true && redisResult.CacheValue != null;
-            var hasContent = false;
+            if (redisResult.Errored)
+            {
+                return await action();
+            }
 
-            if (existedInCache)
+            if (redisResult.ExistedInCache == true && redisResult.CacheValue != null)
             {
-                var resultType = redisResult.CacheValue!.GetType();
+                var hasContent = redisResult.CacheValue is IEnumerable<IContentComponent> cacheValue
+                    ? cacheValue.Any()
+                    : redisResult.CacheValue != null;
 
-                if (typeof(IEnumerable<IContentComponent>).IsAssignableFrom(resultType))
+                if (hasContent)
                 {
-                    var cacheValue = redisResult.CacheValue as IEnumerable<IContentComponent>;
-                    hasContent = cacheValue != null && cacheValue.Any();
+                    _logger.LogTrace("Cache item with key: {Key} found", key);
+                    return redisResult.CacheValue;
                 }
-                else
-                {
-                    var cacheValue = redisResult.CacheValue as IContentComponent;
-                    hasContent = cacheValue != null;
-                }
-            }
-
-            if (existedInCache && hasContent)
-            {
-                _logger.LogTrace("Cache item with key: {Key} found", key);
-                return redisResult.CacheValue;
-            }
-            else if (redisResult.Errored)
-            {
-                return await action();
             }
 
             return await CreateAndCacheItemAsync(db, key, action, expiry, onCacheItemCreation);

diff --git a/tests/Dfe.PlanTech.Infrastructure.Redis.UnitTests/RedisCacheTestsBase.cs b/tests/Dfe.PlanTech.Infrastructure.Redis.UnitTests/RedisCacheTestsBase.cs
@@ -1,4 +1,5 @@
 using Dfe.PlanTech.Domain.Background;
+using Dfe.PlanTech.Domain.Content.Models;
 using NSubstitute;
 using StackExchange.Redis;
 
@@ -7,7 +8,7 @@ namespace Dfe.PlanTech.Infrastructure.Redis.UnitTests;
 public class RedisCacheTestsBase
 {
     protected const string Key = "testKey";
-    protected const string Value = """{"this":"is json"}""";
+    protected string Value = JsonSerialiser.Serialise(new InsetText { Text = "This is text" });
 
     protected readonly IDatabase Database = Substitute.For<IDatabase>();
     protected readonly IBackgroundTaskQueue BackgroundTaskQueue = Substitute.For<IBackgroundTaskQueue>();
@@ -37,9 +38,7 @@ protected virtual void MockDatabaseMethods()
 
             if (keyArg == Key)
             {
-                var redisValue = new RedisValue(Value);
-
-                return Task.FromResult(redisValue);
+                return Task.FromResult(new RedisValue(Value));
             }
 
             return Task.FromResult(new RedisValue());