feat: replaceすると順番が入れ替わってしまうことがあるので

存在している時はupdateするようにした
pantasystem · May 15, 2024 · 176db83 · 176db83
1 parent 8ff14cc
commit 176db83
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...ata/src/main/java/net/pantasystem/milktea/data/infrastructure/note/impl/sqlite/NoteDAO.kt b/...ata/src/main/java/net/pantasystem/milktea/data/infrastructure/note/impl/sqlite/NoteDAO.kt
@@ -139,6 +139,11 @@ interface NoteDAO {
     )
     suspend fun deleteReactionCountsByNoteId(noteId: String)
 
+    // delete reaction counts
+    @Transaction
+    @Update
+    suspend fun updateReactionCount(reactionCount: ReactionCountEntity)
+
 
 
     @Query(

diff --git a/...java/net/pantasystem/milktea/data/infrastructure/note/impl/sqlite/SQLiteNoteDataSource.kt b/...java/net/pantasystem/milktea/data/infrastructure/note/impl/sqlite/SQLiteNoteDataSource.kt
@@ -419,19 +419,20 @@ class SQLiteNoteDataSource @Inject constructor(
         val deleteList = existsNoteReactionCountMap.filter {
             !reactionCountsMap.containsKey(it.key)
         }.values.toList()
+        val insertList = reactionCountsMap.filter { (_, value) ->
+            value.id !in existsNoteReactionCountMap
+        }.values.toList()
 
-        val updateOrInsertList = reactionCountsMap.mapNotNull { (key, value) ->
-            val exists = existsNoteReactionCountMap[key]
-            if (exists == null || exists != value) {
-                value
-            } else {
-                null
-            }
-        }
+        val updateList = reactionCountsMap.filter { (_, value) ->
+            value.id in existsNoteReactionCountMap && value != existsNoteReactionCountMap[value.id]
+        }.values.toList()
 
         withContext(ioDispatcher) {
-            noteDAO.insertReactionCounts(updateOrInsertList)
+            noteDAO.insertReactionCounts(insertList)
             noteDAO.deleteReactionCounts(deleteList.map { it.id })
+            updateList.forEach {
+                noteDAO.updateReactionCount(it)
+            }
         }
 
     }