Merge pull request #8 from adborbas/adborbas/extra_logging

Extra logging and not parsing timezone and date

Author: adborbas

Sources/AlphaSwiftage/Private/AlphaVantageResponseSerializer.swift

@@ -17,14 +17,14 @@ struct AlphaVantageResponseSerializer<T: Decodable>: ResponseSerializer {
             return .success(result)
         } catch {
             guard let data = data else {
-                logger.error("Failed to serialise request and returned data is nil. \(error.localizedDescription)")
+                logger.error("Failed to serialise response and returned data is nil. \(String(describing: error))")
                 return .failure(.unknown(error))
             }
 
-            logger.debug("Failed to serialise request: \(error.localizedDescription).")
+            logger.debug("Failed to serialise response: \(String(describing: error)).")
             do {
                 let error = try JSONDecoder().decode(AlphaVantageAPIError.self, from: data)
-                logger.info("API Error: \(error.localizedDescription)")
+                logger.info("API Error: \(String(describing: error))")
                 return .failure(.apiError(error))
             } catch {
                 guard let response = String(data: data, encoding: .utf8) else {

Sources/AlphaSwiftage/Private/SwiftLogger.swift

@@ -0,0 +1,12 @@
+//
+//  SwiftLogger.swift
+//
+//
+//  Created by Adam Borbas on 23/03/2024.
+//
+
+import Foundation
+import Logging
+import Alamofire
+
+var logger: Logger = Logger(label: "com.adborbas.alphaswiftage")

Sources/AlphaSwiftage/Private/logger.swift

@@ -6,12 +6,12 @@ public struct CurrencyExchangeRate: Codable, Equatable {
     public let toCurrencyCode: String
     public let toCurrencyName: String
     public let exchangeRate: Decimal
-    public let lastRefreshed: Date
-    public let timeZone: TimeZone
+    public let lastRefreshed: String
+    public let timeZone: String
     public let bidPrice: Decimal
     public let askPrice: Decimal
 
-    init(fromCurrencyCode: String, fromCurrencyName: String, toCurrencyCode: String, toCurrencyName: String, exchangeRate: Decimal, lastRefreshed: Date, timeZone: TimeZone, bidPrice: Decimal, askPrice: Decimal) {
+    init(fromCurrencyCode: String, fromCurrencyName: String, toCurrencyCode: String, toCurrencyName: String, exchangeRate: Decimal, lastRefreshed: String, timeZone: String, bidPrice: Decimal, askPrice: Decimal) {
         self.fromCurrencyCode = fromCurrencyCode
         self.fromCurrencyName = fromCurrencyName
         self.toCurrencyCode = toCurrencyCode
@@ -44,23 +44,7 @@ public struct CurrencyExchangeRate: Codable, Equatable {
         exchangeRate = try container.decodeUSDecimal(forKey: .exchangeRate)
         bidPrice = try container.decodeUSDecimal(forKey: .bidPrice)
         askPrice = try container.decodeUSDecimal(forKey: .askPrice)
-        
-
-        // Handling TimeZone
-        let timeZoneString = try container.decode(String.self, forKey: .timeZone)
-        guard let timeZone = TimeZone(identifier: timeZoneString) else {
-            throw DecodingError.dataCorruptedError(forKey: .timeZone, in: container, debugDescription: "Time zone string is not a valid identifier.")
-        }
-        self.timeZone = timeZone
-        
-        // Custom decoding for the Date
-        let dateFormatter = DateFormatter()
-        dateFormatter.timeZone = timeZone
-        dateFormatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
-        let dateString = try container.decode(String.self, forKey: .lastRefreshed)
-        guard let date = dateFormatter.date(from: dateString) else {
-            throw DecodingError.dataCorruptedError(forKey: .lastRefreshed, in: container, debugDescription: "Date string does not match format expected by formatter.")
-        }
-        lastRefreshed = date
+        timeZone = try container.decode(String.self, forKey: .timeZone)
+        lastRefreshed = try container.decode(String.self, forKey: .lastRefreshed)
     }
 }

Sources/AlphaSwiftage/Public/Model/CurrencyExchangeRate.swift

@@ -14,7 +14,7 @@ public struct Symbol: Codable, Equatable {
     public let region: String
     public let marketOpen: String
     public let marketClose: String
-    public let timeZone: TimeZone
+    public let timeZone: String
     public let currency: String
     public let matchScore: Float
 
@@ -39,17 +39,11 @@ 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)
-        self.matchScore = try container.decodeUSFloat(forKey: .matchScore)
-
-        // Handling TimeZone
-        let timeZoneString = try container.decode(String.self, forKey: .timeZone)
-        guard let timeZone = TimeZone(identifier: timeZoneString) else {
-            throw DecodingError.dataCorruptedError(forKey: .timeZone, in: container, debugDescription: "Time zone string is not a valid identifier.")
-        }
-        self.timeZone = timeZone
+        matchScore = try container.decodeUSFloat(forKey: .matchScore)
+        timeZone = try container.decode(String.self, forKey: .timeZone)
     }
 
-    init(symbol: String, name: String, type: String, region: String, marketOpen: String, marketClose: String, timeZone: TimeZone, currency: String, matchScore: Float) {
+    init(symbol: String, name: String, type: String, region: String, marketOpen: String, marketClose: String, timeZone: String, currency: String, matchScore: Float) {
             self.symbol = symbol
             self.name = name
             self.type = type

Sources/AlphaSwiftage/Public/Model/Symbol.swift

@@ -40,8 +40,8 @@ final class AlphaVantageServiceTests: XCTestCase {
                                                 toCurrencyCode: target,
                                                 toCurrencyName: "Hungarian Forint",
                                                 exchangeRate: Decimal(floatLiteral: 393.5),
-                                                lastRefreshed: Date(timeIntervalSince1970: 1710096503),
-                                                timeZone: TimeZone.gmt,
+                                                lastRefreshed: "2024-03-10 18:48:23",
+                                                timeZone: "UTC",
                                                 bidPrice: Decimal(floatLiteral: 393.49),
                                                 askPrice: Decimal(floatLiteral: 393.51))
         given(response: .currencyExchangeRate, for: "https://www.alphavantage.co/query?function=CURRENCY_EXCHANGE_RATE&from_currency=\(base)&to_currency=\(target)&apikey=\(apiKey)")
@@ -62,7 +62,7 @@ final class AlphaVantageServiceTests: XCTestCase {
                                     region: "XETRA",
                                     marketOpen: "08:00",
                                     marketClose: "20:00",
-                                    timeZone: TimeZone(secondsFromGMT: 60*60*2)!,
+                                    timeZone: "UTC+02",
                                     currency: "EUR",
                                     matchScore: 0.7273)
         let service = givenService()