Added party renaming to model

Author: fmasa

app/src/main/java/cz/muni/fi/rpg/model/domain/party/Party.kt

@@ -5,7 +5,7 @@ import java.util.*
 
 data class Party(
     val id: UUID,
-    val name: String,
+    private var name: String,
     val gameMasterId: String?,
     val users: Set<String>,
     private var ambitions: Ambitions = Ambitions("", "")
@@ -44,6 +44,14 @@ data class Party(
         this.ambitions = ambitions
     }
 
+    fun rename(name: String) {
+        this.name = name
+    }
+
+    fun getName(): String {
+        return name;
+    }
+
     fun getAmbitions() = ambitions
 
     fun getInvitation() = Invitation(id, name, accessCode)

app/src/main/java/cz/muni/fi/rpg/ui/character/CharacterFragment.kt

@@ -46,7 +46,7 @@ class CharacterFragment(
         }
 
         viewModel.party.right()
-            .observe(viewLifecycleOwner) { setSubtitle(it.name) }
+            .observe(viewLifecycleOwner) { setSubtitle(it.getName()) }
 
         pager.adapter = StaticFragmentsViewPagerAdapter(
             this,

app/src/main/java/cz/muni/fi/rpg/ui/gameMaster/GameMasterFragment.kt

@@ -46,7 +46,7 @@ class GameMasterFragment(
 
 
         viewModel.party.right().observe(viewLifecycleOwner) { party ->
-            setTitle(party.name)
+            setTitle(party.getName())
             invitation = party.getInvitation()
 
             inviteButton.isEnabled = true

app/src/main/java/cz/muni/fi/rpg/ui/partyList/adapter/PartyHolder.kt

@@ -11,7 +11,7 @@ class PartyHolder(
     private val onClickListener: EntityListener<Party>
 ) : RecyclerView.ViewHolder(view) {
     fun bind(item: Party) {
-        view.party_item_title.text = item.name
+        view.party_item_title.text = item.getName()
 
         val playersCount = item.getPlayerCounts()
 

firebase/firestore.rules

@@ -203,10 +203,14 @@ service cloud.firestore {
                     && ambitions.longTerm is string && ambitions.longTerm.size() <= 400;
             }
 
+            function isValidPartyName(name) {
+                return name is string && isNotBlank(name) && name.size() <= 50;
+            }
+
             function isValidNewParty(party, uid) {
                 return party.keys().toSet() == ["id", "name", "users", "gameMasterId", "accessCode", "ambitions"].toSet()
                     && party.id is string && party.id == partyId && isValidUuid(party.id)
-                    && party.name is string && isNotBlank(party.name) && party.name.size() <= 50
+                    && isValidPartyName(party.name)
                     && party.users == [uid]
                     && (party.gameMasterId == uid || party.gameMasterId == null)
                     && party.accessCode is string && party.accessCode != ""
@@ -217,8 +221,9 @@ service cloud.firestore {
                 let party = request.resource.data;
                 let diff = resource.data.diff(request.resource.data);
 
-                return ["ambitions"].toSet().hasAll(diff.affectedKeys())
-                    && areAmbitionsValid(party.ambitions);
+                return ["ambitions", "name"].toSet().hasAll(diff.affectedKeys())
+                    && areAmbitionsValid(party.ambitions)
+                    && isValidPartyName(party.name);
             }
 
             function invitation(party) {

firebase/tests/rulesTest.ts

@@ -619,6 +619,30 @@ class Parties extends Suite {
             document.update("ambitions", {shortTerm: "Completely new ambitions!", longTerm: "We don't think that far"})
         )
     }
+
+    @test
+    async "should let GM rename party"() {
+        const party = await createValidParty();
+
+        const document = authedApp(party.gameMasterId)
+            .collection("parties")
+            .doc(party.id);
+
+        await firebase.assertSucceeds(document.update("name", "New cool name"))
+    }
+
+
+    @test
+    async "should NOT let player rename party"() {
+        const userId = "user123";
+        const party = await createUserAccessibleParty(userId);
+
+        const document = authedApp(userId)
+            .collection("parties")
+            .doc(party.id);
+
+        await firebase.assertFails(document.update("name", "New cool name"))
+    }
 }