include no iso extended format

osrufung · Jan 24, 2021 · ed83cfd · ed83cfd
1 parent c588ac7
commit ed83cfd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/Sources/SafeCodable/SafeDate.swift b/Sources/SafeCodable/SafeDate.swift
@@ -13,7 +13,13 @@ extension Date {
         formatter.dateFormat = "yyyy-MM-dd"
         return formatter
     }()
-    static func getDateFromString(_ dateString: String, includeFractions: Bool = false) -> Date? {
+    static let longFormatter: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd HH:mm:ss"
+        return formatter
+    }()
+
+    static func getDateFromString(_ from: String, includeFractions: Bool = false) -> Date? {
         let formatter = ISO8601DateFormatter()
         var options:ISO8601DateFormatter.Options = [.withInternetDateTime,
                                    .withDashSeparatorInDate,
@@ -23,8 +29,8 @@ extension Date {
             options.insert(.withFractionalSeconds)
         }
         formatter.formatOptions = options
-        guard let date = formatter.date(from: dateString) else {
-            return shortFormatter.date(from: dateString)
+        guard let date = formatter.date(from: from) else {
+            return shortFormatter.date(from: from) ?? longFormatter.date(from: from)
         }
         return date
     }

diff --git a/Tests/SafeCodableTests/SafeCodableTests.swift b/Tests/SafeCodableTests/SafeCodableTests.swift
@@ -31,7 +31,8 @@ final class SafeCodableTests: XCTestCase {
         [
             { "value" : "2015-08-29T11:22:09Z"},
             { "value" : "2015-08-29T11:22:09.129Z"},
-            { "value" : "2020-11-27"}
+            { "value" : "2020-11-27"},
+            { "value" : "2019-08-03 23:59:59"}
 
         ]
         """.data(using: .utf8)
@@ -42,7 +43,7 @@ final class SafeCodableTests: XCTestCase {
         }
 
         let dates = try? decoder.decode([DateContainer].self, from: rawDates!)
-        XCTAssertEqual(dates?.count, 3)
+        XCTAssertEqual(dates?.count, 4)
     }
 
     static var allTests = [