Improve AssetsRequest join request

gemwalletcom · Aug 28, 2024 · 562ba8d · 562ba8d
1 parent 07f50fd
commit 562ba8d
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/Packages/Store/Sources/Requests/AssetsRequest.swift b/Packages/Store/Sources/Requests/AssetsRequest.swift
@@ -66,16 +66,12 @@ public struct AssetsRequest: Queryable {
             .including(optional: AssetRecord.balance)
             .including(optional: AssetRecord.details)
             .including(optional: AssetRecord.account)
-            .filter(literal:
-                SQL(stringLiteral: String(format:"%@.walletId = '%@'", AssetBalanceRecord.databaseTableName, walletID))
-            )
-            .filter(literal:
-                SQL(stringLiteral: String(format:"%@.walletId = '%@'", AccountRecord.databaseTableName, walletID))
+            .joining(optional: AssetRecord.balance
+                .filter(Columns.Balance.walletId == walletID)
+                .order(Columns.Balance.fiatValue.desc)
             )
-            .order(literal:
-                SQL(stringLiteral: String(format: "%@.fiatValue DESC", AssetBalanceRecord.databaseTableName))
-            )
-
+            .joining(optional: AssetRecord.account.filter(Columns.Account.walletId == walletID))
+
         if !searchBy.isEmpty {
             request = Self.applyFilter(request: request, .search(searchBy))
         }