Insert FreshRSS items tags

Author: Shinokuni

api/src/main/java/com/readrops/api/services/greader/adapters/GReaderFoldersTagsAdapter.kt

@@ -95,7 +95,8 @@ class GReaderFoldersTagsAdapter {
 
             "tag" -> {
                 tags += Tag(
-                    name = name
+                    name = name,
+                    remoteId = remoteId!!
                 )
             }
         }

api/src/main/java/com/readrops/api/services/greader/adapters/GReaderItemsAdapter.kt

@@ -6,6 +6,7 @@ import com.readrops.api.utils.exceptions.ParseException
 import com.readrops.api.utils.extensions.nextNonEmptyString
 import com.readrops.api.utils.extensions.nextNullableString
 import com.readrops.db.entities.Item
+import com.readrops.db.entities.Tag
 import com.readrops.db.util.DateUtils
 import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
@@ -104,15 +105,31 @@ class GReaderItemsAdapter : JsonAdapter<List<Item>>() {
     }
 
     private fun getStates(reader: JsonReader, item: Item) = with(reader) {
+        val tags = mutableListOf<Tag>()
         beginArray()
 
         while (hasNext()) {
-            when (nextString()) {
-                GOOGLE_READ -> item.isRead = true
-                GOOGLE_STARRED -> item.isStarred = true
+            val value = nextString()
+
+            with(value) {
+                when {
+                    equals(GOOGLE_READ) -> item.isRead = true
+                    equals(GOOGLE_STARRED) -> item.isStarred = true
+                    // might also contain a folder, filtering is needed
+                    contains("user/-/label/") -> {
+                        val tag = Tag(
+                            name = value.removePrefix("user/-/label/"),
+                            remoteId = value
+                        )
+
+                        tags += tag
+                    }
+                }
             }
         }
 
+        item.tags = tags
+
         endArray()
     }
 

api/src/test/java/com/readrops/api/services/greader/adapters/GReaderItemsAdapterTest.kt

@@ -32,6 +32,9 @@ class GReaderItemsAdapterTest {
             assertEquals(pubDate, DateUtils.fromEpochSeconds(1625234040))
             assertEquals(isRead, false)
             assertEquals(isStarred, false)
+
+            assertEquals(1, tags.size)
+            assertEquals("Libre", tags.first().name)
         }
 
         with(items[1]) {

app/src/main/java/com/readrops/app/repositories/GReaderRepository.kt

@@ -12,6 +12,7 @@ import com.readrops.db.entities.Folder
 import com.readrops.db.entities.Item
 import com.readrops.db.entities.ItemState
 import com.readrops.db.entities.Tag
+import com.readrops.db.entities.TagJoin
 import com.readrops.db.entities.account.Account
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
@@ -70,11 +71,13 @@ class GReaderRepository(
         return dataSource.synchronize(syncType, syncData, account.writeToken!!).run {
             insertFolders(folders)
             val newFeeds = insertFeeds(feeds)
-            insertTags(tags)
+            val tags = insertTags(tags)
 
             val newItems = insertItems(items, false)
             insertItems(starredItems, true)
 
+            insertItemsTags(newItems, tags)
+
             insertItemsIds(unreadIds, readIds, starredIds.toMutableList())
 
             account.lastModified = newLastModified
@@ -140,8 +143,9 @@ class GReaderRepository(
         database.folderDao().upsertFolders(folders, account)
     }
 
-    private suspend fun insertTags(tags: List<Tag>) {
+    private suspend fun insertTags(tags: List<Tag>): List<Tag> {
         database.tagDao().insert(tags.map { it.copy(accountId = account.id) })
+        return database.tagDao().selectAll(account.id)
     }
 
     private suspend fun insertItems(items: List<Item>, starredItems: Boolean): List<Item> {
@@ -185,6 +189,24 @@ class GReaderRepository(
         return newItems
     }
 
+    private suspend fun insertItemsTags(newItems: List<Item>, allTags: List<Tag>) {
+        newItems.associate { it to it.tags }
+            .map { (item, tags) ->
+                tags
+                    .filter { tag -> allTags.any { tag.remoteId == it.remoteId } }
+                    .map { tag ->
+                        TagJoin(
+                            itemId = item.id,
+                            tagId = allTags.first { tag.remoteId == it.remoteId }.id,
+                        )
+                    }
+            }
+            .flatten()
+            .run {
+                database.tagJoinDao().insert(this)
+            }
+    }
+
     private suspend fun insertItemsIds(
         unreadIds: List<String>,
         readIds: List<String>,

db/schemas/com.readrops.db.Database/6.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 6,
-    "identityHash": "fccb174ca1fd4c5f42125779dd33197d",
+    "identityHash": "93177df58b7d5e26f8cb1862c79834e1",
     "entities": [
       {
         "tableName": "Feed",
@@ -390,7 +390,7 @@
       },
       {
         "tableName": "Tag",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `account_id` INTEGER NOT NULL, FOREIGN KEY(`account_id`) REFERENCES `Account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `name` TEXT NOT NULL, `remote_id` TEXT NOT NULL, `account_id` INTEGER NOT NULL, FOREIGN KEY(`account_id`) REFERENCES `Account`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
@@ -404,6 +404,12 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "remoteId",
+            "columnName": "remote_id",
+            "affinity": "TEXT",
+            "notNull": true
+          },
           {
             "fieldPath": "accountId",
             "columnName": "account_id",
@@ -645,7 +651,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'fccb174ca1fd4c5f42125779dd33197d')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '93177df58b7d5e26f8cb1862c79834e1')"
     ]
   }
 }

db/src/main/java/com/readrops/db/dao/TagDao.kt

@@ -1,8 +1,12 @@
 package com.readrops.db.dao
 
 import androidx.room.Dao
+import androidx.room.Query
 import com.readrops.db.entities.Tag
 
 @Dao
 interface TagDao : BaseDao<Tag> {
+
+    @Query("Select * From Tag Where account_id = :accountId")
+    suspend fun selectAll(accountId: Int): List<Tag>
 }

db/src/main/java/com/readrops/db/entities/Item.kt

@@ -33,6 +33,7 @@ data class Item(
     @ColumnInfo(name = "starred") var isStarred: Boolean = false,
     @ColumnInfo(name = "remote_id") var remoteId: String? = null,
     @Ignore var feedRemoteId: String? = null,
+    @Ignore var tags: List<Tag> = listOf()
 ) : Comparable<Item> {
 
     val text

db/src/main/java/com/readrops/db/entities/Tag.kt

@@ -23,6 +23,7 @@ import com.readrops.db.entities.account.Account
 data class Tag(
     @PrimaryKey(autoGenerate = true) val id: Int = 0,
     val name: String,
+    @ColumnInfo(name = "remote_id") val remoteId: String,
     @ColumnInfo(name = "account_id", index = true) val accountId: Int = 0,
 )
 
@@ -41,7 +42,7 @@ data class Tag(
     ]
 )
 data class TagJoin(
-    @PrimaryKey(autoGenerate = true) val id: Int,
+    @PrimaryKey(autoGenerate = true) val id: Int = 0,
     @ColumnInfo(name = "tag_id", index = true) val tagId: Int,
     @ColumnInfo(name = "item_id", index = true) val itemId: Int
 )