Fix - Sync overriding imported spells and lore (#321)

* Fix - Clone stop working

* Enable image horizontal just for monster compendium screen

* Fix - Sync overriding imported spells and lore

domain/app/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/database/dao/MonsterLoreDaoImpl.kt

@@ -19,18 +19,17 @@ package br.alexandregpereira.hunter.data.database.dao
 import br.alexandregpereira.hunter.data.monster.lore.local.dao.MonsterLoreDao
 import br.alexandregpereira.hunter.data.monster.lore.local.entity.MonsterLoreCompleteEntity
 import br.alexandregpereira.hunter.data.monster.lore.local.entity.MonsterLoreEntity
+import br.alexandregpereira.hunter.data.monster.lore.local.entity.MonsterLoreEntityStatus
 import br.alexandregpereira.hunter.data.monster.lore.local.entity.MonsterLoreEntryEntity
 import br.alexandregpereira.hunter.database.MonsterLoreCompleteEntityView
 import br.alexandregpereira.hunter.database.MonsterLoreEntryQueries
 import br.alexandregpereira.hunter.database.MonsterLoreQueries
-import br.alexandregpereira.hunter.database.MonsterQueries
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import br.alexandregpereira.hunter.database.MonsterLoreEntity as MonsterLoreDatabaseEntity
 import br.alexandregpereira.hunter.database.MonsterLoreEntryEntity as MonsterLoreEntryDatabaseEntity
 
 internal class MonsterLoreDaoImpl(
-    private val monsterQueries: MonsterQueries,
     private val queries: MonsterLoreQueries,
     private val monsterLoreEntryQueries: MonsterLoreEntryQueries,
     private val dispatcher: CoroutineDispatcher
@@ -48,14 +47,20 @@ internal class MonsterLoreDaoImpl(
         queries.getMonsterLore(monsterIndex).executeAsList().asEntities().first()
     }
 
+    override suspend fun getMonstersLoreEdited(): List<MonsterLoreCompleteEntity> {
+        return withContext(dispatcher) {
+            queries.getMonstersLoreEdited().executeAsList().asEntities()
+        }
+    }
+
     override suspend fun insert(
         monstersLore: List<MonsterLoreCompleteEntity>,
         deleteAll: Boolean
     ) = withContext(dispatcher) {
         queries.transaction {
             val monsterIndexes = if (deleteAll) {
-                monsterQueries.getMonstersThatIsNotCloned().executeAsList()
-                    .map { it.index }.also { monsterIndexes ->
+                queries.getOriginalMonstersLore().executeAsList()
+                    .map { it.monsterLoreIndex }.also { monsterIndexes ->
                         queries.deleteWithIndexes(monsterIndexes)
                     }
             } else {
@@ -67,7 +72,11 @@ internal class MonsterLoreDaoImpl(
             monstersLore.map { it.monsterLore }.forEach {
                 queries.insert(
                     MonsterLoreDatabaseEntity(
-                        monsterLoreIndex = it.monsterLoreIndex
+                        monsterLoreIndex = it.monsterLoreIndex,
+                        status = when (it.status) {
+                            MonsterLoreEntityStatus.Original -> 0L
+                            MonsterLoreEntityStatus.Imported -> 1L
+                        }
                     )
                 )
             }
@@ -88,7 +97,11 @@ internal class MonsterLoreDaoImpl(
     private fun List<MonsterLoreCompleteEntityView>.asEntities(): List<MonsterLoreCompleteEntity> {
         return map {
             MonsterLoreEntity(
-                monsterLoreIndex = it.monsterLoreIndex
+                monsterLoreIndex = it.monsterLoreIndex,
+                status = when (it.status) {
+                    0L -> MonsterLoreEntityStatus.Original
+                    else -> MonsterLoreEntityStatus.Imported
+                },
             ) to MonsterLoreEntryEntity(
                 id = it.id,
                 title = it.title,

domain/app/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/database/dao/SpellDaoImpl.kt

@@ -72,6 +72,10 @@ internal class SpellDaoImpl(
         spellQueries.getSpells().executeAsList().map { it.asSpellEntity() }
     }
 
+    override suspend fun getSpellsEdited(): List<SpellEntity> = withContext(dispatcher) {
+        spellQueries.getSpellsEdited().executeAsList().map { it.asSpellEntity() }
+    }
+
     private fun SpellDatabaseEntity.asSpellEntity(): SpellEntity {
         return SpellEntity(
             spellIndex = spellIndex,

domain/app/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/di/DatabaseModule.kt

@@ -76,7 +76,6 @@ val databaseModule = module {
     factory<MonsterLoreDao> {
         val database = get<Database>()
         MonsterLoreDaoImpl(
-            monsterQueries = database.monsterQueries,
             queries = database.monsterLoreQueries,
             monsterLoreEntryQueries = database.monsterLoreEntryQueries,
             dispatcher = getDispatcherIO()

domain/app/data/src/commonMain/sqldelight/br/alexandregpereira/hunter/database/MonsterLore.sq

@@ -1,10 +1,10 @@
-CREATE TABLE IF NOT EXISTS MonsterLoreEntity (`monsterLoreIndex` TEXT NOT NULL, PRIMARY KEY(`monsterLoreIndex`));
+CREATE TABLE IF NOT EXISTS MonsterLoreEntity (`monsterLoreIndex` TEXT NOT NULL, `status` INTEGER NOT NULL DEFAULT 0, PRIMARY KEY(`monsterLoreIndex`));
 
 insert:
 INSERT OR REPLACE INTO MonsterLoreEntity VALUES ?;
 
 deleteWithIndexes:
-DELETE FROM MonsterLoreEntity WHERE monsterLoreIndex IN ?;
+DELETE FROM MonsterLoreEntity WHERE monsterLoreIndex IN ? AND status == 0;
 
 getMonstersLore:
 SELECT * FROM MonsterLoreCompleteEntityView
@@ -14,6 +14,12 @@ WHERE monsterLoreIndex IN ?
 getMonsterLore:
 SELECT * FROM MonsterLoreCompleteEntityView WHERE monsterLoreIndex == ?;
 
+getMonstersLoreEdited:
+SELECT * FROM MonsterLoreCompleteEntityView WHERE status > 0;
+
+getOriginalMonstersLore:
+SELECT * FROM MonsterLoreCompleteEntityView WHERE status == 0;
+
 CREATE VIEW IF NOT EXISTS MonsterLoreCompleteEntityView AS
 SELECT * FROM MonsterLoreEntity
 INNER JOIN MonsterLoreEntryEntity

domain/app/data/src/commonMain/sqldelight/br/alexandregpereira/hunter/database/Spell.sq

@@ -14,3 +14,6 @@ SELECT * FROM SpellEntity WHERE spellIndex IN ?;
 
 getSpells:
 SELECT * FROM SpellEntity ORDER BY level ASC, name ASC;
+
+getSpellsEdited:
+SELECT * FROM SpellEntity WHERE status > 0;

domain/app/data/src/commonMain/sqldelight/migrations/26.sqm

@@ -0,0 +1 @@
+ALTER TABLE MonsterLoreEntity ADD COLUMN status INTEGER NOT NULL DEFAULT 0;

domain/monster-lore/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/lore/GetMonstersLoreEdited.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2023 Alexandre Gomes Pereira
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package br.alexandregpereira.hunter.domain.monster.lore
+
+import br.alexandregpereira.hunter.domain.monster.lore.model.MonsterLore
+import kotlinx.coroutines.flow.Flow
+
+class GetMonstersLoreEdited(
+    private val repository: MonsterLoreLocalRepository
+) {
+
+    operator fun invoke(): Flow<List<MonsterLore>> {
+        return repository.getMonstersLoreEdited()
+    }
+}

domain/monster-lore/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/lore/MonsterLoreLocalRepository.kt

@@ -25,5 +25,7 @@ interface MonsterLoreLocalRepository {
 
     fun getLocalMonstersLore(indexes: List<String>): Flow<List<MonsterLore>>
 
+    fun getMonstersLoreEdited(): Flow<List<MonsterLore>>
+
     fun save(monstersLore: List<MonsterLore>, isSync: Boolean): Flow<Unit>
 }

domain/monster-lore/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/lore/SyncMonstersLoreUseCase.kt

@@ -16,6 +16,7 @@
 
 package br.alexandregpereira.hunter.domain.monster.lore
 
+import br.alexandregpereira.hunter.domain.monster.lore.model.MonsterLore
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
@@ -26,14 +27,15 @@ import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.reduce
 import kotlinx.coroutines.flow.single
 
+@OptIn(ExperimentalCoroutinesApi::class)
 class SyncMonstersLoreUseCase(
     private val repository: MonsterLoreRepository,
     private val saveMonstersLore: SaveMonstersLoreUseCase,
     private val alternativeSourceRepository: MonsterLoreSourceRepository,
     private val settingsRepository: MonsterLoreSettingsRepository,
+    private val getMonstersLoreEdited: GetMonstersLoreEdited,
 ) {
 
-    @OptIn(ExperimentalCoroutinesApi::class)
     operator fun invoke(): Flow<Unit> {
         return alternativeSourceRepository.getMonsterLoreSources()
             .catch { emit(emptyList()) }
@@ -46,8 +48,18 @@ class SyncMonstersLoreUseCase(
                             .catch { emit(emptyList()) }
                     }?.reduce { accumulator, value -> accumulator + value } ?: emptyList()
             }
+            .removeMonstersLoreEdited()
             .flatMapLatest { monstersLore ->
                 saveMonstersLore(monstersLore, isSync = true)
             }
     }
+
+    private fun Flow<List<MonsterLore>>.removeMonstersLoreEdited(): Flow<List<MonsterLore>> {
+        return map { monstersLore ->
+            val monstersLoreEditedIndexes = getMonstersLoreEdited().single()
+                .map { it.index }
+                .toSet()
+            monstersLore.filterNot { it.index in monstersLoreEditedIndexes }
+        }
+    }
 }

domain/monster-lore/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/lore/di/DomainModule.kt

@@ -18,13 +18,15 @@ package br.alexandregpereira.hunter.domain.monster.lore.di
 
 import br.alexandregpereira.hunter.domain.monster.lore.GetMonsterLoreUseCase
 import br.alexandregpereira.hunter.domain.monster.lore.GetMonstersLoreByIdsUseCase
+import br.alexandregpereira.hunter.domain.monster.lore.GetMonstersLoreEdited
 import br.alexandregpereira.hunter.domain.monster.lore.SaveMonstersLoreUseCase
 import br.alexandregpereira.hunter.domain.monster.lore.SyncMonstersLoreUseCase
 import org.koin.dsl.module
 
 val monsterLoreDomainModule = module {
     factory { GetMonsterLoreUseCase(get()) }
     factory { GetMonstersLoreByIdsUseCase(get()) }
-    factory { SyncMonstersLoreUseCase(get(), get(), get(), get()) }
+    factory { SyncMonstersLoreUseCase(get(), get(), get(), get(), get()) }
     factory { SaveMonstersLoreUseCase(get()) }
+    factory { GetMonstersLoreEdited(get()) }
 }

domain/monster-lore/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/monster/lore/model/MonsterLore.kt

@@ -20,4 +20,9 @@ data class MonsterLore(
     val index: String,
     val name: String,
     val entries: List<MonsterLoreEntry>,
+    val status: MonsterLoreStatus,
 )
+
+enum class MonsterLoreStatus {
+    Original, Imported
+}

domain/monster-lore/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/monster/lore/DefaultMonsterLoreLocalRepository.kt

@@ -38,6 +38,12 @@ internal class DefaultMonsterLoreLocalRepository(
         }
     }
 
+    override fun getMonstersLoreEdited(): Flow<List<MonsterLore>> {
+        return monsterLoreLocalDataSource.getMonstersLoreEdited().map { monsters ->
+            monsters.map { it.toDomain() }
+        }
+    }
+
     override fun save(monstersLore: List<MonsterLore>, isSync: Boolean): Flow<Unit> {
         return monsterLoreLocalDataSource.save(monstersLore.map { it.toEntity() }, isSync)
     }

domain/monster-lore/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/monster/lore/DefaultMonsterLoreRepository.kt

@@ -45,4 +45,8 @@ internal class DefaultMonsterLoreRepository(
     ): Flow<List<MonsterLore>> {
         return remoteRepository.getRemoteMonstersLore(sourceAcronym, lang)
     }
+
+    override fun getMonstersLoreEdited(): Flow<List<MonsterLore>> {
+        return localRepository.getMonstersLoreEdited()
+    }
 }

domain/monster-lore/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/monster/lore/local/MonsterLoreLocalDataSource.kt

@@ -40,6 +40,12 @@ internal class MonsterLoreLocalDataSource(
         }
     }
 
+    fun getMonstersLoreEdited(): Flow<List<MonsterLoreCompleteEntity>> {
+        return flow {
+            emit(monsterLoreDao.getMonstersLoreEdited())
+        }
+    }
+
     fun save(
         monsters: List<MonsterLoreCompleteEntity>,
         isSync: Boolean = false

domain/monster-lore/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/monster/lore/local/dao/MonsterLoreDao.kt

@@ -24,6 +24,8 @@ interface MonsterLoreDao {
 
     suspend fun getMonsterLore(monsterIndex: String): MonsterLoreCompleteEntity
 
+    suspend fun getMonstersLoreEdited(): List<MonsterLoreCompleteEntity>
+
     suspend fun insert(
         monstersLore: List<MonsterLoreCompleteEntity>,
         deleteAll: Boolean

domain/monster-lore/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/monster/lore/local/entity/MonsterLoreEntity.kt

@@ -17,5 +17,10 @@
 package br.alexandregpereira.hunter.data.monster.lore.local.entity
 
 data class MonsterLoreEntity(
-    val monsterLoreIndex: String
+    val monsterLoreIndex: String,
+    val status: MonsterLoreEntityStatus,
 )
+
+enum class MonsterLoreEntityStatus {
+    Original, Imported
+}

domain/monster-lore/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/monster/lore/local/mapper/MonsterLoreEntityMapper.kt

@@ -18,15 +18,21 @@ package br.alexandregpereira.hunter.data.monster.lore.local.mapper
 
 import br.alexandregpereira.hunter.data.monster.lore.local.entity.MonsterLoreCompleteEntity
 import br.alexandregpereira.hunter.data.monster.lore.local.entity.MonsterLoreEntity
+import br.alexandregpereira.hunter.data.monster.lore.local.entity.MonsterLoreEntityStatus
 import br.alexandregpereira.hunter.data.monster.lore.local.entity.MonsterLoreEntryEntity
 import br.alexandregpereira.hunter.domain.monster.lore.model.MonsterLore
 import br.alexandregpereira.hunter.domain.monster.lore.model.MonsterLoreEntry
+import br.alexandregpereira.hunter.domain.monster.lore.model.MonsterLoreStatus
 
 internal fun MonsterLoreCompleteEntity.toDomain(): MonsterLore {
     return MonsterLore(
         index = monsterLore.monsterLoreIndex,
         name = "",
-        entries = entries.map { it.toDomain() }
+        entries = entries.map { it.toDomain() },
+        status = when (monsterLore.status) {
+            MonsterLoreEntityStatus.Original -> MonsterLoreStatus.Original
+            MonsterLoreEntityStatus.Imported -> MonsterLoreStatus.Imported
+        }
     )
 }
 
@@ -40,7 +46,11 @@ internal fun MonsterLoreEntryEntity.toDomain(): MonsterLoreEntry {
 internal fun MonsterLore.toEntity(): MonsterLoreCompleteEntity {
     return MonsterLoreCompleteEntity(
         monsterLore = MonsterLoreEntity(
-            monsterLoreIndex = index
+            monsterLoreIndex = index,
+            status = when (status) {
+                MonsterLoreStatus.Original -> MonsterLoreEntityStatus.Original
+                MonsterLoreStatus.Imported -> MonsterLoreEntityStatus.Imported
+            }
         ),
         entries = entries.map { it.toEntity(index) }
     )

domain/monster-lore/data/src/commonMain/kotlin/br/alexandregpereira/hunter/data/monster/lore/remote/mapper/MonsterLoreDtoMapper.kt

@@ -20,12 +20,14 @@ import br.alexandregpereira.hunter.data.monster.lore.remote.model.MonsterLoreDto
 import br.alexandregpereira.hunter.data.monster.lore.remote.model.MonsterLoreEntryDto
 import br.alexandregpereira.hunter.domain.monster.lore.model.MonsterLore
 import br.alexandregpereira.hunter.domain.monster.lore.model.MonsterLoreEntry
+import br.alexandregpereira.hunter.domain.monster.lore.model.MonsterLoreStatus
 
 internal fun MonsterLoreDto.toDomain(): MonsterLore {
     return MonsterLore(
         index = index,
         name = "",
-        entries = entries.map { it.toDomain() }
+        entries = entries.map { it.toDomain() },
+        status = MonsterLoreStatus.Original,
     )
 }
 

domain/monster/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/usecase/SyncMonstersUseCase.kt

@@ -59,7 +59,7 @@ class SyncMonstersUseCase internal constructor(
                     }
                     .reduce { accumulator, value -> accumulator + value }
             }
-            .filterModifiedMonsters()
+            .removeModifiedMonsters()
             .flatMapLatest { monsters ->
                 saveMonstersUseCase(monsters = monsters, isSync = true)
             }.flatMapLatest {
@@ -92,7 +92,7 @@ class SyncMonstersUseCase internal constructor(
         it.appendMonsterImages(monsterImages)
     }
 
-    private fun Flow<List<Monster>>.filterModifiedMonsters(): Flow<List<Monster>> = map { monsters ->
+    private fun Flow<List<Monster>>.removeModifiedMonsters(): Flow<List<Monster>> = map { monsters ->
         val monstersEditedIndexes = localRepository.getMonsterPreviewsEdited().single()
             .map { it.index }
             .toSet()

domain/spell/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/spell/GetSpellsEdited.kt

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2022 Alexandre Gomes Pereira
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package br.alexandregpereira.hunter.domain.spell
+
+import br.alexandregpereira.hunter.domain.spell.model.Spell
+import kotlinx.coroutines.flow.Flow
+
+class GetSpellsEdited(
+    private val spellRepository: SpellLocalRepository
+) {
+
+    operator fun invoke(): Flow<List<Spell>> {
+        return spellRepository.getLocalSpellsEdited()
+    }
+}

domain/spell/core/src/commonMain/kotlin/br/alexandregpereira/hunter/domain/spell/SpellLocalRepository.kt

@@ -26,4 +26,5 @@ interface SpellLocalRepository {
     fun getLocalSpells(indexes: List<String>): Flow<List<Spell>>
     fun getLocalSpells(): Flow<List<Spell>>
     fun deleteLocalSpells(): Flow<Unit>
+    fun getLocalSpellsEdited(): Flow<List<Spell>>
 }