Allow Date to be decoded from a Double

orlandos-nl · Feb 26, 2023 · c299369 · c299369
1 parent ff36ca6
commit c299369
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/Sources/BSON/Types/Primitives.swift b/Sources/BSON/Types/Primitives.swift
@@ -157,11 +157,13 @@ fileprivate struct CustomKey: CodingKey {
 
 extension Date: BSONDataType {
     init(primitive: Primitive?) throws {
-        guard let value = primitive as? Date else {
+        if let value = primitive as? Date {
+            self = value
+        } else if let value = primitive as? Double {
+            self = Date(timeIntervalSince1970: value)
+        } else {
             throw BSONTypeConversionError(from: type(of: primitive), to: Date.self)
         }
-
-        self = value
     }
 }
 

diff --git a/Tests/BSONTests/BSONEncoderTests.swift b/Tests/BSONTests/BSONEncoderTests.swift
@@ -85,6 +85,20 @@ class BSONEncoderTests: XCTestCase {
         let codedDocument = try BSONEncoder().encode(floatArray)
         XCTAssertEqual(codedDocument["0"] as? Double, 4)
     }
+
+    func testDecodeDateFromDouble() throws {
+        let date = Date()
+        let document: Document = [
+            "date": date.timeIntervalSince1970
+        ]
+
+        struct DateContainer: Codable {
+            let date: Date
+        }
+
+        let container = try BSONDecoder().decode(DateContainer.self, from: document)
+        XCTAssertEqual(date, container.date)
+    }
 
     @available(OSX 10.12, *)
     func testEncoding() throws {