Fixed some bugs

henrik-dmg · Apr 13, 2020 · 465b5ee · 465b5ee
1 parent fd53850
commit 465b5ee
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 25 deletions.
diff --git a/Sources/HPOpenWeather/Response/CurrentWeather.swift b/Sources/HPOpenWeather/Response/CurrentWeather.swift
@@ -73,17 +73,20 @@ public struct CurrentWeather: BasicWeatherResponse, SunResponse {
 
         try container.encode(temperature.actual, forKey: .temperature)
         try container.encode(temperature.feelsLike, forKey: .feelsLike)
-        try container.encode(snow, forKey: .snow)
-        try container.encode(rain, forKey: .rain)
         try container.encode(timestamp, forKey: .timestamp)
         try container.encode(pressure, forKey: .pressure)
         try container.encode(humidity, forKey: .humidity)
-        try container.encode(dewPoint, forKey: .uvIndex)
-        try container.encode(visibility, forKey: .cloudCoverage)
+        try container.encode(dewPoint, forKey: .dewPoint)
+        try container.encode(uvIndex, forKey: .uvIndex)
+        try container.encode(visibility, forKey: .visibility)
+        try container.encode(cloudCoverage, forKey: .cloudCoverage)
+        try container.encode(rain, forKey: .rain)
+        try container.encode(snow, forKey: .snow)
+
         try container.encode(wind.speed, forKey: .windSpeed)
         try container.encode(wind.degrees, forKey: .windDirection)
         try container.encode(wind.gust, forKey: .windGust)
-        try container.encode(sun.sunset, forKey: .sunrise)
+        try container.encode(sun.sunset, forKey: .sunset)
         try container.encode(sun.sunrise, forKey: .sunrise)
         try container.encode(weatherArray, forKey: .weatherArray)
     }

diff --git a/Sources/HPOpenWeather/Response/DailyForecast.swift b/Sources/HPOpenWeather/Response/DailyForecast.swift
@@ -80,12 +80,15 @@ public struct DailyForecast: BasicWeatherResponse, SunResponse {
         try container.encode(timestamp, forKey: .timestamp)
         try container.encode(pressure, forKey: .pressure)
         try container.encode(humidity, forKey: .humidity)
-        try container.encode(dewPoint, forKey: .uvIndex)
-        try container.encode(visibility, forKey: .cloudCoverage)
+        try container.encode(dewPoint, forKey: .dewPoint)
+        try container.encode(uvIndex, forKey: .uvIndex)
+        try container.encode(visibility, forKey: .visibility)
+        try container.encode(cloudCoverage, forKey: .cloudCoverage)
+
         try container.encode(wind.speed, forKey: .windSpeed)
         try container.encode(wind.degrees, forKey: .windDirection)
         try container.encode(wind.gust, forKey: .windGust)
-        try container.encode(sun.sunset, forKey: .sunrise)
+        try container.encode(sun.sunset, forKey: .sunset)
         try container.encode(sun.sunrise, forKey: .sunrise)
         try container.encode(weatherArray, forKey: .weatherArray)
     }

