Merge pull request #8 from skelpo/develop

Decode String or Int for Order.Item.quantity and Payment.Item.quantity Properties
skelpo · Jan 23, 2019 · 0680ad5 · 0680ad5
2 parents 7db8317 + ac33585
commit 0680ad5
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/Sources/PayPal/Models/Order/OrderItem.swift b/Sources/PayPal/Models/Order/OrderItem.swift
@@ -69,15 +69,23 @@ extension Order {
         public init(from decoder: Decoder)throws {
             let container = try decoder.container(keyedBy: Order.Item.CodingKeys.self)
 
-            guard let quantityValue = try Int(container.decode(String.self, forKey: .quantity)) else {
-                throw DecodingError.dataCorruptedError(forKey: .quantity, in: container, debugDescription: "Cannot get int from given string")
+            let quantity: Int
+            do {
+                quantity = try container.decode(Int.self, forKey: .quantity)
+            } catch let error as DecodingError {
+                guard case DecodingError.typeMismatch(_, _) = error else { throw error }
+                guard let value = try Int(container.decode(String.self, forKey: .quantity)) else {
+                    throw DecodingError.dataCorruptedError(forKey: .quantity, in: container, debugDescription: "Cannot get int from given string")
+                }
+                quantity = value
             }
-            guard let priceValue = try Decimal(string: container.decode(String.self, forKey: .price)) else {
+
+            guard let price = try Decimal(string: container.decode(String.self, forKey: .price)) else {
                 throw DecodingError.dataCorruptedError(forKey: .price, in: container, debugDescription: "Cannot get decimal from given string")
             }
 
-            self.price = try Failable<Decimal, TenDigits<Decimal>>(priceValue)
-            self.quantity = try Failable<Int, TenDigits<Int>>(quantityValue)
+            self.price = try price.failable()
+            self.quantity = try quantity.failable()
             self.sku = try container.decode(Optional127String.self, forKey: .sku)
             self.name = try container.decode(Optional127String.self, forKey: .name)
             self.description = try container.decode(Optional127String.self, forKey: .description)

diff --git a/Sources/PayPal/Models/Payment/Items/PaymentItem.swift b/Sources/PayPal/Models/Payment/Items/PaymentItem.swift
@@ -71,13 +71,19 @@ extension Payment {
         public init(from decoder: Decoder)throws {
             let container = try decoder.container(keyedBy: Payment.Item.CodingKeys.self)
 
-            let strInt = try container.decode(String.self, forKey: .quantity)
-            let strDec = try container.decode(String.self, forKey: .price)
-            guard let quantity = Int(strInt) else {
-                throw DecodingError.dataCorruptedError(forKey: .quantity, in: container, debugDescription: "String not convertible to int")
+            let quantity: Int
+            do {
+                quantity = try container.decode(Int.self, forKey: .quantity)
+            } catch let error as DecodingError {
+                guard case DecodingError.typeMismatch(_, _) = error else { throw error }
+                guard let value = try Int(container.decode(String.self, forKey: .quantity)) else {
+                    throw DecodingError.dataCorruptedError(forKey: .quantity, in: container, debugDescription: "Given string not convertible to int")
+                }
+                quantity = value
             }
-            guard let price = Decimal(string: strDec) else {
-                throw DecodingError.dataCorruptedError(forKey: .price, in: container, debugDescription: "String not convertible to decimal")
+
+            guard let price = try Decimal(string: container.decode(String.self, forKey: .price)) else {
+                throw DecodingError.dataCorruptedError(forKey: .price, in: container, debugDescription: "Given string not convertible to decimal")
             }
 
             self.quantity = try quantity.failable()