helper should handle milliseconds <= 6 digits #85

isogeo · Aug 22, 2019 · 9c513fe · 9c513fe
1 parent e0b2285
commit 9c513fe
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/isogeo_pysdk/utils.py b/isogeo_pysdk/utils.py
@@ -845,7 +845,7 @@ def hlpr_date_as_datetime(cls, in_date: str) -> datetime:
             out_date = datetime.strptime(
                 in_date, _dtm_data
             )  # events datetimes (=dates)
-        elif len(in_date) == 32 and "." in in_date:
+        elif len(in_date) > 25 and len(in_date) <= 32 and "." in in_date:
             out_date = datetime.strptime(
                 in_date, _dtm_metadata
             )  # metadata timestamps with 6 milliseconds
@@ -856,7 +856,7 @@ def hlpr_date_as_datetime(cls, in_date: str) -> datetime:
             )
         else:
             raise TypeError(
-                "This format of timestamps is not recognized: {}.Try by yourself!".format(
+                "This format of timestamps is not recognized: {}. Try by yourself!".format(
                     in_date
                 )
             )

diff --git a/tests/test_metadatas.py b/tests/test_metadatas.py
@@ -32,13 +32,15 @@
 
 
 # module target
-from isogeo_pysdk import Isogeo, Metadata, MetadataSearch
+from isogeo_pysdk import Isogeo, IsogeoUtils, Metadata, MetadataSearch
 
 
 # #############################################################################
 # ######## Globals #################
 # ##################################
 
+utils = IsogeoUtils()
+
 if Path("dev.env").exists():
     load_dotenv("dev.env", override=True)
 
@@ -146,6 +148,16 @@ def test_metadatas_in_search_results(self):
             self.assertEqual(md.get("created"), metadata.created)
             self.assertEqual(md.get("modified"), metadata.modified)
 
+            # -- HELPERS
+            # dates
+            md_date_creation = utils.hlpr_date_as_datetime(metadata._created)
+            self.assertEqual(int(metadata._created[:4]), md_date_creation.year)
+            md_date_modification = utils.hlpr_date_as_datetime(metadata._modified)
+            self.assertEqual(int(metadata._modified[:4]), md_date_modification.year)
+            if metadata.created:
+                ds_date_creation = utils.hlpr_date_as_datetime(metadata.created)
+                self.assertEqual(int(metadata.created[:4]), ds_date_creation.year)
+
     # def test_search_specific_mds_bad(self):
     #     """Searches filtering on specific metadata."""
     #     # get random metadata within a small search

diff --git a/tests/test_utils.py b/tests/test_utils.py
@@ -138,12 +138,10 @@ def test_set_base_url_bad_parameter(self):
         """Raise error if platform parameter is bad."""
         with self.assertRaises(ValueError):
             self.utils.set_base_url(platform="skynet")
-        self.utils.set_base_url(platform=environ.get("ISOGEO_PLATFORM", "qa"))
 
     # -- URLs Builders - edit (app) ------------------------------------------
     def test_get_edit_url_ok(self):
         """Test URL builder for edition link on APP"""
-        self.utils.set_base_url(platform=environ.get("ISOGEO_PLATFORM", "qa"))
         url = self.utils.get_edit_url(
             md_id="0269803d50c446b09f5060ef7fe3e22b",
             md_type="vector-dataset",
@@ -368,6 +366,13 @@ def test_helper_datetimes(self):
         self.assertIsInstance(md_date, datetime)
         self.assertEqual(md_date.year, 2019)
 
+        # metadata timestamps str - 6 milliseconds
+        md_date_lesser = self.utils.hlpr_date_as_datetime(
+            "2017-12-01T16:36:28.74561+00:00"
+        )
+        self.assertIsInstance(md_date_lesser, datetime)
+        self.assertEqual(md_date_lesser.year, 2017)
+
         # metadata timestamps str - more than 6 milliseconds
         md_date_larger = self.utils.hlpr_date_as_datetime(
             "2019-06-13T16:21:38.1917618+00:00"