diff --git a/Sources/HPOpenWeather/Response/HourlyForecast.swift b/Sources/HPOpenWeather/Response/HourlyForecast.swift
@@ -21,7 +21,7 @@ public struct HourlyForecast: BasicWeatherResponse {
     }
 
     enum CodingKeys: String, CodingKey {
-        case temp
+        case temperature = "temp"
         case feelsLike = "feels_like"
         case snow
         case rain
@@ -52,7 +52,7 @@ public struct HourlyForecast: BasicWeatherResponse {
         visibility = try container.decodeIfPresent(Double.self, forKey: .visibility)
         cloudCoverage = try container.decodeIfPresent(Double.self, forKey: .cloudCoverage)
 
-        let temp = try container.decode(Double.self, forKey: .temp)
+        let temp = try container.decode(Double.self, forKey: .temperature)
         let feelsLike = try container.decode(Double.self, forKey: .feelsLike)
         temperature = Temperature(actual: temp, feelsLike: feelsLike)
 
@@ -65,15 +65,18 @@ public struct HourlyForecast: BasicWeatherResponse {
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
 
-        try container.encode(temperature.actual, forKey: .temp)
+        try container.encode(temperature.actual, forKey: .temperature)
         try container.encode(temperature.feelsLike, forKey: .feelsLike)
-        try container.encode(snow, forKey: .snow)
-        try container.encode(rain, forKey: .rain)
         try container.encode(timestamp, forKey: .timestamp)
         try container.encode(pressure, forKey: .pressure)
         try container.encode(humidity, forKey: .humidity)
-        try container.encode(dewPoint, forKey: .uvIndex)
-        try container.encode(visibility, forKey: .cloudCoverage)
+        try container.encode(dewPoint, forKey: .dewPoint)
+        try container.encode(uvIndex, forKey: .uvIndex)
+        try container.encode(visibility, forKey: .visibility)
+        try container.encode(cloudCoverage, forKey: .cloudCoverage)
+        try container.encode(rain, forKey: .rain)
+        try container.encode(snow, forKey: .snow)
+
         try container.encode(wind.speed, forKey: .windSpeed)
         try container.encode(wind.degrees, forKey: .windDirection)
         try container.encode(wind.gust, forKey: .windGust)

diff --git a/Sources/HPOpenWeather/Response/OpenWeatherResponse.swift b/Sources/HPOpenWeather/Response/OpenWeatherResponse.swift
@@ -1,6 +1,6 @@
 import Foundation
 
-public struct OpenWeatherResponse: Codable {
+public struct OpenWeatherResponse: Codable, Equatable, Hashable {
 
     public let timezone: TimeZone
     public let current: CurrentWeather

diff --git a/Tests/HPOpenWeatherTests/HPOpenWeatherTests.swift b/Tests/HPOpenWeatherTests/HPOpenWeatherTests.swift
@@ -7,7 +7,7 @@ final class HPOpenWeatherTests: XCTestCase {
     override class func setUp() {
         super.setUp()
 
-        HPOpenWeather.shared.apiKey = "fa0355d40a89af27650111cc80667159"
+        HPOpenWeather.shared.apiKey = TestSecret.apiKey
     }
 
     override func tearDown() {
@@ -22,17 +22,31 @@ final class HPOpenWeatherTests: XCTestCase {
 
         HPOpenWeather.shared.requestWeather(request) { result in
             exp.fulfill()
-            switch result {
-            case .success(let response):
-                print(response.hourlyForecasts.first)
-                print(response.current.condition)
-            case .failure(let error as NSError):
-                print(error)
-                XCTFail(error.localizedDescription)
-            }
+            XCTAssertResult(result)
         }
 
         wait(for: [exp], timeout: 10)
     }
 
 }
+
+extension Encodable {
+
+    func encodeAndDecode<T: Decodable>(type: T.Type) throws -> T {
+        let jsonEncoder = JSONEncoder()
+        jsonEncoder.dateEncodingStrategy = .secondsSince1970
+        let encodedData = try jsonEncoder.encode(self)
+
+        let jsonDecoder = JSONDecoder()
+        jsonDecoder.dateDecodingStrategy = .secondsSince1970
+        return try jsonDecoder.decode(type.self, from: encodedData)
+    }
+
+}
+
+/// Asserts that the result is not a failure
+func XCTAssertResult<T, E: Error>(_ result: Result<T, E>) {
+    if case .failure(let error) = result {
+        XCTFail(error.localizedDescription)
+    }
+}
diff --git a/Tests/HPOpenWeatherTests/TestSecret.swift b/Tests/HPOpenWeatherTests/TestSecret.swift
@@ -0,0 +1,7 @@
+import Foundation
+
+struct TestSecret {
+
+    static let apiKey: String! = ProcessInfo.processInfo.environment["API_KEY"]
+
+}