Remove id from feed group when feed is deleted

msasikanth · Apr 16, 2024 · 5a90a1e · 5a90a1e
1 parent dcdf041
commit 5a90a1e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/repository/RssRepository.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/repository/RssRepository.kt
@@ -402,7 +402,17 @@ class RssRepository(
   }
 
   suspend fun removeFeed(feedId: String) {
-    withContext(ioDispatcher) { feedQueries.remove(feedId) }
+    withContext(ioDispatcher) {
+      feedQueries.remove(feedId)
+      val feedGroup = feedGroupQueries.groupByFeedId(feedId).executeAsOneOrNull()
+
+      if (feedGroup != null) {
+        feedGroupQueries.updateFeedIds(
+          feedIds = feedGroup.feedIds - setOf(feedId),
+          id = feedGroup.id
+        )
+      }
+    }
   }
 
   suspend fun updateFeedName(newFeedName: String, feedId: String) {
@@ -612,6 +622,17 @@ class RssRepository(
         sources.forEach { source ->
           feedQueries.remove(id = source.id)
           feedGroupQueries.deleteGroup(id = source.id)
+
+          if (source is Feed) {
+            val feedGroup = feedGroupQueries.groupByFeedId(feedId = source.id).executeAsOneOrNull()
+
+            if (feedGroup != null) {
+              feedGroupQueries.updateFeedIds(
+                feedIds = feedGroup.feedIds - setOf(source.id),
+                id = feedGroup.id
+              )
+            }
+          }
         }
       }
     }

diff --git a/shared/src/commonMain/sqldelight/dev/sasikanth/rss/reader/database/FeedGroup.sq b/shared/src/commonMain/sqldelight/dev/sasikanth/rss/reader/database/FeedGroup.sq
@@ -63,3 +63,6 @@ DELETE FROM feedGroup WHERE id = :id;
 
 updatePinnedAt:
 UPDATE feedGroup SET pinnedAt = :pinnedAt WHERE id = :id;
+
+groupByFeedId:
+SELECT * FROM feedGroup WHERE INSTR(feedIds, :feedId);