Merge pull request #199 from sora-xor/sn-2913

sn-2913 pool cache
sora-xor · Sep 12, 2023 · 12cb61c · 12cb61c
2 parents d4adb28 + 49618ca
commit 12cb61c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/core_db/src/main/java/jp/co/soramitsu/core_db/dao/AssetDao.kt b/core_db/src/main/java/jp/co/soramitsu/core_db/dao/AssetDao.kt
@@ -73,7 +73,7 @@ interface AssetDao {
         private const val QUERY_ASSET_TOKEN_ACTIVE = """
             select * from assets inner join ($joinFiatToken) tokensfiats on assets.tokenId=tokensfiats.id 
             where assets.accountAddress=:address and tokensfiats.whitelistName=:whitelist 
-            and ((assets.visibility=1 or assets.displayAsset=1 or tokensfiats.isHidable = 0) or (tokensfiats.id in (select userTokenIdTarget from userpools)) or (tokensfiats.id in (select tokenId from poolBaseTokens))) order by assets.position
+            and ((assets.visibility=1 or assets.displayAsset=1 or tokensfiats.isHidable = 0) or (tokensfiats.id in (select tokenIdTarget from allpools)) or (tokensfiats.id in (select tokenId from poolBaseTokens))) order by assets.position
         """
     }
 

diff --git a/core_db/src/main/java/jp/co/soramitsu/core_db/dao/PoolDao.kt b/core_db/src/main/java/jp/co/soramitsu/core_db/dao/PoolDao.kt
@@ -33,6 +33,7 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 package jp.co.soramitsu.core_db.dao
 
 import androidx.room.Dao
+import androidx.room.Delete
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
@@ -63,7 +64,10 @@ interface PoolDao {
         select * from allpools where tokenIdBase=:base and tokenIdTarget=:target
     """
     )
-    fun getBasicPool(base: String, target: String): BasicPoolLocal?
+    suspend fun getBasicPool(base: String, target: String): BasicPoolLocal?
+
+    @Query("select * from allpools")
+    suspend fun getBasicPools(): List<BasicPoolLocal>
 
     @Query("select * from poolBaseTokens left join tokens on poolBaseTokens.tokenId = tokens.id")
     suspend fun getPoolBaseTokens(): List<BasePoolWithTokenLocal>
@@ -106,6 +110,9 @@ interface PoolDao {
     )
     fun subscribePool(assetId: String, baseTokenId: String): Flow<List<UserPoolJoinedLocalNullable>>
 
+    @Delete
+    suspend fun deleteBasicPools(p: List<BasicPoolLocal>)
+
     @Upsert()
     suspend fun insertBasicPools(pools: List<BasicPoolLocal>)
 

diff --git a/...o/soramitsu/feature_polkaswap_impl/data/repository/PolkaswapSubscriptionRepositoryImpl.kt b/...o/soramitsu/feature_polkaswap_impl/data/repository/PolkaswapSubscriptionRepositoryImpl.kt
@@ -323,6 +323,10 @@ class PolkaswapSubscriptionRepositoryImpl @Inject constructor(
                 }
             }
         }
+        val minus = db.poolDao().getBasicPools().filter { db ->
+            list.find { it.tokenIdBase == db.tokenIdBase && it.tokenIdTarget == db.tokenIdTarget } == null
+        }
+        db.poolDao().deleteBasicPools(minus)
         db.poolDao().insertBasicPools(list)
     }