JSON Schema fixes + Supporting parsing dates/date-times from qube-con…

…fig.json (#450)
ONSdigital · Apr 22, 2022 · e0b5b59 · e0b5b59
1 parent 7633396
commit e0b5b59
Show file tree

Hide file tree

Showing 17 changed files with 697 additions and 615 deletions.
diff --git a/csvcubed-devtools/poetry.lock b/csvcubed-devtools/poetry.lock
diff --git a/csvcubed-models/csvcubedmodels/dataclassbase.py b/csvcubed-models/csvcubedmodels/dataclassbase.py
@@ -13,6 +13,8 @@
 from dataclasses import Field, _MISSING_TYPE, fields, asdict, dataclass
 from typing import List, Any, get_type_hints, Dict, Set, Type
 
+from dateutil import parser
+
 
 class DataClassFromDictValueError(ValueError):
     ...
@@ -198,8 +200,8 @@ def _get_value_for_typed_field(
         elif isinstance(val, str) and issubclass(typing_hint, datetime.date):
             # ISO-8601 conversion.
             if issubclass(typing_hint, datetime.datetime):
-                return datetime.datetime.fromisoformat(val)
-            return datetime.date.fromisoformat(val)
+                return parser.isoparse(val)
+            return parser.isoparse(val).date()
 
         raise DataClassFromDictValueError(
             f"Could not match {val} with static type {typing_hint}"