Merge pull request #1255 from WalletConnect/hotfix/notify-db-replace-…

…method [Notify] Handle empty subscriptions response
WalletConnect · Jan 11, 2024 · 3aa214e · 3aa214e
2 parents a275924 + 47ae69c
commit 3aa214e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/Example/IntegrationTests/Push/NotifyTests.swift b/Example/IntegrationTests/Push/NotifyTests.swift
@@ -193,13 +193,12 @@ final class NotifyTests: XCTestCase {
 
         await fulfillment(of: [created], timeout: InputConfig.defaultTimeout)
 
-        let updateScope = Set([subscription.scope.keys.first!])
-        try await walletNotifyClientA.update(topic: subscription.topic, scope: updateScope)
+        try await walletNotifyClientA.update(topic: subscription.topic, scope: [])
 
         await fulfillment(of: [updated], timeout: InputConfig.defaultTimeout)
 
-        let updatedScope = Set(subscription.scope.filter { $0.value.enabled == true }.keys)
-        XCTAssertEqual(updatedScope, updateScope)
+        let updatedScope = subscription.scope.filter { $0.value.enabled == true }
+        XCTAssertTrue(updatedScope.isEmpty)
 
         try await walletNotifyClientA.deleteSubscription(topic: subscription.topic)
     }

diff --git a/Sources/Database/SQLiteQuery.swift b/Sources/Database/SQLiteQuery.swift
@@ -2,7 +2,7 @@ import Foundation
 
 public struct SqliteQuery {
 
-    public static func replace(table: String, rows: [SqliteRow]) throws -> String {
+    public static func replace(table: String, rows: [SqliteRow]) -> String? {
         var values: [String] = []
 
         for row in rows {
@@ -12,7 +12,7 @@ public struct SqliteQuery {
         }
 
         guard let first = rows.first else {
-            throw Errors.rowsNotFound
+            return nil
         }
 
         let formattedArguments = first.encode().values
@@ -37,6 +37,10 @@ public struct SqliteQuery {
         return "SELECT * FROM \(table) WHERE \(argument) = '\(value)';"
     }
 
+    public static func delete(table: String) -> String {
+        return "DELETE FROM \(table);"
+    }
+
     public static func delete(table: String, where argument: String, equals value: String) -> String {
         return "DELETE FROM \(table) WHERE \(argument) = '\(value)';"
     }

diff --git a/Sources/WalletConnectNotify/Client/Wallet/NotifyDatabase.swift b/Sources/WalletConnectNotify/Client/Wallet/NotifyDatabase.swift
@@ -29,11 +29,19 @@ final class NotifyDatabase {
     }
 
     func save(subscriptions: [NotifySubscription]) throws {
-        let sql = try SqliteQuery.replace(table: Table.subscriptions, rows: subscriptions)
+        guard let sql = SqliteQuery.replace(table: Table.subscriptions, rows: subscriptions) else { return }
         try execute(sql: sql)
         try onSubscriptionsUpdate?()
     }
 
+    func replace(subscriptions: [NotifySubscription]) throws {
+        try execute(sql: SqliteQuery.delete(table: Table.subscriptions))
+        if let sql = SqliteQuery.replace(table: Table.subscriptions, rows: subscriptions) {
+            try execute(sql: sql)
+        }
+        try onSubscriptionsUpdate?()
+    }
+
     func getSubscription(topic: String) -> NotifySubscription? {
         let sql = SqliteQuery.select(table: Table.subscriptions, where: "topic", equals: topic)
         let subscriptions: [NotifySubscription]? = try? query(sql: sql)
@@ -95,7 +103,7 @@ final class NotifyDatabase {
     }
 
     func save(messages: [NotifyMessageRecord]) throws {
-        let sql = try SqliteQuery.replace(table: Table.messages, rows: messages)
+        guard let sql = SqliteQuery.replace(table: Table.messages, rows: messages) else { return }
         try execute(sql: sql)
         try onMessagesUpdate?()
     }

diff --git a/Sources/WalletConnectNotify/Client/Wallet/NotifyStorage.swift b/Sources/WalletConnectNotify/Client/Wallet/NotifyStorage.swift
@@ -71,7 +71,7 @@ final class NotifyStorage: NotifyStoring {
     }
 
     func replaceAllSubscriptions(_ subscriptions: [NotifySubscription]) throws {
-        try database.save(subscriptions: subscriptions)
+        try database.replace(subscriptions: subscriptions)
     }
 
     func deleteSubscription(topic: String) throws {