Merge branch 'feat/server-get' into 'master'

Do not use cache for PartyRepository::get() See merge request fmasa/wfrp-master!191
fmasa · Feb 7, 2021 · e803e50 · e803e50
2 parents 40bcb40 + 1254935
commit e803e50
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 21 deletions.
diff --git a/...java/cz/frantisekmasa/wfrp_master/core/firestore/repositories/FirestorePartyRepository.kt b/...java/cz/frantisekmasa/wfrp_master/core/firestore/repositories/FirestorePartyRepository.kt
@@ -3,6 +3,7 @@ package cz.frantisekmasa.wfrp_master.core.firestore.repositories
 import com.google.firebase.firestore.FirebaseFirestore
 import com.google.firebase.firestore.FirebaseFirestoreException
 import com.google.firebase.firestore.SetOptions
+import com.google.firebase.firestore.Source
 import cz.frantisekmasa.wfrp_master.core.connectivity.CouldNotConnectToBackend
 import cz.frantisekmasa.wfrp_master.core.domain.party.Party
 import cz.frantisekmasa.wfrp_master.core.domain.party.PartyId
@@ -40,7 +41,7 @@ import timber.log.Timber
 
     override suspend fun get(id: PartyId): Party {
         try {
-            val party = parties.document(id.toString()).get().await()
+            val party = parties.document(id.toString()).get(Source.SERVER).await()
             return this.mapper.fromDocumentSnapshot(party)
         } catch (e: FirebaseFirestoreException) {
             throw PartyNotFound(id, e)

diff --git a/...ry/src/main/java/cz/frantisekmasa/wfrp_master/inventory/domain/InventoryItemRepository.kt b/...ry/src/main/java/cz/frantisekmasa/wfrp_master/inventory/domain/InventoryItemRepository.kt
@@ -15,13 +15,6 @@ import kotlinx.coroutines.flow.Flow
      */
     suspend fun save(characterId: CharacterId, item: InventoryItem)
 
-    /**
-     * Returns specified InventoryItem or throws an exception.
-     *
-     * @throws InventoryItemNotFound when inventory item does not exist.
-     */
-    suspend fun get(characterId: CharacterId, itemId: InventoryItemId): InventoryItem
-
     /**
      * Removes item from inventory or does nothing if given item is not in user's inventory
      */

diff --git a/...main/java/cz/muni/fi/rpg/model/firestore/repositories/FirestoreInventoryItemRepository.kt b/...main/java/cz/muni/fi/rpg/model/firestore/repositories/FirestoreInventoryItemRepository.kt
@@ -36,19 +36,6 @@ internal class FirestoreInventoryItemRepository(
             .await()
     }
 
-    override suspend fun get(characterId: CharacterId, itemId: InventoryItemId): InventoryItem {
-        try {
-            return mapper.fromDocumentSnapshot(
-                inventoryItems(characterId)
-                    .document(itemId.toString())
-                    .get()
-                    .await()
-            )
-        } catch (e: FirebaseFirestoreException) {
-            throw InventoryItemNotFound(itemId, characterId, e)
-        }
-    }
-
     override suspend fun remove(characterId: CharacterId, itemId: InventoryItemId) {
         inventoryItems(characterId).document(itemId.toString()).delete().await()
     }