add listing tests (and a few TODOs)

kontent-ai · Apr 4, 2023 · f421dc6 · f421dc6
1 parent 39d94d0
commit f421dc6
Show file tree

Hide file tree

Showing 3 changed files with 76 additions and 3 deletions.
diff --git a/Kontent.Ai.Delivery.Caching.Tests/DeliveryClientCacheTests.cs b/Kontent.Ai.Delivery.Caching.Tests/DeliveryClientCacheTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using FakeItEasy;
@@ -935,7 +936,73 @@ public async Task GetUniversalItemsAsync_ResponseIsCached(CacheTypeEnum cacheTyp
             scenario.GetRequestCount(url).Should().Be(1);
         }
 
-        // TODO Add all test to mirror strongly type responses
+
+        [Theory]
+        [InlineData(CacheTypeEnum.Memory, CacheExpirationType.Absolute)]
+        [InlineData(CacheTypeEnum.Memory, CacheExpirationType.Sliding)]
+        [InlineData(CacheTypeEnum.Distributed, CacheExpirationType.Absolute)]
+        [InlineData(CacheTypeEnum.Distributed, CacheExpirationType.Sliding)]
+        public async Task GetUniversalItemsAsync_Paged_ResponseIsCached(CacheTypeEnum cacheType, CacheExpirationType cacheExpirationType)
+        {
+            var url = "items";
+            var pagination = new Pagination(2, 100, 10, 68, "https://testme");
+            var itemB = CreateItem("b", "original");
+            var items = CreatePagedItemsResponse(new[] { CreateItem("a", "original"), itemB }, null, pagination);
+            var scenarioBuilder = new ScenarioBuilder(cacheType, cacheExpirationType);
+            var scenario = scenarioBuilder.WithResponse(url, items).Build();
+
+            var firstResponse = await scenario.CachingClient.GetUniversalItemsAsync();
+            //Check
+            firstResponse.Should().NotBeNull();
+            scenario.GetRequestCount(url).Should().Be(1);
+            firstResponse.Pagination.Should().BeEquivalentTo(pagination);
+        }
+
+        [Theory]
+        [InlineData(CacheTypeEnum.Memory, CacheExpirationType.Absolute)]
+        [InlineData(CacheTypeEnum.Memory, CacheExpirationType.Sliding)]
+        [InlineData(CacheTypeEnum.Distributed, CacheExpirationType.Absolute)]
+        [InlineData(CacheTypeEnum.Distributed, CacheExpirationType.Sliding)]
+        public async Task GetUniversalItemsAsync_InvalidatedByItemsKey(CacheTypeEnum cacheType, CacheExpirationType cacheExpirationType)
+        {
+            var url = "items";
+            var itemB = CreateItem("b", "original");
+            var items = CreateItemsResponse(new[] { CreateItem("a", "original"), itemB });
+            var updatedItems = CreateItemsResponse(new[] { CreateItem("a", "updated"), itemB });
+            var scenarioBuilder = new ScenarioBuilder(cacheType, cacheExpirationType);
+            var scenario = scenarioBuilder.WithResponse(url, items).Build();
+            var firstResponse = await scenario.CachingClient.GetUniversalItemsAsync();
+            scenario = scenarioBuilder.WithResponse(url, updatedItems).Build();
+            scenario.InvalidateDependency(CacheHelpers.GetItemsKey<IList<IUniversalContentItem>>(Enumerable.Empty<IQueryParameter>()));
+            var secondResponse = await scenario.CachingClient.GetUniversalItemsAsync();
+            //Check
+            firstResponse.Should().NotBeNull();
+            secondResponse.Should().NotBeNull();
+            firstResponse.Should().NotBeEquivalentTo(secondResponse);
+            scenario.GetRequestCount(url).Should().Be(2);
+        }
+
+        [Theory]
+        [InlineData(CacheExpirationType.Absolute)]
+        [InlineData(CacheExpirationType.Sliding)]
+        public async Task GetUniversalItemsAsync_InvalidatedByItemsDependency(CacheExpirationType cacheExpirationType)
+        {
+            var url = "items";
+            var itemB = CreateItem("b", "original");
+            var items = CreateItemsResponse(new[] { CreateItem("a", "original"), itemB });
+            var updatedItems = CreateItemsResponse(new[] { CreateItem("a", "updated"), itemB });
+            var scenarioBuilder = new ScenarioBuilder(cacheExpirationType: cacheExpirationType);
+            var scenario = scenarioBuilder.WithResponse(url, items).Build();
+            var firstResponse = await scenario.CachingClient.GetUniversalItemsAsync();
+            scenario = scenarioBuilder.WithResponse(url, updatedItems).Build();
+            scenario.InvalidateDependency(CacheHelpers.GetItemsDependencyKey());
+            var secondResponse = await scenario.CachingClient.GetUniversalItemsAsync();
+            //Check
+            firstResponse.Should().NotBeNull();
+            secondResponse.Should().NotBeNull();
+            firstResponse.Should().NotBeEquivalentTo(secondResponse);
+            scenario.GetRequestCount(url).Should().Be(2);
+        }
 
         #endregion
     }

diff --git a/Kontent.Ai.Delivery.Caching/CacheHelpers.cs b/Kontent.Ai.Delivery.Caching/CacheHelpers.cs
@@ -349,8 +349,11 @@ private static bool IsAssignableToGenericType(Type givenType, Type genericType)
 
         private static bool IsItemListingResponse(IResponse response)
         {
-            return response.GetType().IsGenericType &&
-                   IsAssignableToGenericType(response.GetType(), typeof(IDeliveryItemListingResponse<>));
+            return
+            (
+                response.GetType().IsGenericType
+                && IsAssignableToGenericType(response.GetType(), typeof(IDeliveryItemListingResponse<>))
+            ) || typeof(IDeliveryUniversalItemListingResponse).IsAssignableFrom(response.GetType());
         }
 
         private static bool IsComponent(JProperty property)

diff --git a/Kontent.Ai.Delivery.Caching/DeliveryClientCache.cs b/Kontent.Ai.Delivery.Caching/DeliveryClientCache.cs
@@ -160,6 +160,7 @@ public async Task<IDeliveryLanguageListingResponse> GetLanguagesAsync(IEnumerabl
         // TODO
         public async Task<IDeliveryUniversalItemResponse> GetUniversalItemAsync(string codename, IEnumerable<IQueryParameter> parameters = null)
         {
+            // TODO use different method for getting item cache keys?
             var queryParameters = parameters?.ToList();
             return await _deliveryCacheManager.GetOrAddAsync(
                 CacheHelpers.GetItemKey<IUniversalContentItem>(codename, queryParameters),
@@ -171,6 +172,8 @@ public async Task<IDeliveryUniversalItemResponse> GetUniversalItemAsync(string c
         // TODO
         public async Task<IDeliveryUniversalItemListingResponse> GetUniversalItemsAsync(IEnumerable<IQueryParameter> parameters = null)
         {
+            // TODO CacheHelpers.GetItemsDependencies - is that correct to use the same key?
+            // TODO CacheHelpers.GetItemsKey  do we want to have it here?
             var queryParameters = parameters?.ToList();
             return await _deliveryCacheManager.GetOrAddAsync(
                 CacheHelpers.GetItemsKey<IList<IUniversalContentItem>>(queryParameters),