Expose updated methods within bookmarks dao

Author: ahmedre

app/src/test/kotlin/com/quran/labs/androidquran/fakes/FakeBookmarksDao.kt

@@ -17,7 +17,9 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.update
 import kotlin.time.Instant
 
-class FakeBookmarksDao : BookmarksDao {
+class FakeBookmarksDao(
+  private val pageForSuraAyah: (SuraAyah) -> Int = { 0 }
+) : BookmarksDao {
   private val bookmarks = MutableStateFlow<List<Bookmark>>(emptyList())
   private val tags = MutableStateFlow<List<Tag>>(emptyList())
   private val defaultBookmarkIds = MutableStateFlow<Set<String>>(emptySet())
@@ -81,6 +83,16 @@ class FakeBookmarksDao : BookmarksDao {
     }
   }
 
+  override suspend fun addCollection(name: String): ReadingCollection {
+    val id = addTag(name)
+    return ReadingCollection(
+      id = id,
+      name = name,
+      lastUpdated = currentTimestampSeconds().toInstant(),
+      isSystem = false
+    )
+  }
+
   override suspend fun tags(): List<Tag> {
     return tags.value
   }
@@ -200,13 +212,90 @@ class FakeBookmarksDao : BookmarksDao {
     changesFlow.tryEmit(Unit)
   }
 
+  override suspend fun deleteAyahBookmark(suraAyah: SuraAyah): Boolean {
+    val bookmarkIds = bookmarks.value
+      .filter { bookmark -> bookmark.sura == suraAyah.sura && bookmark.ayah == suraAyah.ayah }
+      .map { bookmark -> bookmark.id }
+      .toSet()
+    if (bookmarkIds.isEmpty()) {
+      return false
+    }
+
+    bookmarks.update { current -> current.filterNot { bookmark -> bookmark.id in bookmarkIds } }
+    defaultBookmarkIds.update { current -> current - bookmarkIds }
+    changesFlow.tryEmit(Unit)
+    return true
+  }
+
   override suspend fun replaceAyahBookmarks(bookmarks: List<Bookmark>) {
     val ayahBookmarks = bookmarks.filter { bookmark -> bookmark.sura != null && bookmark.ayah != null }
     this.bookmarks.value = ayahBookmarks
     defaultBookmarkIds.value = ayahBookmarks.map { bookmark -> bookmark.id }.toSet()
     changesFlow.tryEmit(Unit)
   }
 
+  override suspend fun replaceAyahBookmarkCollections(
+    suraAyah: SuraAyah,
+    collectionIds: Set<String>
+  ): Boolean {
+    val targetCollectionIds = normalizedCollectionIds(collectionIds)
+    val customCollectionIds = targetCollectionIds.filterNot { collectionId ->
+      collectionId == DEFAULT_BOOKMARK_COLLECTION_ID
+    }.toSet()
+    val isDefaultBookmark = DEFAULT_BOOKMARK_COLLECTION_ID in targetCollectionIds
+    val existingBookmark = bookmarks.value.firstOrNull { bookmark ->
+      bookmark.sura == suraAyah.sura && bookmark.ayah == suraAyah.ayah
+    }
+
+    if (existingBookmark == null) {
+      val id = "bookmark-${bookmarks.value.size + 1}"
+      bookmarks.update { current ->
+        current + Bookmark(
+          id = id,
+          sura = suraAyah.sura,
+          ayah = suraAyah.ayah,
+          page = pageForSuraAyah(suraAyah),
+          timestamp = currentTimestampSeconds(),
+          tags = customCollectionIds.toList()
+        )
+      }
+      if (isDefaultBookmark) {
+        defaultBookmarkIds.update { current -> current + id }
+      }
+      changesFlow.tryEmit(Unit)
+      return true
+    }
+
+    val customCollectionsChanged = existingBookmark.tags.toSet() != customCollectionIds
+    val defaultCollectionChanged = (existingBookmark.id in defaultBookmarkIds.value) != isDefaultBookmark
+    if (!customCollectionsChanged && !defaultCollectionChanged) {
+      return false
+    }
+
+    if (customCollectionsChanged) {
+      bookmarks.update { current ->
+        current.map { bookmark ->
+          if (bookmark.id == existingBookmark.id) {
+            bookmark.copy(tags = customCollectionIds.toList())
+          } else {
+            bookmark
+          }
+        }
+      }
+    }
+    if (defaultCollectionChanged) {
+      defaultBookmarkIds.update { current ->
+        if (isDefaultBookmark) {
+          current + existingBookmark.id
+        } else {
+          current - existingBookmark.id
+        }
+      }
+    }
+    changesFlow.tryEmit(Unit)
+    return true
+  }
+
   override suspend fun isSuraAyahBookmarked(suraAyah: SuraAyah): Boolean {
     return bookmarks.value.any { it.sura == suraAyah.sura && it.ayah == suraAyah.ayah }
   }
@@ -299,6 +388,19 @@ class FakeBookmarksDao : BookmarksDao {
     }
   }
 
