Remove defaultValue from DatabaseQueryable protocol

Author: DRadmir

Features/Assets/Sources/ViewModels/AssetSceneViewModel.swift

@@ -69,7 +69,7 @@ public final class AssetSceneViewModel: Sendable {
             assetData: AssetData.with(asset: input.asset),
             feeAssetData: AssetData.with(asset: input.asset.chain.asset)
         )
-        self.transactionsQuery = ObservableQuery(input.transactionsRequest)
+        self.transactionsQuery = ObservableQuery(input.transactionsRequest, initialValue: [])
         self.isPresentingSelectedAssetInput = isPresentingSelectedAssetInput
     }
 

Features/Perpetuals/Sources/ViewModels/PerpetualSceneViewModel.swift

@@ -75,7 +75,7 @@ public final class PerpetualSceneViewModel {
             type: .asset(assetId: asset.id),
             filters: [.types(transactionTypes.map { $0.rawValue })]
         )
-        self.transactionsQuery = ObservableQuery(transactionsRequest)
+        self.transactionsQuery = ObservableQuery(transactionsRequest, initialValue: [])
     }
 
     public var navigationTitle: String {

Features/Transactions/Sources/ViewModels/TransactionsFilterViewModel.swift

@@ -46,7 +46,7 @@ public final class TransactionsFilterViewModel {
             type: type,
             filters: defaultFilters + [.types(transactionTypes.map { $0.rawValue })]
         )
-        self.query = ObservableQuery(request)
+        self.query = ObservableQuery(request, initialValue: [])
     }
 
     public var isAnyFilterSpecified: Bool {

Packages/Store/Sources/Query/BindableQuery.swift

@@ -4,5 +4,5 @@ import Foundation
 import GRDB
 
 public protocol BindableQuery: AnyObject, Sendable {
-    @MainActor func bind(db: DatabaseQueue)
+    @MainActor func bind(dbQueue: DatabaseQueue)
 }

Packages/Store/Sources/Query/DatabaseAccess.swift

@@ -5,19 +5,19 @@ import SwiftUI
 import GRDB
 
 public struct DatabaseAccess: Sendable {
-    private let dbQueue: DatabaseQueue?
+    private let _dbQueue: DatabaseQueue?
 
     public static let notConfigured = DatabaseAccess(nil)
 
     public init(_ dbQueue: DatabaseQueue?) {
-        self.dbQueue = dbQueue
+        self._dbQueue = dbQueue
     }
 
-    public var db: DatabaseQueue {
-        guard let dbQueue else {
+    public var dbQueue: DatabaseQueue {
+        guard let _dbQueue else {
             fatalError("DatabaseQueue not configured. Use .databaseQueue() modifier.")
         }
-        return dbQueue
+        return _dbQueue
     }
 }
 
@@ -33,7 +33,7 @@ public extension EnvironmentValues {
 }
 
 public extension View {
-    func databaseQueue(_ db: DatabaseQueue) -> some View {
-        environment(\.database, DatabaseAccess(db))
+    func databaseQueue(_ dbQueue: DatabaseQueue) -> some View {
+        environment(\.database, DatabaseAccess(dbQueue))
     }
 }

Packages/Store/Sources/Query/DatabaseQueryable.swift

@@ -5,6 +5,5 @@ import GRDB
 
 public protocol DatabaseQueryable: Equatable, Sendable {
     associatedtype Value: Equatable & Sendable
-    @MainActor static var defaultValue: Value { get }
     func fetch(_ db: Database) throws -> Value
 }

Packages/Store/Sources/Query/ObservableQuery.swift

@@ -18,27 +18,27 @@ public final class ObservableQuery<Request: DatabaseQueryable>: Sendable, Bindab
 
     public private(set) var value: Request.Value
 
-    private var db: DatabaseQueue?
+    private var dbQueue: DatabaseQueue?
     private var cancellable: AnyCancellable?
 
-    public init(_ request: Request) {
+    public init(_ request: Request, initialValue: Request.Value) {
         self.request = request
-        self.value = Request.defaultValue
+        self.value = initialValue
     }
 
-    public func bind(db: DatabaseQueue) {
-        guard self.db == nil else { return }
-        self.db = db
+    public func bind(dbQueue: DatabaseQueue) {
+        guard self.dbQueue == nil else { return }
+        self.dbQueue = dbQueue
         startObservation()
     }
 
     private func startObservation() {
-        guard let db else { return }
+        guard let dbQueue else { return }
 
         cancellable = ValueObservation.tracking { [request] db in
             try request.fetch(db)
         }
-        .publisher(in: db, scheduling: .immediate)
+        .publisher(in: dbQueue, scheduling: .immediate)
         .sink(
             receiveCompletion: { completion in
                 if case .failure(let error) = completion {

Packages/Store/Sources/Query/QueryBindingModifier.swift

@@ -12,7 +12,7 @@ struct QueryBindingModifier: ViewModifier {
         content
             .onAppear {
                 for query in queries {
-                    query.bind(db: database.db)
+                    query.bind(dbQueue: database.dbQueue)
                 }
             }
     }

Packages/Store/Sources/Requests/TransactionsRequest.swift

@@ -5,8 +5,6 @@ import GRDB
 import Primitives
 
 public struct TransactionsRequest: DatabaseQueryable {
-    public static var defaultValue: [TransactionExtended] { [] }
-
     private let walletId: WalletId
     private let type: TransactionsRequestType
     private let limit: Int