Fix #1270

Change-Id: Id9774ad300b04c17cb1d7668c1ab1bac014bf70c

core/data-test/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/test/repository/FakeUserDataRepository.kt

@@ -43,7 +43,7 @@ internal class FakeUserDataRepository @Inject constructor(
     override suspend fun setTopicIdFollowed(followedTopicId: String, followed: Boolean) =
         niaPreferencesDataSource.setTopicIdFollowed(followedTopicId, followed)
 
-    override suspend fun updateNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {
+    override suspend fun setNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {
         niaPreferencesDataSource.setNewsResourceBookmarked(newsResourceId, bookmarked)
     }
 

core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.kt

@@ -42,7 +42,7 @@ internal class OfflineFirstUserDataRepository @Inject constructor(
         analyticsHelper.logTopicFollowToggled(followedTopicId, followed)
     }
 
-    override suspend fun updateNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {
+    override suspend fun setNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {
         niaPreferencesDataSource.setNewsResourceBookmarked(newsResourceId, bookmarked)
         analyticsHelper.logNewsResourceBookmarkToggled(
             newsResourceId = newsResourceId,

core/data/src/main/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.kt

@@ -41,7 +41,7 @@ interface UserDataRepository {
     /**
      * Updates the bookmarked status for a news resource
      */
-    suspend fun updateNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean)
+    suspend fun setNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean)
 
     /**
      * Updates the viewed status for a news resource

core/data/src/test/kotlin/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt

@@ -133,7 +133,7 @@ class OfflineFirstUserDataRepositoryTest {
     @Test
     fun offlineFirstUserDataRepository_bookmark_news_resource_logic_delegates_to_nia_preferences() =
         testScope.runTest {
-            subject.updateNewsResourceBookmark(newsResourceId = "0", bookmarked = true)
+            subject.setNewsResourceBookmark(newsResourceId = "0", bookmarked = true)
 
             assertEquals(
                 setOf("0"),
@@ -142,7 +142,7 @@ class OfflineFirstUserDataRepositoryTest {
                     .first(),
             )
 
-            subject.updateNewsResourceBookmark(newsResourceId = "1", bookmarked = true)
+            subject.setNewsResourceBookmark(newsResourceId = "1", bookmarked = true)
 
             assertEquals(
                 setOf("0", "1"),

core/testing/src/main/kotlin/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt

@@ -61,7 +61,7 @@ class TestUserDataRepository : UserDataRepository {
         }
     }
 
-    override suspend fun updateNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {
+    override suspend fun setNewsResourceBookmark(newsResourceId: String, bookmarked: Boolean) {
         currentUserData.let { current ->
             val bookmarkedNews = if (bookmarked) {
                 current.bookmarkedNewsResources + newsResourceId

feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt

@@ -58,7 +58,7 @@ class BookmarksViewModel @Inject constructor(
         viewModelScope.launch {
             shouldDisplayUndoBookmark = true
             lastRemovedBookmarkId = newsResourceId
-            userDataRepository.updateNewsResourceBookmark(newsResourceId, false)
+            userDataRepository.setNewsResourceBookmark(newsResourceId, false)
         }
     }
 
@@ -71,7 +71,7 @@ class BookmarksViewModel @Inject constructor(
     fun undoBookmarkRemoval() {
         viewModelScope.launch {
             lastRemovedBookmarkId?.let {
-                userDataRepository.updateNewsResourceBookmark(it, true)
+                userDataRepository.setNewsResourceBookmark(it, true)
             }
         }
         clearUndoState()

feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt

@@ -67,7 +67,7 @@ class BookmarksViewModelTest {
         val collectJob = launch(UnconfinedTestDispatcher()) { viewModel.feedUiState.collect() }
 
         newsRepository.sendNewsResources(newsResourcesTestData)
-        userDataRepository.updateNewsResourceBookmark(newsResourcesTestData[0].id, true)
+        userDataRepository.setNewsResourceBookmark(newsResourcesTestData[0].id, true)
         val item = viewModel.feedUiState.value
         assertIs<Success>(item)
         assertEquals(item.feed.size, 1)
@@ -81,7 +81,7 @@ class BookmarksViewModelTest {
         // Set the news resources to be used by this test
         newsRepository.sendNewsResources(newsResourcesTestData)
         // Start with the resource saved
-        userDataRepository.updateNewsResourceBookmark(newsResourcesTestData[0].id, true)
+        userDataRepository.setNewsResourceBookmark(newsResourcesTestData[0].id, true)
         // Use viewModel to remove saved resource
         viewModel.removeFromSavedResources(newsResourcesTestData[0].id)
         // Verify list of saved resources is now empty

feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt

@@ -117,7 +117,7 @@ class ForYouViewModel @Inject constructor(
 
     fun updateNewsResourceSaved(newsResourceId: String, isChecked: Boolean) {
         viewModelScope.launch {
-            userDataRepository.updateNewsResourceBookmark(newsResourceId, isChecked)
+            userDataRepository.setNewsResourceBookmark(newsResourceId, isChecked)
         }
     }
 

feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt

@@ -81,7 +81,7 @@ class TopicViewModel @Inject constructor(
 
     fun bookmarkNews(newsResourceId: String, bookmarked: Boolean) {
         viewModelScope.launch {
-            userDataRepository.updateNewsResourceBookmark(newsResourceId, bookmarked)
+            userDataRepository.setNewsResourceBookmark(newsResourceId, bookmarked)
         }
     }