gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

android: impl smarter places updates thus fixing weird places ui updates bug

Browse source
This commit is contained in:
Emin 2025-02-11 17:42:59 +05:00
parent a3d2a22f5b
commit b34607bd04
2 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/app/src/main/java/app/tourism/data/db/dao/PlacesDao.kt
View file

@ -14,6 +14,9 @@ interface PlacesDao {
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertPlaces(places: List<PlaceEntity>)
@Query("DELETE FROM places WHERE id IN (:idsList)")
suspend fun deletePlaces(idsList: List<Long>)
@Query("DELETE FROM places")
suspend fun deleteAllPlaces()
@ -23,8 +26,11 @@ interface PlacesDao {
@Query("SELECT * FROM places WHERE UPPER(name) LIKE UPPER(:q) AND language =:language")
fun search(q: String = "", language: String): Flow<List<PlaceEntity>>
@Query("SELECT * FROM places WHERE categoryId = :categoryId AND language =:language ORDER BY rating DESC, name ASC")
fun getSortedPlacesByCategoryIdFlow(categoryId: Long, language: String): Flow<List<PlaceEntity>>
@Query("SELECT * FROM places WHERE categoryId = :categoryId AND language =:language")
fun getPlacesByCategoryId(categoryId: Long, language: String): Flow<List<PlaceEntity>>
fun getPlacesByCategoryIdNotFlow(categoryId: Long, language: String): List<PlaceEntity>
@Query("SELECT * FROM places WHERE categoryId =:categoryId AND language =:language ORDER BY rating DESC LIMIT 15")
fun getTopPlacesByCategoryId(categoryId: Long, language: String): Flow<List<PlaceEntity>>

16
android/app/src/main/java/app/tourism/data/repositories/PlacesRepository.kt
View file

@ -197,7 +197,7 @@ class PlacesRepository(
downloadStats.updatePercentage()
Log.d("", "downloadStats: $downloadStats")
if(downloadStats.isAllFilesProcessed()) {
if (downloadStats.isAllFilesProcessed()) {
emit(DownloadProgress.Finished(downloadStats))
} else {
emit(DownloadProgress.Loading(downloadStats))
@ -244,7 +244,7 @@ class PlacesRepository(
}
fun getPlacesByCategoryFromDbFlow(id: Long): Flow<Resource<List<PlaceShort>>> = channelFlow {
placesDao.getPlacesByCategoryId(categoryId = id, language)
placesDao.getSortedPlacesByCategoryIdFlow(categoryId = id, language)
.collectLatest { placeEntities ->
send(Resource.Success(placeEntities.map { it.toPlaceShort() }))
}
@ -261,7 +261,6 @@ class PlacesRepository(
resource.data?.let { categoryDto ->
if (categoryDto.hash.isBlank()) return
// update places
placesDao.deleteAllPlacesByCategory(categoryId = id, language)
Log.d("dsf", "Before update places, categoryDto: $categoryDto")
val placesEn = categoryDto.en.map { placeDto ->
var placeFull = placeDto.toPlaceFull(false, "en")
@ -276,9 +275,20 @@ class PlacesRepository(
placeFull
}
val oldCacheRu = placesDao.getPlacesByCategoryIdNotFlow(id, "ru")
val oldCacheEn = placesDao.getPlacesByCategoryIdNotFlow(id, "en")
val oldCache = oldCacheEn + oldCacheRu
val allPlaces = mutableListOf<PlaceFull>()
allPlaces.addAll(placesEn)
allPlaces.addAll(placesRu)
val placesRemovedFromApi =
oldCache
.filter { oldCachePlace -> !allPlaces.any { oldCachePlace.id == it.id } }
.map { it.id }
placesDao.deletePlaces(placesRemovedFromApi)
placesDao.insertPlaces(allPlaces.map { it.toPlaceEntity(id) })
// update reviews