From b34607bd047a0162d1210960cb4444f86e25bc4a Mon Sep 17 00:00:00 2001
From: Emin <ohpleaseman@tutatota.com>
Date: Tue, 11 Feb 2025 17:42:59 +0500
Subject: [PATCH] android: impl smarter places updates thus fixing weird places
 ui updates bug

---
 .../java/app/tourism/data/db/dao/PlacesDao.kt    |  8 +++++++-
 .../data/repositories/PlacesRepository.kt        | 16 +++++++++++++---
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/android/app/src/main/java/app/tourism/data/db/dao/PlacesDao.kt b/android/app/src/main/java/app/tourism/data/db/dao/PlacesDao.kt
index 0b0e07db39..2db39e11b1 100644
--- a/android/app/src/main/java/app/tourism/data/db/dao/PlacesDao.kt
+++ b/android/app/src/main/java/app/tourism/data/db/dao/PlacesDao.kt
@@ -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>>
diff --git a/android/app/src/main/java/app/tourism/data/repositories/PlacesRepository.kt b/android/app/src/main/java/app/tourism/data/repositories/PlacesRepository.kt
index 644badfe2b..7c87882dab 100644
--- a/android/app/src/main/java/app/tourism/data/repositories/PlacesRepository.kt
+++ b/android/app/src/main/java/app/tourism/data/repositories/PlacesRepository.kt
@@ -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