For #11905 - Delete pocket story also when imageUrl changes

This will allow updated imageUrls to be persisted and offered to clients. (cherry picked from commit 5e6055b) # Conflicts: # docs/changelog.md
mozilla-mobile · Mar 25, 2022 · f3aef8e · f3aef8e
1 parent c4546a1
commit f3aef8e
Show file tree

Hide file tree

Showing 4 changed files with 397 additions and 3 deletions.
diff --git a/components/service/pocket/build.gradle b/components/service/pocket/build.gradle
@@ -43,10 +43,12 @@ dependencies {
 
     testImplementation Dependencies.kotlin_reflect
 
+    testImplementation Dependencies.androidx_arch_core_testing
     testImplementation Dependencies.androidx_test_core
     testImplementation Dependencies.androidx_test_junit
-    testImplementation Dependencies.testing_robolectric
+    testImplementation Dependencies.testing_coroutines
     testImplementation Dependencies.testing_mockito
+    testImplementation Dependencies.testing_robolectric
 
     testImplementation project(':support-test')
     testImplementation project(':lib-fetch-httpurlconnection')

diff --git a/...et/src/main/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDao.kt b/...et/src/main/java/mozilla/components/service/pocket/stories/db/PocketRecommendationsDao.kt
@@ -23,9 +23,10 @@ internal interface PocketRecommendationsDao {
      */
     @Transaction
     suspend fun cleanOldAndInsertNewPocketStories(stories: List<PocketStoryEntity>) {
-        val newStoriesUrls = stories.map { it.url }
+        // If any url changed that story is obsolete and should be deleted.
+        val newStoriesUrls = stories.map { it.url to it.imageUrl }
         val oldStoriesToDelete = getPocketStories()
-            .filterNot { it.url in newStoriesUrls }
+            .filterNot { newStoriesUrls.contains(it.url to it.imageUrl) }
         delete(oldStoriesToDelete)
 
         insertPocketStories(stories)