Refactor

ios/Shared/RocketChat/Database.swift

@@ -85,17 +85,26 @@ class Database {
                         row[columnName] = nil
                     }
                 }
-                print("Row: \(row)")
                 results.append(row)
             }
         } else {
             print("Failed to prepare query: \(query)")
         }
 
         sqlite3_finalize(statement)
-        print(results)
         return results
     }
+
+    func decodeQueryResult<T: Decodable>(_ result: [[String: Any]]) -> [T]? {
+        do {
+            let jsonData = try JSONSerialization.data(withJSONObject: result, options: [])
+            let decodedObjects = try JSONDecoder().decode([T].self, from: jsonData)
+            return decodedObjects
+        } catch {
+            print("Failed to decode result: \(error)")
+            return nil
+        }
+    }
 
     func readRoomEncryptionKey(for roomId: String) -> String? {
         let query = "SELECT e2e_key FROM subscriptions WHERE rid = ? LIMIT 1"
@@ -109,8 +118,7 @@ class Database {
         let query = "SELECT encrypted FROM subscriptions WHERE rid = ? LIMIT 1"
         if let results = self.query(query, args: [roomId]), let firstResult = results.first {
             if let encrypted = firstResult["encrypted"] as? NSNumber {
-                let isEncrypted = encrypted.boolValue
-                return isEncrypted
+                return encrypted.boolValue
             }
         }
         return false

ios/Watch/WatchConnection.swift

@@ -17,44 +17,22 @@ final class WatchConnection: NSObject {
 		}
 	}
 
-    private func getServers() -> [DBServer]? {
+    func getServers() -> [DBServer]? {
         guard let serversQuery = database.query("select * from servers") else {
             print("No servers found")
             return nil
         }
-
-        if let data = try? JSONSerialization.data(withJSONObject: serversQuery, options: []) {
-            do {
-                let servers = try JSONDecoder().decode([DBServer].self, from: data)
-                return servers
-            } catch {
-                print("Failed to decode DBServer: \(error)")
-                return nil
-            }
-        } else {
-            print("Failed to serialize query result to data.")
-            return nil
-        }
+
+        return database.decodeQueryResult(serversQuery)
     }
-    
-    private func getUsers(userToken: String) -> [DBUser]? {
+
+    func getUsers(userToken: String) -> [DBUser]? {
         guard let usersQuery = database.query("select * from users where token == ? limit 1", args: [userToken]) else {
             print("No users found")
             return nil
         }
-
-        if let data = try? JSONSerialization.data(withJSONObject: usersQuery, options: []) {
-            do {
-                let users = try JSONDecoder().decode([DBUser].self, from: data)
-                return users
-            } catch {
-                print("Failed to decode DBServer: \(error)")
-                return nil
-            }
-        } else {
-            print("Failed to serialize query result to data.")
-            return nil
-        }
+
+        return database.decodeQueryResult(usersQuery)
     }
 
     private func getMessage() -> WatchMessage? {