Skip to content

Commit e803e50

Browse files
committed
Merge branch 'feat/server-get' into 'master'
Do not use cache for PartyRepository::get() See merge request fmasa/wfrp-master!191
2 parents 40bcb40 + 1254935 commit e803e50

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

app/core/src/main/java/cz/frantisekmasa/wfrp_master/core/firestore/repositories/FirestorePartyRepository.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package cz.frantisekmasa.wfrp_master.core.firestore.repositories
33
import com.google.firebase.firestore.FirebaseFirestore
44
import com.google.firebase.firestore.FirebaseFirestoreException
55
import com.google.firebase.firestore.SetOptions
6+
import com.google.firebase.firestore.Source
67
import cz.frantisekmasa.wfrp_master.core.connectivity.CouldNotConnectToBackend
78
import cz.frantisekmasa.wfrp_master.core.domain.party.Party
89
import cz.frantisekmasa.wfrp_master.core.domain.party.PartyId
@@ -40,7 +41,7 @@ import timber.log.Timber
4041

4142
override suspend fun get(id: PartyId): Party {
4243
try {
43-
val party = parties.document(id.toString()).get().await()
44+
val party = parties.document(id.toString()).get(Source.SERVER).await()
4445
return this.mapper.fromDocumentSnapshot(party)
4546
} catch (e: FirebaseFirestoreException) {
4647
throw PartyNotFound(id, e)

app/inventory/src/main/java/cz/frantisekmasa/wfrp_master/inventory/domain/InventoryItemRepository.kt

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ import kotlinx.coroutines.flow.Flow
1515
*/
1616
suspend fun save(characterId: CharacterId, item: InventoryItem)
1717

18-
/**
19-
* Returns specified InventoryItem or throws an exception.
20-
*
21-
* @throws InventoryItemNotFound when inventory item does not exist.
22-
*/
23-
suspend fun get(characterId: CharacterId, itemId: InventoryItemId): InventoryItem
24-
2518
/**
2619
* Removes item from inventory or does nothing if given item is not in user's inventory
2720
*/

app/src/main/java/cz/muni/fi/rpg/model/firestore/repositories/FirestoreInventoryItemRepository.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,6 @@ internal class FirestoreInventoryItemRepository(
3636
.await()
3737
}
3838

39-
override suspend fun get(characterId: CharacterId, itemId: InventoryItemId): InventoryItem {
40-
try {
41-
return mapper.fromDocumentSnapshot(
42-
inventoryItems(characterId)
43-
.document(itemId.toString())
44-
.get()
45-
.await()
46-
)
47-
} catch (e: FirebaseFirestoreException) {
48-
throw InventoryItemNotFound(itemId, characterId, e)
49-
}
50-
}
51-
5239
override suspend fun remove(characterId: CharacterId, itemId: InventoryItemId) {
5340
inventoryItems(characterId).document(itemId.toString()).delete().await()
5441
}

0 commit comments

Comments
 (0)