From dbecd853d57fe199d079b33efa78e1c0aac4d210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81s=20Piza=CC=81?= <andres.piza@scrm.eu>
Date: Wed, 4 Dec 2019 15:21:31 +0100
Subject: [PATCH] Port date parsing fix from swagger-codegen

---
 .../resources/swift4/CodableHelper.mustache   | 37 ++++++++++++++++---
 1 file changed, 31 insertions(+), 6 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/swift4/CodableHelper.mustache b/modules/openapi-generator/src/main/resources/swift4/CodableHelper.mustache
index b0db903483bd..1578617aa178 100644
--- a/modules/openapi-generator/src/main/resources/swift4/CodableHelper.mustache
+++ b/modules/openapi-generator/src/main/resources/swift4/CodableHelper.mustache
@@ -9,6 +9,10 @@ import Foundation
 
 {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} typealias EncodeResult = (data: Data?, error: Error?)
 
+enum DateError: String, Error {
+case invalidDate
+}
+
 {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}open{{/nonPublicApi}} class CodableHelper {
 
     {{#nonPublicApi}}internal{{/nonPublicApi}}{{^nonPublicApi}}public{{/nonPublicApi}} static var dateformatter: DateFormatter?
@@ -22,12 +26,33 @@ import Foundation
             decoder.dateDecodingStrategy = .formatted(df)
         } else {
             decoder.dataDecodingStrategy = .base64
-            let formatter = DateFormatter()
-            formatter.calendar = Calendar(identifier: .iso8601)
-            formatter.locale = Locale(identifier: "en_US_POSIX")
-            formatter.timeZone = TimeZone(secondsFromGMT: 0)
-            formatter.dateFormat = Configuration.dateFormat
-            decoder.dateDecodingStrategy = .formatted(formatter)
+            decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in
+                let container = try decoder.singleValueContainer()
+                let dateStr = try container.decode(String.self)
+
+                let formatters = [
+                    "yyyy-MM-dd",
+                    "yyyy-MM-dd'T'HH:mm:ssZZZZZ",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ",
+                    "yyyy-MM-dd'T'HH:mm:ss'Z'",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSS",
+                    "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'",
+                    "yyyy-MM-dd HH:mm:ss"
+                    ].map { (format: String) -> DateFormatter in
+                        let formatter = DateFormatter()
+                        formatter.locale = Locale(identifier: "en_US_POSIX")
+                        formatter.dateFormat = format
+                        return formatter
+                }
+
+                for formatter in formatters {
+                    if let date = formatter.date(from: dateStr) {
+                        return date
+                    }
+                }
+
+                throw DateError.invalidDate
+            })
         }
 
         do {