From 7ffed5ef330e87a9b2ed6fc14d3d8c7433e88ed2 Mon Sep 17 00:00:00 2001 From: Graham Hukill Date: Fri, 25 Aug 2023 14:37:32 -0400 Subject: [PATCH 1/2] update dependencies --- Pipfile.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Pipfile.lock b/Pipfile.lock index 36dc669..64cdede 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -34,18 +34,18 @@ }, "boto3": { "hashes": [ - "sha256:2761f3249fe25c3ec1a8cd6b95fca2317747503e6f1d127daf6a3d2cdeb25680", - "sha256:dc6d72470f6d8926b8cdc10ee7708d7ccdd36d6313c7aa298bc1cf6bedb8921e" + "sha256:2ccbea42fe4cbd22a8ba1e90a37ac65f05c1932e63432e429fb7158d8255bbc0", + "sha256:4713a4e69120db5f358f4d378459fb4ea04be98664a0908088f6e04ab49d2583" ], - "version": "==1.28.31" + "version": "==1.28.34" }, "botocore": { "hashes": [ - "sha256:1eef14ae98e8662e43f7cf6d993c732793def02644e2d489c5171d3b9269e900", - "sha256:950a49c5286fe1f6d72cfbe2910b9ddbdfbb907975ddc41cf38ac9709b4d1291" + "sha256:23ba9e3a8b4c0e5966bbe2db62edb27f61e16b846f153f22aefda7b3c05c7942", + "sha256:456ef8eb458db35b8643eb10e652ed50750d13e5af431593471b2c705c34b5db" ], "markers": "python_version >= '3.7'", - "version": "==1.31.31" + "version": "==1.31.34" }, "certifi": { "hashes": [ From 9c2843122a876ec9174a0c52dd69b0629c1c1126 Mon Sep 17 00:00:00 2001 From: Graham Hukill Date: Fri, 25 Aug 2023 14:37:40 -0400 Subject: [PATCH 2/2] Update Springshare OAI sources date handling Why these changes are being introduced: * Setting date.kind=None was throwing errors in TIMDEX api How this addresses that need: * Determined Springshare dates were created, sets to "Created" * Sets generic OAI transformer to "Unknown", though should not be used directly Side effects of this change: * All Springshare records will need to be rerun to get updated date.kind properties. Relevant ticket(s): * https://mitlibraries.atlassian.net/browse/TIMX-241 --- tests/test_oai_dc.py | 2 +- tests/test_springshare.py | 8 +++++--- transmogrifier/sources/oaidc.py | 2 +- transmogrifier/sources/springshare.py | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/test_oai_dc.py b/tests/test_oai_dc.py index dbf8bdc..a1b98a8 100644 --- a/tests/test_oai_dc.py +++ b/tests/test_oai_dc.py @@ -74,5 +74,5 @@ def test_oaidc_generic_date(): transformer_instance = OaiDc("libguides", input_records) xml = next(transformer_instance.input_records) assert transformer_instance.get_dates("test_source_record_id", xml) == [ - timdex.Date(kind=None, note=None, range=None, value="2008-06-19T17:55:27") + timdex.Date(kind="Unknown", note=None, range=None, value="2008-06-19T17:55:27") ] diff --git a/tests/test_springshare.py b/tests/test_springshare.py index 1635070..ba1c63c 100644 --- a/tests/test_springshare.py +++ b/tests/test_springshare.py @@ -60,7 +60,9 @@ def test_springshare_get_dates_valid(): for xml in transformer_instance.input_records: date_field_value = transformer_instance.get_dates("test_get_dates", xml) assert date_field_value == [ - timdex.Date(kind=None, note=None, range=None, value="2000-01-01T00:00:00") + timdex.Date( + kind="Created", note=None, range=None, value="2000-01-01T00:00:00" + ) ] @@ -106,7 +108,7 @@ def test_libguide_transform_with_all_fields_transforms_correctly(): ) ], dates=[ - timdex.Date(value="2008-06-19T17:55:27"), + timdex.Date(value="2008-06-19T17:55:27", kind="Created"), ], format="electronic resource", identifiers=[ @@ -160,7 +162,7 @@ def test_research_databases_transform_with_all_fields_transforms_correctly(): "researchdatabases. https://libguides.mit.edu/llba", content_type=["researchdatabases"], dates=[ - timdex.Date(value="2022-01-28T22:15:37"), + timdex.Date(value="2022-01-28T22:15:37", kind="Created"), ], format="electronic resource", identifiers=[ diff --git a/transmogrifier/sources/oaidc.py b/transmogrifier/sources/oaidc.py index df606c6..6453e58 100644 --- a/transmogrifier/sources/oaidc.py +++ b/transmogrifier/sources/oaidc.py @@ -137,7 +137,7 @@ def get_dates(self, source_record_id: str, xml: Tag) -> Optional[List[timdex.Dat date_str, source_record_id, ): - dates.append(timdex.Date(value=date_str)) + dates.append(timdex.Date(value=date_str, kind="Unknown")) return dates or None def get_links(self, source_record_id: str, xml: Tag) -> Optional[List[timdex.Link]]: diff --git a/transmogrifier/sources/springshare.py b/transmogrifier/sources/springshare.py index f4dc7a7..9770e04 100644 --- a/transmogrifier/sources/springshare.py +++ b/transmogrifier/sources/springshare.py @@ -51,7 +51,7 @@ def get_dates(self, source_record_id: str, xml: Tag) -> Optional[List[timdex.Dat date_iso_str, source_record_id, ): - dates.append(timdex.Date(value=date_iso_str, kind=None)) + dates.append(timdex.Date(value=date_iso_str, kind="Created")) return dates or None def get_links(self, source_record_id: str, xml: Tag) -> Optional[List[timdex.Link]]: