Merge pull request #94 from fmasa/npc-copy

fmasa · web-flow · commit a89e34d03789 · 2023-04-11T00:30:29.000+02:00
Let GMs copy NPCs
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/DependencyInjection.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/DependencyInjection.kt
@@ -246,7 +246,20 @@ val appModule = DI.Module("Common") {
         )
     }
     bindFactory { partyId: PartyId -> GameMasterScreenModel(partyId, instance(), instance()) }
-    bindFactory { partyId: PartyId -> NpcsScreenModel(partyId, instance()) }
+    bindFactory { partyId: PartyId ->
+        NpcsScreenModel(
+            partyId,
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+            instance(),
+        )
+    }
     bindFactory { partyId: PartyId ->
         SkillTestScreenModel(partyId, instance(), instance(), instance())
     }
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Character.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/domain/character/Character.kt
@@ -2,6 +2,7 @@ package cz.frantisekmasa.wfrp_master.common.core.domain.character
 
 import androidx.compose.runtime.Immutable
 import com.benasher44.uuid.Uuid
+import com.benasher44.uuid.uuid4
 import cz.frantisekmasa.wfrp_master.common.core.common.requireMaxLength
 import cz.frantisekmasa.wfrp_master.common.core.domain.Ambitions
 import cz.frantisekmasa.wfrp_master.common.core.domain.Money
@@ -10,6 +11,7 @@ import cz.frantisekmasa.wfrp_master.common.core.domain.Stats
 import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.Encumbrance
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelable
 import cz.frantisekmasa.wfrp_master.common.core.shared.Parcelize
