fix: bulk insertの時に正しくリレーションがinsertされない問題を修正

pantasystem · May 15, 2024 · 8ff14cc · 8ff14cc
1 parent 0c0a795
commit 8ff14cc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
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
@@ -220,8 +220,8 @@ class SQLiteNoteDataSource @Inject constructor(
             }.flatten().associateBy {
                 it.id
             }
-            val existsReactionCountsMap = noteRelations.mapNotNull {
-                it.reactionCounts
+            val existsReactionCountsMap = existsNotes.mapNotNull {
+                it.value.reactionCounts
             }.flatten().associateBy {
                 it.id
             }
@@ -231,17 +231,17 @@ class SQLiteNoteDataSource @Inject constructor(
             }.flatten().associateBy {
                 it.id
             }
-            val existsCustomEmojis = noteRelations.mapNotNull {
-                it.customEmojis
+            val existsCustomEmojis = existsNotes.mapNotNull {
+                it.value.customEmojis
             }.flatten().associateBy {
                 it.id
             }
 
             val pollChoices = noteRelations.mapNotNull {
                 it.pollChoices
             }.flatten()
-            val existsPollChoices = noteRelations.mapNotNull {
-                it.pollChoices
+            val existsPollChoices = existsNotes.mapNotNull {
+                it.value.pollChoices
             }.flatten()
 
             val mastodonNotes = needInsertNotes.filter {
@@ -422,14 +422,10 @@ class SQLiteNoteDataSource @Inject constructor(
 
         val updateOrInsertList = reactionCountsMap.mapNotNull { (key, value) ->
             val exists = existsNoteReactionCountMap[key]
-            if (exists == null) {
+            if (exists == null || exists != value) {
                 value
             } else {
-                if (exists != value) {
-                    value
-                } else {
-                    null
-                }
+                null
             }
         }
 
@@ -450,14 +446,10 @@ class SQLiteNoteDataSource @Inject constructor(
 
         val updateOrInsertList = customEmojis.mapNotNull { emoji ->
             val exists = existsCustomEmojis[emoji.key]
-            if (exists == null) {
+            if (exists == null || exists != emoji.value) {
                 emoji.value
             } else {
-                if (exists != emoji.value) {
-                    emoji.value
-                } else {
-                    null
-                }
+                null
             }
         }
 
@@ -476,14 +468,10 @@ class SQLiteNoteDataSource @Inject constructor(
             val exists = existsPollChoices.find {
                 it.id == choice.id
             }
-            if (exists == null) {
+            if (exists == null || exists != choice) {
                 choice
             } else {
-                if (exists != choice) {
-                    choice
-                } else {
-                    null
-                }
+                null
             }
         }
         noteDAO.insertPollChoices(updateOrInsertList)

diff --git a/.../model/src/main/java/net/pantasystem/milktea/model/note/reaction/ToggleReactionUseCase.kt b/.../model/src/main/java/net/pantasystem/milktea/model/note/reaction/ToggleReactionUseCase.kt
@@ -1,5 +1,6 @@
 package net.pantasystem.milktea.model.note.reaction
 
+import kotlinx.coroutines.delay
 import net.pantasystem.milktea.common.flatMapCancellableCatching
 import net.pantasystem.milktea.common.runCancellableCatching
 import net.pantasystem.milktea.model.UseCase
@@ -86,6 +87,7 @@ class ToggleReactionUseCase @Inject constructor(
             // NOTE: Suggestionを表示するためにユーザのデータが必要になるので、キャッシュを更新しておく
             userRepository.sync(note.userId).getOrThrow()
         }.flatMapCancellableCatching {
+            delay(100)
             noteRepository.sync(noteId)
         }
     }