SDK-1229: Implement test for invalid dates and move date parser

Author: emmas-yoti

yoti_python_sdk/date_parser.py

@@ -1,6 +1,11 @@
 # -*- coding: utf-8 -*-
 
-import datetime
+from datetime import datetime, date
+import logging
+import re
+
+
+ERROR_PARSING_DATE = "Error parsing date"
 
 
 def from_iso_format(string):
@@ -9,4 +14,29 @@ def from_iso_format(string):
     if len(parts) != 3:
         raise ValueError
 
-    return datetime.date(parts[0], parts[1], parts[2])
+    return date(parts[0], parts[1], parts[2])
+
+
+def datetime_with_microsecond(string):
+    # Python2 does not have a way of parsing date formats.
+    # TODO Deprecate this once Python2 support is dropped.
+    time_split = re.split("[^0-9]", string)
+    parts = len(time_split)
+    if parts <= 6:
+        if logging.getLogger().propagate:
+            logging.warning(ERROR_PARSING_DATE)
+        return None
+
+    year = int(time_split[0]) if parts > 0 else 0
+    month = int(time_split[1]) if parts > 1 else 0
+    day = int(time_split[2]) if parts > 2 else 0
+    hour = int(time_split[3]) if parts > 3 else 0
+    minute = int(time_split[4]) if parts > 4 else 0
+    second = int(time_split[5]) if parts > 5 else 0
+    microsecond = int(float("0." + time_split[6]) * 1e6) if parts > 6 else 0
+    try:
+        return datetime(year, month, day, hour, minute, second, microsecond)
+    except ValueError:
+        if logging.getLogger().propagate:
+            logging.warning(ERROR_PARSING_DATE)
+        return None

yoti_python_sdk/issuance_details.py

@@ -1,32 +1,14 @@
 # -*- coding: utf-8 -*-
 
-from datetime import datetime
-import re
+from yoti_python_sdk import date_parser
 
 
 class IssuanceDetails(object):
     def __init__(self, data_entry):
         self.__token = data_entry.issuance_token.decode()
-        if (
-            data_entry.issuing_attributes.expiry_date != ""
-            and data_entry.issuing_attributes.expiry_date is not None
-        ):
-            time_split = re.split("[^0-9]", data_entry.issuing_attributes.expiry_date)
-            print("!DEBUG! %s" % time_split)
-            assert len(time_split) >= 7
-            year = int(time_split[0])
-            month = int(time_split[1])
-            day = int(time_split[2])
-            hour = int(time_split[3])
-            minute = int(time_split[4])
-            second = int(time_split[5])
-            microsecond = int(float("0." + time_split[6]) * 1e6)
-            self.__expiry_date = datetime(
-                year, month, day, hour, minute, second, microsecond
-            )
-            # TODO: Refactor time parser into own method
-        else:
-            self.__expiry_date = None
+        self.__expiry_date = date_parser.datetime_with_microsecond(
+            data_entry.issuing_attributes.expiry_date
+        )
         self.__attributes = data_entry.issuing_attributes.definitions
 
     @property

yoti_python_sdk/tests/test_issuance_details.py

@@ -4,12 +4,28 @@
 from yoti_python_sdk.tests import file_helper
 from yoti_python_sdk.issuance_details import IssuanceDetails
 from yoti_python_sdk.protobuf.share_public_api import ThirdPartyAttribute_pb2
+from yoti_python_sdk.protobuf.share_public_api import IssuingAttributes_pb2
 from datetime import datetime
+import pytest
 
 FIXTURES_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), "fixtures")
 THIRD_PARTY_ATTRIBUTE = os.path.join(FIXTURES_DIR, "testthirdpartyattribute.txt")
 
 
+def create_issuance_test_proto(issuance_token, expiry_date, *definitions):
+    issuing_attributes = IssuingAttributes_pb2.IssuingAttributes()
+    issuing_attributes.expiry_date = expiry_date
+    for s in definitions:
+        name = IssuingAttributes_pb2.Definition()
+        name.name = s
+        issuing_attributes.definitions.extend([name])
+
+    attribute = ThirdPartyAttribute_pb2.ThirdPartyAttribute()
+    attribute.issuance_token = bytes(issuance_token, "utf-8")
+    attribute.issuing_attributes.MergeFrom(issuing_attributes)
+    return attribute
+
+
 def test_should_parse_third_party_attribute_correctly():
     thirdparty_attribute_bytes = file_helper.get_file_bytes(THIRD_PARTY_ATTRIBUTE)
 
@@ -21,3 +37,14 @@ def test_should_parse_third_party_attribute_correctly():
     assert issuance_details.attributes[0].name == "com.thirdparty.id"
     assert issuance_details.token == "someIssuanceToken"
     assert issuance_details.expiry_date == datetime(2019, 10, 15, 22, 4, 5, 123000)
+
+
+@pytest.mark.parametrize(
+    "expiry_date", ["2006-13-02T15:04:05.000Z", "", "2006-13-02T15:04:05"]
+)
+def test_should_return_none_if_error_in_parsing_date(expiry_date):
+    proto = create_issuance_test_proto("someToken", expiry_date)
+
+    issuance_details = IssuanceDetails(proto)
+
+    assert issuance_details.expiry_date is None