+  private fun normalizedCollectionIds(collectionIds: Set<String>): Set<String> {
+    return collectionIds
+      .map { collectionId -> collectionId.trim() }
+      .filter { collectionId -> collectionId.isNotEmpty() }
+      .distinct()
+      .ifEmpty { listOf(DEFAULT_BOOKMARK_COLLECTION_ID) }
+      .toSet()
+  }
+
+  private fun currentTimestampSeconds(): Long {
+    return System.currentTimeMillis() / 1000
+  }
+
   private companion object {
     private const val DEFAULT_COLLECTION_NAME = "Default"
     private const val EPOCH_SECONDS_UPPER_BOUND = 10_000_000_000L

common/bookmark/src/main/java/com/quran/mobile/bookmark/model/BookmarksDaoImpl.kt

@@ -10,6 +10,7 @@ import com.quran.data.di.AppScope
 import com.quran.data.model.SuraAyah
 import com.quran.data.model.bookmark.Bookmark
 import com.quran.data.model.bookmark.Tag
+import com.quran.data.model.collection.ReadingCollection
 import com.quran.data.model.collection.ReadingCollectionBookmarks
 import com.quran.mobile.bookmark.sync.LocalDataChangeNotifier
 import com.quran.mobile.bookmark.sync.notifyLocalDataChanged
@@ -108,6 +109,13 @@ class BookmarksDaoImpl @Inject constructor(
       .map { collections -> collections.map { it.asReadingCollectionBookmarks() } }
   }
 
+  override suspend fun addCollection(name: String): ReadingCollection {
+    return withContext(Dispatchers.IO) {
+      collectionsRepository.addCollection(name)
+        .asReadingCollection()
+    }
+  }
+
   override fun bookmarksForPage(page: Int): Flow<List<Bookmark>> {
     return bookmarksFlow(BookmarkSortOrder.SORT_LOCATION)
       .map { bookmarks -> bookmarks.filter { it.page == page } }
@@ -316,6 +324,12 @@ class BookmarksDaoImpl @Inject constructor(
     }
   }
 
+  override suspend fun deleteAyahBookmark(suraAyah: SuraAyah): Boolean {
+    return withContext(Dispatchers.IO) {
+      bookmarksRepository.deleteBookmark(suraAyah.sura, suraAyah.ayah)
+    }
+  }
+
   override suspend fun replaceAyahBookmarks(bookmarks: List<Bookmark>) {
     val replaced = withContext(Dispatchers.IO) {
       val quranInfo = quranInfoProvider()
@@ -342,6 +356,19 @@ class BookmarksDaoImpl @Inject constructor(
     }
   }
 
+  override suspend fun replaceAyahBookmarkCollections(
+    suraAyah: SuraAyah,
+    collectionIds: Set<String>
+  ): Boolean {
+    return withContext(Dispatchers.IO) {
+      bookmarksRepository.replaceAyahBookmarkCollections(
+        suraAyah.sura,
+        suraAyah.ayah,
+        collectionIds.toList()
+      ).changed
+    }
+  }
+
   override suspend fun isSuraAyahBookmarked(suraAyah: SuraAyah): Boolean {
     return withContext(Dispatchers.IO) {
       bookmarkForSuraAyah(suraAyah) != null

common/bookmark/src/main/java/com/quran/mobile/bookmark/model/Extensions.kt

@@ -14,7 +14,7 @@ internal fun CollectionWithAyahBookmarks.asReadingCollectionBookmarks(): Reading
   )
 }
 
-private fun Collection.asReadingCollection(): ReadingCollection {
+internal fun Collection.asReadingCollection(): ReadingCollection {
   return ReadingCollection(
     id = localId,
     name = name,

common/data/src/main/java/com/quran/data/dao/BookmarksDao.kt

@@ -3,6 +3,7 @@ package com.quran.data.dao
 import com.quran.data.model.SuraAyah
 import com.quran.data.model.bookmark.Bookmark
 import com.quran.data.model.bookmark.Tag
+import com.quran.data.model.collection.ReadingCollection
 import com.quran.data.model.collection.ReadingCollectionBookmarks
 import kotlinx.coroutines.flow.Flow
 
@@ -19,6 +20,7 @@ interface BookmarksDao {
   fun bookmarksForPage(page: Int): Flow<List<Bookmark>>
 
   fun collectionsWithBookmarksFlow(): Flow<List<ReadingCollectionBookmarks>>
+  suspend fun addCollection(name: String): ReadingCollection
 
   suspend fun tags(): List<Tag>
   fun tagsFlow(): Flow<List<Tag>>
@@ -43,7 +45,12 @@ interface BookmarksDao {
 
   suspend fun removeBookmarks(bookmarks: List<Bookmark>)
   suspend fun removeBookmarksForPage(page: Int)
+  suspend fun deleteAyahBookmark(suraAyah: SuraAyah): Boolean
   suspend fun replaceAyahBookmarks(bookmarks: List<Bookmark>)
   suspend fun isSuraAyahBookmarked(suraAyah: SuraAyah): Boolean
+  suspend fun replaceAyahBookmarkCollections(
+    suraAyah: SuraAyah,
+    collectionIds: Set<String>
+  ): Boolean
   suspend fun toggleAyahBookmark(suraAyah: SuraAyah, page: Int): Boolean
 }