From f2d824f829d971494ce754f7b7e07009adfcfa14 Mon Sep 17 00:00:00 2001 From: Krishna Kishore Bandaru Date: Sat, 22 Jan 2022 00:42:17 +0530 Subject: [PATCH 1/3] added helper functions --- MVMCore/MVMCore/Models/JSON/JSONHelper.swift | 43 ++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/MVMCore/MVMCore/Models/JSON/JSONHelper.swift b/MVMCore/MVMCore/Models/JSON/JSONHelper.swift index a6a61ad..5f4494f 100644 --- a/MVMCore/MVMCore/Models/JSON/JSONHelper.swift +++ b/MVMCore/MVMCore/Models/JSON/JSONHelper.swift @@ -15,4 +15,47 @@ public enum JSONError: Error { case pathNotFound case data(path: String) case other(error: Error) + case error(message: String) +} + +extension JSONDictionary { + + public func toJSONString(options: JSONSerialization.WritingOptions = []) -> String? { + guard let data = try? JSONSerialization.data(withJSONObject: self, options: options), + let string = String(data: data, encoding: .utf8) else { + return nil + } + return string + } + + public func toUrlQueryItems() throws -> [URLQueryItem] { + var queryItems: [URLQueryItem] = [] + for (key, value) in self { + var valueString: String + if let value = value as? JSONDictionary, let jsonString = value.toJSONString() { + valueString = jsonString + } else if let value = value as? [AnyHashable], let jsonString = value.toJSONString() { + valueString = jsonString + } else { + guard let baseValueString = String(describing: value.base).removingPercentEncoding else { + throw JSONError.error(message: "query item failed: \(key) value \(value.base)") + } + valueString = baseValueString + } + let queryItem = URLQueryItem(name: key, value: valueString) + queryItems.append(queryItem) + } + return queryItems + } +} + +extension Array where Element == AnyHashable { + + public func toJSONString(options: JSONSerialization.WritingOptions = []) -> String? { + guard let data = try? JSONSerialization.data(withJSONObject: self, options: options), + let string = String(data: data, encoding: .utf8) else { + return nil + } + return string + } } From 306e66a3b2c53b96cce1308337b90829faf73826 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Mon, 24 Jan 2022 18:14:37 -0500 Subject: [PATCH 2/3] review changes --- MVMCore/MVMCore/Models/JSON/JSONHelper.swift | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/MVMCore/MVMCore/Models/JSON/JSONHelper.swift b/MVMCore/MVMCore/Models/JSON/JSONHelper.swift index 5f4494f..71dc813 100644 --- a/MVMCore/MVMCore/Models/JSON/JSONHelper.swift +++ b/MVMCore/MVMCore/Models/JSON/JSONHelper.swift @@ -20,11 +20,11 @@ public enum JSONError: Error { extension JSONDictionary { - public func toJSONString(options: JSONSerialization.WritingOptions = []) -> String? { - guard let data = try? JSONSerialization.data(withJSONObject: self, options: options), - let string = String(data: data, encoding: .utf8) else { - return nil - } + public func toJSONString(options: JSONSerialization.WritingOptions = []) throws -> String { + let data = try JSONSerialization.data(withJSONObject: self, options: options) + guard let string = String(data: data, encoding: .utf8) else { + throw JSONError.error(message: "Failed to convert data to string") + } return string } @@ -32,10 +32,10 @@ extension JSONDictionary { var queryItems: [URLQueryItem] = [] for (key, value) in self { var valueString: String - if let value = value as? JSONDictionary, let jsonString = value.toJSONString() { - valueString = jsonString - } else if let value = value as? [AnyHashable], let jsonString = value.toJSONString() { - valueString = jsonString + if let value = value as? JSONDictionary { + valueString = try value.toJSONString() + } else if let value = value as? [AnyHashable] { + valueString = try value.toJSONString() } else { guard let baseValueString = String(describing: value.base).removingPercentEncoding else { throw JSONError.error(message: "query item failed: \(key) value \(value.base)") @@ -51,11 +51,11 @@ extension JSONDictionary { extension Array where Element == AnyHashable { - public func toJSONString(options: JSONSerialization.WritingOptions = []) -> String? { - guard let data = try? JSONSerialization.data(withJSONObject: self, options: options), - let string = String(data: data, encoding: .utf8) else { - return nil - } + public func toJSONString(options: JSONSerialization.WritingOptions = []) throws -> String { + let data = try JSONSerialization.data(withJSONObject: self, options: options) + guard let string = String(data: data, encoding: .utf8) else { + throw JSONError.error(message: "Failed to convert data to string") + } return string } } From 40c365829a597e585b14b69e96fcae4f5f02f130 Mon Sep 17 00:00:00 2001 From: Scott Pfeil Date: Mon, 24 Jan 2022 18:51:05 -0500 Subject: [PATCH 3/3] JSONARRAY fix --- MVMCore/MVMCore/Models/JSON/JSONHelper.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MVMCore/MVMCore/Models/JSON/JSONHelper.swift b/MVMCore/MVMCore/Models/JSON/JSONHelper.swift index 71dc813..a0c20d0 100644 --- a/MVMCore/MVMCore/Models/JSON/JSONHelper.swift +++ b/MVMCore/MVMCore/Models/JSON/JSONHelper.swift @@ -8,7 +8,7 @@ import Foundation -public typealias JSONArray = [[String: Any]] +public typealias JSONArray = [AnyHashable] public typealias JSONDictionary = [String: AnyHashable] public enum JSONError: Error { @@ -34,7 +34,7 @@ extension JSONDictionary { var valueString: String if let value = value as? JSONDictionary { valueString = try value.toJSONString() - } else if let value = value as? [AnyHashable] { + } else if let value = value as? JSONArray { valueString = try value.toJSONString() } else { guard let baseValueString = String(describing: value.base).removingPercentEncoding else { @@ -49,7 +49,7 @@ extension JSONDictionary { } } -extension Array where Element == AnyHashable { +extension JSONArray { public func toJSONString(options: JSONSerialization.WritingOptions = []) throws -> String { let data = try JSONSerialization.data(withJSONObject: self, options: options)