+import cz.frantisekmasa.wfrp_master.common.core.utils.duplicateName
 import cz.frantisekmasa.wfrp_master.common.encounters.domain.Wounds
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
@@ -233,6 +235,11 @@ data class Character(
 
     fun updateConditions(newConditions: CurrentConditions) = copy(conditions = newConditions)
 
+    fun duplicate() = copy(
+        id = uuid4().toString(),
+        name = duplicateName(name),
+    )
+
     fun archive() = copy(
         isArchived = true,
         userId = null,
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/repositories/FirestoreCharacterRepository.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/core/firebase/repositories/FirestoreCharacterRepository.kt
@@ -103,6 +103,7 @@ class FirestoreCharacterRepository(
 
     override fun inParty(partyId: PartyId, types: Set<CharacterType>): Flow<List<Character>> {
         return characters(partyId)
+            .orderBy("name")
             .documents(mapper)
             .map { characters -> characters.filter { it.type in types && !it.isArchived } }
     }
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/localization/Strings.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/localization/Strings.kt
@@ -952,6 +952,7 @@ data class NpcMessages(
     val noNpcsSubtext: String = "There are no NPCs yet. Add first one.",
     val noNpcsSearched: String = "No NPCs found",
     val noNpcsSearchedSubtext: String = "Consider changing the search phrase",
+    val removalConfirmation: String = "Do you really want to permanently remove this NPC?",
 )
 
 @Immutable
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/npcs/NpcsScreen.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/npcs/NpcsScreen.kt
@@ -6,6 +6,7 @@ import androidx.compose.material.FloatingActionButton
 import androidx.compose.material.Icon
 import androidx.compose.material.ListItem
 import androidx.compose.material.Text
+import androidx.compose.material.TextButton
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Add
 import androidx.compose.runtime.Composable
@@ -20,13 +21,14 @@ import cafe.adriel.voyager.navigator.LocalNavigator
 import cafe.adriel.voyager.navigator.currentOrThrow
 import cz.frantisekmasa.wfrp_master.common.character.CharacterDetailScreen
 import cz.frantisekmasa.wfrp_master.common.characterCreation.CharacterCreationScreen
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterType
 import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId
 import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
-import cz.frantisekmasa.wfrp_master.common.core.shared.IO
 import cz.frantisekmasa.wfrp_master.common.core.shared.Resources
 import cz.frantisekmasa.wfrp_master.common.core.ui.CharacterAvatar
 import cz.frantisekmasa.wfrp_master.common.core.ui.buttons.HamburgerButton
+import cz.frantisekmasa.wfrp_master.common.core.ui.dialogs.AlertDialog
 import cz.frantisekmasa.wfrp_master.common.core.ui.flow.collectWithLifecycle
 import cz.frantisekmasa.wfrp_master.common.core.ui.menu.WithContextMenu
 import cz.frantisekmasa.wfrp_master.common.core.ui.primitives.ContextMenu
@@ -44,14 +46,15 @@ class NpcsScreen(
     @Composable
     override fun Content() {
         val navigator = LocalNavigator.currentOrThrow
-        var removing by remember { mutableStateOf(false) }
+        var processing by remember { mutableStateOf(false) }
 
         val strings = LocalStrings.current
         val screenModel: NpcsScreenModel = rememberScreenModel(arg = partyId)
         val npcs by screenModel.npcs.collectWithLifecycle(null)
+        val (npcToRemove, setNpcToRemove) = remember { mutableStateOf<Character?>(null) }
 
         val data by derivedStateOf {
-            if (removing) {
+            if (processing) {
                 return@derivedStateOf SearchableList.Data.Loading
             }
 
@@ -61,6 +64,32 @@ class NpcsScreen(
 
         val coroutineScope = rememberCoroutineScope()
 
+        if (npcToRemove != null) {
+            AlertDialog(
+                onDismissRequest = { setNpcToRemove(null) },
+                text = { Text(LocalStrings.current.npcs.messages.removalConfirmation) },
+                confirmButton = {
+                    TextButton(
+                        onClick = {
+                            coroutineScope.launch(Dispatchers.IO) {
+                                processing = true
+                                setNpcToRemove(null)
+                                screenModel.archiveNpc(npcToRemove)
+                                processing = false
+                            }
+                        }
+                    ) {
+                        Text(LocalStrings.current.commonUi.buttonRemove)
+                    }
+                },
+                dismissButton = {
+                    TextButton(onClick = { setNpcToRemove(null) }) {
+                        Text(LocalStrings.current.commonUi.buttonCancel)
+                    }
+                }
+            )
+        }
+
         SearchableList(
             data = data,
             navigationIcon = { HamburgerButton() },
@@ -93,12 +122,18 @@ class NpcsScreen(
                         navigator.push(CharacterDetailScreen(CharacterId(partyId, npc.id)))
                     },
                     items = listOf(
-                        ContextMenu.Item(LocalStrings.current.commonUi.buttonRemove) {
+                        ContextMenu.Item(LocalStrings.current.commonUi.buttonDuplicate) {
                             coroutineScope.launch(Dispatchers.IO) {
-                                removing = true
-                                screenModel.archiveNpc(npc)
-                                removing = false
+                                processing = true
+                                try {
+                                    screenModel.duplicate(npc)
+                                } finally {
+                                    processing = false
+                                }
                             }
+                        },
+                        ContextMenu.Item(LocalStrings.current.commonUi.buttonRemove) {
+                            setNpcToRemove(npc)
                         }
                     )
                 ) {
diff --git a/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/npcs/NpcsScreenModel.kt b/common/src/commonMain/kotlin/cz/frantisekmasa/wfrp_master/common/npcs/NpcsScreenModel.kt
@@ -2,19 +2,71 @@ package cz.frantisekmasa.wfrp_master.common.npcs
 
 import cafe.adriel.voyager.core.model.ScreenModel
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.Character
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItem
+import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterItemRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterRepository
 import cz.frantisekmasa.wfrp_master.common.core.domain.character.CharacterType
+import cz.frantisekmasa.wfrp_master.common.core.domain.identifiers.CharacterId
 import cz.frantisekmasa.wfrp_master.common.core.domain.party.PartyId
+import cz.frantisekmasa.wfrp_master.common.core.domain.religion.BlessingRepository
+import cz.frantisekmasa.wfrp_master.common.core.domain.religion.MiracleRepository
+import cz.frantisekmasa.wfrp_master.common.core.domain.skills.SkillRepository
+import cz.frantisekmasa.wfrp_master.common.core.domain.spells.SpellRepository
+import cz.frantisekmasa.wfrp_master.common.core.domain.talents.TalentRepository
+import cz.frantisekmasa.wfrp_master.common.core.domain.traits.TraitRepository
+import cz.frantisekmasa.wfrp_master.common.core.domain.trappings.InventoryItemRepository
+import cz.frantisekmasa.wfrp_master.common.firebase.firestore.Firestore
+import cz.frantisekmasa.wfrp_master.common.firebase.firestore.Transaction
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.first
 
 class NpcsScreenModel(
     private val partyId: PartyId,
     private val characters: CharacterRepository,
+    private val skills: SkillRepository,
+    private val talents: TalentRepository,
+    private val traits: TraitRepository,
+    private val spells: SpellRepository,
+    private val blessings: BlessingRepository,
+    private val miracles: MiracleRepository,
+    private val trappings: InventoryItemRepository,
+    private val firestore: Firestore,
 ) : ScreenModel {
 
     val npcs: Flow<List<Character>> = characters.inParty(partyId, CharacterType.NPC)
 
     suspend fun archiveNpc(npc: Character) {
         characters.save(partyId, npc.archive())
     }
+
+    suspend fun duplicate(npc: Character) {
+        firestore.runTransaction { transaction ->
+            val newNpc = npc.duplicate()
+            val existingCharacterId = CharacterId(partyId, npc.id)
+            val newCharacterId = CharacterId(partyId, newNpc.id)
+
+            copyItems(transaction, skills, existingCharacterId, newCharacterId)
+            copyItems(transaction, talents, existingCharacterId, newCharacterId)
+            copyItems(transaction, traits, existingCharacterId, newCharacterId)
+            copyItems(transaction, spells, existingCharacterId, newCharacterId)
+            copyItems(transaction, blessings, existingCharacterId, newCharacterId)
+            copyItems(transaction, miracles, existingCharacterId, newCharacterId)
+            copyItems(transaction, trappings, existingCharacterId, newCharacterId)
+
+            characters.save(transaction, partyId, newNpc)
+        }
+    }
+
+    private suspend fun <T : CharacterItem<T, *>> copyItems(
+        transaction: Transaction,
+        repository: CharacterItemRepository<T>,
+        existingCharacterId: CharacterId,
+        newCharacterId: CharacterId,
+    ) {
+        repository.findAllForCharacter(existingCharacterId)
+            .first()
+            .forEach { item ->
+                repository.save(transaction, newCharacterId, item)
+            }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -103,6 +103,7 @@ class FirestoreCharacterRepository(`
`103`	`103`
`104`	`104`	`override fun inParty(partyId: PartyId, types: Set<CharacterType>): Flow<List<Character>> {`
`105`	`105`	`return characters(partyId)`
	`106`	`+ .orderBy("name")`
`106`	`107`	`.documents(mapper)`
`107`	`108`	`.map { characters -> characters.filter { it.type in types && !it.isArchived } }`
`108`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -952,6 +952,7 @@ data class NpcMessages(`
`952`	`952`	`val noNpcsSubtext: String = "There are no NPCs yet. Add first one.",`
`953`	`953`	`val noNpcsSearched: String = "No NPCs found",`
`954`	`954`	`val noNpcsSearchedSubtext: String = "Consider changing the search phrase",`
	`955`	`+ val removalConfirmation: String = "Do you really want to permanently remove this NPC?",`
`955`	`956`	`)`
`956`	`957`
`957`	`958`	`@Immutable`