shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -66,16 +66,16 @@ class Repository(private val api: SelfossApi, private val appSettingsService: Ap
         } else {
             if (appSettingsService.isItemCachingEnabled()) {
                 fromDB = true
-                var dbItems = getDBItems().filter {
+                val dbItems = getDBItems().filter {
                     displayedItems == ItemType.ALL ||
                             (it.unread && displayedItems == ItemType.UNREAD) ||
                             (it.starred && displayedItems == ItemType.STARRED)
                 }
                 if (tagFilter != null) {
-                    dbItems = dbItems.filter { it.tags.split(',').contains(tagFilter!!.tag) }
+                    dbItems.filter { it.tags.contains(tagFilter!!.tag) }
                 }
                 if (sourceFilter != null) {
-                    dbItems = dbItems.filter { it.sourcetitle == sourceFilter!!.title }
+                    dbItems.filter { it.sourcetitle == sourceFilter!!.title }
                 }
                 fetchedItems = SelfossModel.StatusAndData.succes(
                     dbItems.map { it.toView() }

shared/src/commonTest/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryTest.kt

@@ -179,12 +179,12 @@ class RepositoryTest() {
         val itemParameter2 = FakeItemParameters()
         val itemParameter3 = FakeItemParameters()
         itemParameter2.tags = "Test, Stuff"
-        itemParameter2.id = "2"
         itemParameter3.tags = "Other, Tag"
-        itemParameter3.id = "3"
-        coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(itemParameter1) +
-            generateTestDBItems(itemParameter2) +
+        coEvery { db.itemsQueries.items().executeAsList() } returnsMany listOf(
+            generateTestDBItems(itemParameter1),
+            generateTestDBItems(itemParameter2),
             generateTestDBItems(itemParameter3)
+        )
 
         every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
         every { appSettingsService.isItemCachingEnabled() } returns true
@@ -206,12 +206,12 @@ class RepositoryTest() {
         val itemParameter2 = FakeItemParameters()
         val itemParameter3 = FakeItemParameters()
         itemParameter2.sourcetitle = "Test"
-        itemParameter2.id = "2"
         itemParameter3.sourcetitle = "Other"
-        itemParameter3.id = "3"
-        coEvery { db.itemsQueries.items().executeAsList() } returns generateTestDBItems(itemParameter1) +
-                generateTestDBItems(itemParameter2) +
+        coEvery { db.itemsQueries.items().executeAsList() } returnsMany listOf(
+            generateTestDBItems(itemParameter1),
+            generateTestDBItems(itemParameter2),
             generateTestDBItems(itemParameter3)
+        )
 
         every { connectivityStatus.isNetworkConnected } returns MutableStateFlow(false)
         every { appSettingsService.isItemCachingEnabled() } returns true