From 4d21fe05777f8bdee2ffcfad5264fce342c594a4 Mon Sep 17 00:00:00 2001 From: Ivan Babkin Date: Mon, 1 Jul 2019 15:38:10 +0300 Subject: [PATCH] Refactoring --- Sources/Extensions/Codable/Encodable+Extensions.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/Extensions/Codable/Encodable+Extensions.swift b/Sources/Extensions/Codable/Encodable+Extensions.swift index 8e1e367c..fe8869de 100644 --- a/Sources/Extensions/Codable/Encodable+Extensions.swift +++ b/Sources/Extensions/Codable/Encodable+Extensions.swift @@ -40,12 +40,12 @@ public extension Encodable { /// - Returns: URLQueryItems array func asUrlQueryItems() throws -> [URLQueryItem] { return try toJSON().map { - if let value = $1 as? Encodable, - let jsonData = try? JSONSerialization.data(withJSONObject: value.toJSON(), options: []), + if ($1 is [String: Any] || $1 is [Any]), + let jsonData = try? JSONSerialization.data(withJSONObject: $1, options: []), let jsonString = String(data: jsonData, encoding: .utf8) { return URLQueryItem(name: $0, value: jsonString) } else if let value = $1 as? CustomStringConvertible { - return URLQueryItem(name: $0, value: "\(value)") + return URLQueryItem(name: $0, value: value.description) } else { throw LeadKitError.failedToEncodeQueryItems }