set .dateDecodingStrategy

mironal · mironal · commit 10d6b7eee2fc · 2022-07-16T15:56:09.000+09:00
diff --git a/Sources/TwitterAPIKit/Extensions/Concurrency.swift b/Sources/TwitterAPIKit/Extensions/Concurrency.swift
@@ -45,7 +45,7 @@ extension TwitterAPISessionJSONTask {
         }
     }
 
-    public func responseDecodable<T: Decodable>(type: T.Type) async -> TwitterAPIResponse<T> {
+    public func responseDecodable<T: Decodable>(type: T.Type, decoder: JSONDecoder = TwitterAPIClient.defaultJSONDecoder) async -> TwitterAPIResponse<T> {
         return await withTaskCancellationHandler(
             operation: {
                 return await withCheckedContinuation { c in
diff --git a/Sources/TwitterAPIKit/TwitterAPIClient.swift b/Sources/TwitterAPIKit/TwitterAPIClient.swift
@@ -5,6 +5,32 @@ open class TwitterAPIClient {
     public static var defaultJSONDecoder: JSONDecoder = {
         let decoder = JSONDecoder()
         decoder.keyDecodingStrategy = .convertFromSnakeCase
+
+        // for v1
+        let dateFormatterV1 = DateFormatter()
+        dateFormatterV1.locale = Locale(identifier: "en_US_POSIX")
+        dateFormatterV1.dateFormat = "EEE MMM dd HH:mm:ss Z yyyy"
+
+        // for v2
+        let dateFormatterV2 = DateFormatter()
+        dateFormatterV2.locale = Locale(identifier: "en_US_POSIX")
+        dateFormatterV2.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZ"
+
+        decoder.dateDecodingStrategy = .custom { decoder -> Date in
+            let container = try decoder.singleValueContainer()
+            let dateStr = try container.decode(String.self)
+
+            if let date = dateFormatterV1.date(from: dateStr) {
+                return date
+            }
+
+            if let date = dateFormatterV2.date(from: dateStr) {
+                return date
+            }
+            throw DecodingError.dataCorrupted(
+                .init(codingPath: decoder.codingPath, debugDescription: "Unexpected date format: \(dateStr)"))
+        }
+
         return decoder
     }()
 
diff --git a/Tests/TwitterAPIKitTests/TwitterAPIClientTests.swift b/Tests/TwitterAPIKitTests/TwitterAPIClientTests.swift
@@ -0,0 +1,21 @@
+import TwitterAPIKit
+import XCTest
+
+class TwitterAPIClientTests: XCTestCase {
+
+    override func setUpWithError() throws {
+    }
+
+    override func tearDownWithError() throws {
+    }
+
+    func testJSONDecoder() throws {
+
+        let decoder = TwitterAPIClient.defaultJSONDecoder
+
+        let dateV1 = try decoder.decode(Date.self, from: Data("\"Sun Jul 03 04:32:05 +0000 2022\"".utf8))
+        let dateV2 = try decoder.decode(Date.self, from: Data("\"2022-07-03T04:32:05.000Z\"".utf8))
+        XCTAssertEqual(dateV1, dateV2)
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ extension TwitterAPISessionJSONTask {`
`45`	`45`	`}`
`46`	`46`	`}`
`47`	`47`
`48`		`- public func responseDecodable<T: Decodable>(type: T.Type) async -> TwitterAPIResponse<T> {`
	`48`	`+ public func responseDecodable<T: Decodable>(type: T.Type, decoder: JSONDecoder = TwitterAPIClient.defaultJSONDecoder) async -> TwitterAPIResponse<T> {`
`49`	`49`	`return await withTaskCancellationHandler(`
`50`	`50`	`operation: {`
`51`	`51`	`return await withCheckedContinuation { c in`