Explicit US locale when decoding

Author: adborbas

Sources/AlphaSwiftage/Private/KeyedDecodingContainer+DecodeUS.swift

@@ -0,0 +1,41 @@
+//
+//  KeyedDecodingContainer+DecodeUS.swift
+//
+//
+//  Created by Adam Borbas on 26/03/2024.
+//
+
+import Foundation
+
+extension KeyedDecodingContainer {
+    private var numberFormatter: NumberFormatter {
+        let numberFormatter = NumberFormatter()
+            numberFormatter.numberStyle = .decimal
+            numberFormatter.locale = Locale(identifier: "en-US")
+        return numberFormatter
+    }
+    
+    func decodeUSDecimal(forKey key: K) throws -> Decimal {
+        let stringValue = try decode(String.self, forKey: key)
+        guard let decimalValue = numberFormatter.number(from: stringValue)?.decimalValue else {
+            throw DecodingError.dataCorruptedError(forKey: key, in: self, debugDescription: "Expected string to be convertible to Decimal")
+        }
+        return decimalValue
+    }
+    
+    func decodeUSFloat(forKey key: K) throws -> Float {
+        let stringValue = try decode(String.self, forKey: key)
+        guard let floatValue = numberFormatter.number(from: stringValue)?.floatValue else {
+            throw DecodingError.dataCorruptedError(forKey: key, in: self, debugDescription: "Expected string to be convertible to Float")
+        }
+        return floatValue
+    }
+    
+    func decodeUSInt(forKey key: K) throws -> Int {
+        let stringValue = try decode(String.self, forKey: key)
+        guard let intValue = numberFormatter.number(from: stringValue)?.intValue else {
+            throw DecodingError.dataCorruptedError(forKey: key, in: self, debugDescription: "Expected string to be convertible to Int")
+        }
+        return intValue
+    }
+}

Sources/AlphaSwiftage/Public/Model/CurrencyExchangeRate.swift

@@ -41,9 +41,9 @@ public struct CurrencyExchangeRate: Codable, Equatable {
         fromCurrencyName = try container.decode(String.self, forKey: .fromCurrencyName)
         toCurrencyCode = try container.decode(String.self, forKey: .toCurrencyCode)
         toCurrencyName = try container.decode(String.self, forKey: .toCurrencyName)
-        exchangeRate = try container.decodeDecimal(forKey: .exchangeRate)
-        bidPrice = try container.decodeDecimal(forKey: .bidPrice)
-        askPrice = try container.decodeDecimal(forKey: .askPrice)
+        exchangeRate = try container.decodeUSDecimal(forKey: .exchangeRate)
+        bidPrice = try container.decodeUSDecimal(forKey: .bidPrice)
+        askPrice = try container.decodeUSDecimal(forKey: .askPrice)
 
 
         // Handling TimeZone

Sources/AlphaSwiftage/Public/Model/Quote.swift

@@ -41,13 +41,13 @@ public struct Quote: Codable, Equatable {
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
         symbol = try container.decode(String.self, forKey: .symbol)
-        open = try container.decodeDecimal(forKey: .open)
-        high = try container.decodeDecimal(forKey: .high)
-        low = try container.decodeDecimal(forKey: .low)
-        price = try container.decodeDecimal(forKey: .price)
-        volume = try container.decodeInt(forKey: .volume)
-        previousClose = try container.decodeDecimal(forKey: .previousClose)
-        change = try container.decodeDecimal(forKey: .change)
+        open = try container.decodeUSDecimal(forKey: .open)
+        high = try container.decodeUSDecimal(forKey: .high)
+        low = try container.decodeUSDecimal(forKey: .low)
+        price = try container.decodeUSDecimal(forKey: .price)
+        volume = try container.decodeUSInt(forKey: .volume)
+        previousClose = try container.decodeUSDecimal(forKey: .previousClose)
+        change = try container.decodeUSDecimal(forKey: .change)
         changePercent = try container.decode(String.self, forKey: .changePercent)
 
         let dateString = try container.decode(String.self, forKey: .latestTradingDay)
@@ -60,21 +60,3 @@ public struct Quote: Codable, Equatable {
         latestTradingDay = date
     }
 }
-
-extension KeyedDecodingContainer {
-    func decodeDecimal(forKey key: K) throws -> Decimal {
-        let stringValue = try decode(String.self, forKey: key)
-        guard let decimalValue = Decimal(string: stringValue) else {
-            throw DecodingError.dataCorruptedError(forKey: key, in: self, debugDescription: "Expected string to be convertible to Decimal")
-        }
-        return decimalValue
-    }
-    
-    func decodeInt(forKey key: K) throws -> Int {
-        let stringValue = try decode(String.self, forKey: key)
-        guard let decimalValue = Int(stringValue) else {
-            throw DecodingError.dataCorruptedError(forKey: key, in: self, debugDescription: "Expected string to be convertible to Int")
-        }
-        return decimalValue
-    }
-}

Sources/AlphaSwiftage/Public/Model/Symbol.swift

@@ -39,11 +39,7 @@ public struct Symbol: Codable, Equatable {
         marketOpen = try container.decode(String.self, forKey: .marketOpen)
         marketClose = try container.decode(String.self, forKey: .marketClose)
         currency = try container.decode(String.self, forKey: .currency)
-        let rawMatchScore = try container.decode(String.self, forKey: .matchScore)
-        guard let matchScore = Float(rawMatchScore) else {
-            throw DecodingError.dataCorruptedError(forKey: .matchScore, in: container, debugDescription: "Match score string is not a valid float.")
-        }
-        self.matchScore = matchScore
+        self.matchScore = try container.decodeUSFloat(forKey: .matchScore)
 
         // Handling TimeZone
         let timeZoneString = try container.decode(String.self, forKey: .timeZone)