feature: Clear the DuckDuckGo Cache (#62)

* feature: Clear the DuckDuckGo Cache adding back clearing cache on query * fixing unit tests
RocketSurgeonsGuild · Jun 24, 2021 · 81ee43e · 81ee43e
1 parent 55bdc10
commit 81ee43e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/src/Data/DuckDuckGo/DuckDuckGoFunctions.cs b/src/Data/DuckDuckGo/DuckDuckGoFunctions.cs
@@ -24,11 +24,31 @@ public static IEnumerable<RelatedTopic> AsResult(this SearchResult searchResult)
         /// </summary>
         /// <param name="result">The result.</param>
         /// <param name="cache">The cache.</param>
+        /// <param name="clearCache">A value determining whether to clear the cache.</param>
         /// <returns>A completion notification.</returns>
         public static IObservable<IChangeSet<RelatedTopic, string>> Cache(
             this IObservable<IEnumerable<RelatedTopic>> result,
-            SourceCache<RelatedTopic, string> cache) => result
-           .Do(duckDuckGoQueryResults => cache.EditDiff(duckDuckGoQueryResults, (first, second) => first.FirstUrl == second.FirstUrl))
-           .SelectMany(_ => cache.Connect().RefCount());
+            SourceCache<RelatedTopic, string> cache,
+            bool clearCache) => result
+           .Do(UpdateCache(cache, clearCache))
+           .Select(_ => cache.Connect().RefCount())
+           .Switch();
+
+        private static Action<IEnumerable<RelatedTopic>> UpdateCache(SourceCache<RelatedTopic, string> cache, bool clearCache) => duckDuckGoQueryResults =>
+        {
+            if (clearCache)
+            {
+                cache
+                   .Edit(updater =>
+                        {
+                            updater.Clear();
+                            updater.AddOrUpdate(duckDuckGoQueryResults);
+                        });
+            }
+            else
+            {
+                cache.EditDiff(duckDuckGoQueryResults, (first, second) => first.FirstUrl == second.FirstUrl);
+            }
+        };
     }
 }
diff --git a/src/Data/DuckDuckGo/DuckDuckGoService.cs b/src/Data/DuckDuckGo/DuckDuckGoService.cs
@@ -32,7 +32,7 @@ public IObservable<IChangeSet<RelatedTopic, string>> Query(string query) => Obse
                        .Search(query)
                        .Catch(_queryException)
                        .Select(x => x.AsResult())
-                       .Cache(_queryResults)
+                       .Cache(_queryResults, false)
                        .Subscribe(observer));
 
         /// <inheritdoc/>
@@ -43,7 +43,7 @@ public IObservable<IChangeSet<RelatedTopic, string>> Query(string query, bool cl
                        .Search(query)
                        .Catch(_queryException)
                        .Select(x => x.AsResult())
-                       .Cache(_queryResults)
+                       .Cache(_queryResults, clearCache)
                        .Subscribe(observer));
 
         /// <inheritdoc/>

diff --git a/src/Data/DuckDuckGo/Models/Topic.cs b/src/Data/DuckDuckGo/Models/Topic.cs
@@ -8,7 +8,7 @@ public class Topic
         /// <summary>
         /// Gets or sets the first url.
         /// </summary>
-        public string FirstURL { get; set; }
+        public string FirstUrl { get; set; }
 
         /// <summary>
         /// Gets or sets the icon.

diff --git a/test/Airframe.Tests/Data/DuckGo/DuckDuckGoFunctionTests.cs b/test/Airframe.Tests/Data/DuckGo/DuckDuckGoFunctionTests.cs
@@ -28,7 +28,7 @@ public void Should_Return_ChangeSet()
                         Text = "text"
                     }
                 })
-               .Cache(sourceCache)
+               .Cache(sourceCache, true)
                .Bind(out var result)
                .Subscribe();
 
@@ -68,7 +68,7 @@ public void Should_Return_Cached()
                             Text = "text"
                         }
                     })
-               .Cache(sourceCache)
+               .Cache(sourceCache, true)
                .Bind(out var result)
                .Subscribe();
 
@@ -101,7 +101,7 @@ public void Should_Clear_Cached()
                             Text = "text"
                         }
                     })
-               .Cache(sourceCache)
+               .Cache(sourceCache, true)
                .Bind(out var result)
                .Subscribe();