Merge pull request #67 from datacite/issue-66

Issue 66

Pipfile

@@ -11,6 +11,7 @@ factory-boy = "*"
 termcolor = "*"
 python-dotenv = "*"
 pytest-env = "*"
+pytest-sugar = "*"
 
 [packages]
 flask = "*"

tests/integration/fixtures/datacite_api_doi_dateproblems.json

@@ -0,0 +1,177 @@
+{
+  "data": {
+    "id": "10.5438/prvv-nv23",
+    "type": "dois",
+    "attributes": {
+      "doi": "10.5438/prvv-nv23",
+      "prefix": "10.5438",
+      "suffix": "prvv-nv23",
+      "identifiers": [
+        {
+          "identifier": "https://doi.org/10.5438/prvv-nv23",
+          "identifierType": "DOI"
+        }
+      ],
+      "creators": [
+        {
+          "name": "Fenner, Martin",
+          "nameType": "Personal",
+          "givenName": "Martin",
+          "familyName": "Fenner",
+          "affiliation": ["DataCite"],
+          "nameIdentifiers": [
+            {
+              "schemeUri": "https://orcid.org",
+              "nameIdentifier": "https://orcid.org/0000-0003-1419-2405",
+              "nameIdentifierScheme": "ORCID"
+            }
+          ]
+        },
+        {
+          "name": "Hallett, Richard",
+          "nameType": "Personal",
+          "givenName": "Richard",
+          "familyName": "Hallett",
+          "affiliation": ["DataCite"],
+          "nameIdentifiers": [
+            {
+              "schemeUri": "https://orcid.org",
+              "nameIdentifier": "https://orcid.org/0000-0002-8599-0773",
+              "nameIdentifierScheme": "ORCID"
+            }
+          ]
+        }
+      ],
+      "titles": [
+        {
+          "title": "Welcome to the DataCite Team, Richard!"
+        }
+      ],
+      "publisher": "DataCite",
+      "container": {},
+      "publicationYear": 2018,
+      "subjects": [
+        {
+          "subject": "datacite"
+        }
+      ],
+      "contributors": [],
+      "dates": [
+        {
+          "date": null,
+          "dateType": null
+        },
+        {
+          "date": "2018-01-18",
+          "dateType": "Updated"
+        }
+      ],
+      "language": null,
+      "types": {
+        "ris": "GEN",
+        "bibtex": "article",
+        "citeproc": "post-weblog",
+        "schemaOrg": "BlogPosting",
+        "resourceTypeGeneral": "Text"
+      },
+      "relatedIdentifiers": [
+        {
+          "relationType": "IsPartOf",
+          "relatedIdentifier": "10.5438/0000-00ss",
+          "resourceTypeGeneral": "Text",
+          "relatedIdentifierType": "DOI"
+        }
+      ],
+      "sizes": [],
+      "formats": null,
+      "version": "1.0",
+      "rightsList": [
+        {
+          "rights": null,
+          "rightsUri": null
+        }
+      ],
+      "descriptions": [
+        {
+          "lang": null,
+          "description": "DataCite is pleased to welcome Richard Hallett to our team. Richard joined DataCite as application developer in December. Get to know him better via this interview. Richard Hallett Can you tell us a little bit about what you did before you started...",
+          "descriptionType": "Abstract"
+        }
+      ],
+      "geoLocations": [{}],
+      "fundingReferences": null,
+      "xml": "PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHJlc291cmNlIHhtbG5zOnhzaT0iaHR0cDovL3d3dy53My5vcmcvMjAwMS9YTUxTY2hlbWEtaW5zdGFuY2UiIHhtbG5zPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCIgeHNpOnNjaGVtYUxvY2F0aW9uPSJodHRwOi8vZGF0YWNpdGUub3JnL3NjaGVtYS9rZXJuZWwtNCBodHRwOi8vc2NoZW1hLmRhdGFjaXRlLm9yZy9tZXRhL2tlcm5lbC00L21ldGFkYXRhLnhzZCI+CiAgPGlkZW50aWZpZXIgaWRlbnRpZmllclR5cGU9IkRPSSI+MTAuNTQzOC9QUlZWLU5WMjM8L2lkZW50aWZpZXI+CiAgPGNyZWF0b3JzPgogICAgPGNyZWF0b3I+CiAgICAgIDxjcmVhdG9yTmFtZSBuYW1lVHlwZT0iUGVyc29uYWwiPkZlbm5lciwgTWFydGluPC9jcmVhdG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5NYXJ0aW48L2dpdmVuTmFtZT4KICAgICAgPGZhbWlseU5hbWU+RmVubmVyPC9mYW1pbHlOYW1lPgogICAgICA8bmFtZUlkZW50aWZpZXIgbmFtZUlkZW50aWZpZXJTY2hlbWU9Ik9SQ0lEIiBzY2hlbWVVUkk9Imh0dHBzOi8vb3JjaWQub3JnIj5odHRwczovL29yY2lkLm9yZy8wMDAwLTAwMDMtMTQxOS0yNDA1PC9uYW1lSWRlbnRpZmllcj4KICAgICAgPGFmZmlsaWF0aW9uIGFmZmlsaWF0aW9uSWRlbnRpZmllcj0iaHR0cHM6Ly9yb3Iub3JnLzA0d3huc2o4MSIgYWZmaWxpYXRpb25JZGVudGlmaWVyU2NoZW1lPSJST1IiPkRhdGFDaXRlPC9hZmZpbGlhdGlvbj4KICAgIDwvY3JlYXRvcj4KICAgIDxjcmVhdG9yPgogICAgICA8Y3JlYXRvck5hbWUgbmFtZVR5cGU9IlBlcnNvbmFsIj5IYWxsZXR0LCBSaWNoYXJkPC9jcmVhdG9yTmFtZT4KICAgICAgPGdpdmVuTmFtZT5SaWNoYXJkPC9naXZlbk5hbWU+CiAgICAgIDxmYW1pbHlOYW1lPkhhbGxldHQ8L2ZhbWlseU5hbWU+CiAgICAgIDxuYW1lSWRlbnRpZmllciBuYW1lSWRlbnRpZmllclNjaGVtZT0iT1JDSUQiIHNjaGVtZVVSST0iaHR0cHM6Ly9vcmNpZC5vcmciPmh0dHBzOi8vb3JjaWQub3JnLzAwMDAtMDAwMi04NTk5LTA3NzM8L25hbWVJZGVudGlmaWVyPgogICAgICA8YWZmaWxpYXRpb24gYWZmaWxpYXRpb25JZGVudGlmaWVyPSJodHRwczovL3Jvci5vcmcvMDR3eG5zajgxIiBhZmZpbGlhdGlvbklkZW50aWZpZXJTY2hlbWU9IlJPUiI+RGF0YUNpdGU8L2FmZmlsaWF0aW9uPgogICAgPC9jcmVhdG9yPgogIDwvY3JlYXRvcnM+CiAgPHRpdGxlcz4KICAgIDx0aXRsZT5XZWxjb21lIHRvIHRoZSBEYXRhQ2l0ZSBUZWFtLCBSaWNoYXJkITwvdGl0bGU+CiAgPC90aXRsZXM+CiAgPHB1Ymxpc2hlcj5EYXRhQ2l0ZTwvcHVibGlzaGVyPgogIDxwdWJsaWNhdGlvblllYXI+MjAxODwvcHVibGljYXRpb25ZZWFyPgogIDxyZXNvdXJjZVR5cGUgcmVzb3VyY2VUeXBlR2VuZXJhbD0iVGV4dCI+QmxvZ1Bvc3Rpbmc8L3Jlc291cmNlVHlwZT4KICA8c3ViamVjdHM+CiAgICA8c3ViamVjdD5kYXRhY2l0ZTwvc3ViamVjdD4KICA8L3N1YmplY3RzPgogIDxkYXRlcz4KICAgIDxkYXRlIGRhdGVUeXBlPSJJc3N1ZWQiPjIwMTgtMDEtMTg8L2RhdGU+CiAgICA8ZGF0ZSBkYXRlVHlwZT0iQ3JlYXRlZCI+MjAxOC0wMS0xODwvZGF0ZT4KICAgIDxkYXRlIGRhdGVUeXBlPSJVcGRhdGVkIj4yMDE4LTAxLTE4PC9kYXRlPgogIDwvZGF0ZXM+CiAgPHJlbGF0ZWRJZGVudGlmaWVycz4KICAgIDxyZWxhdGVkSWRlbnRpZmllciByZWxhdGVkSWRlbnRpZmllclR5cGU9IkRPSSIgcmVsYXRpb25UeXBlPSJJc1BhcnRPZiIgcmVzb3VyY2VUeXBlR2VuZXJhbD0iVGV4dCI+MTAuNTQzOC8wMDAwLTAwc3M8L3JlbGF0ZWRJZGVudGlmaWVyPgogIDwvcmVsYXRlZElkZW50aWZpZXJzPgogIDx2ZXJzaW9uPjEuMDwvdmVyc2lvbj4KICA8cmlnaHRzTGlzdD4KICAgIDxyaWdodHMvPgogIDwvcmlnaHRzTGlzdD4KICA8ZGVzY3JpcHRpb25zPgogICAgPGRlc2NyaXB0aW9uIGRlc2NyaXB0aW9uVHlwZT0iQWJzdHJhY3QiPkRhdGFDaXRlIGlzIHBsZWFzZWQgdG8gd2VsY29tZSBSaWNoYXJkIEhhbGxldHQgdG8gb3VyIHRlYW0uIFJpY2hhcmQgam9pbmVkIERhdGFDaXRlIGFzIGFwcGxpY2F0aW9uIGRldmVsb3BlciBpbiBEZWNlbWJlci4gR2V0IHRvIGtub3cgaGltIGJldHRlciB2aWEgdGhpcyBpbnRlcnZpZXcuIFJpY2hhcmQgSGFsbGV0dCBDYW4geW91IHRlbGwgdXMgYSBsaXR0bGUgYml0IGFib3V0IHdoYXQgeW91IGRpZCBiZWZvcmUgeW91IHN0YXJ0ZWQuLi48L2Rlc2NyaXB0aW9uPgogIDwvZGVzY3JpcHRpb25zPgogIDxnZW9Mb2NhdGlvbnM+CiAgICA8Z2VvTG9jYXRpb24vPgogIDwvZ2VvTG9jYXRpb25zPgo8L3Jlc291cmNlPgo=",
+      "url": "https://blog.datacite.org/welcome-to-team-richard/",
+      "contentUrl": null,
+      "metadataVersion": 5,
+      "schemaVersion": null,
+      "source": null,
+      "isActive": true,
+      "state": "findable",
+      "reason": null,
+      "created": "2018-03-17T06:33:00.000Z",
+      "registered": "2018-10-17T05:48:57.000Z",
+      "published": "2018",
+      "updated": "2019-08-10T08:02:12.000Z"
+    },
+    "relationships": {
+      "client": {
+        "data": {
+          "id": "datacite.blog",
+          "type": "clients"
+        }
+      },
+      "provider": {
+        "data": {
+          "id": "dryad",
+          "type": "providers"
+        }
+      },
+      "media": {
+        "data": {
+          "id": "10.5438/prvv-nv23",
+          "type": "media"
+        }
+      }
+    }
+  },
+  "included": [
+    {
+      "id": "datacite.blog",
+      "type": "clients",
+      "attributes": {
+        "name": "DataCite Blog",
+        "symbol": "DATACITE.BLOG",
+        "year": 2019,
+        "contactEmail": "[email protected]",
+        "alternateName": null,
+        "description": null,
+        "language": null,
+        "clientType": "repository",
+        "domains": "*",
+        "issn": null,
+        "url": "https://blog.datacite.org",
+        "created": "2019-01-02T14:27:23.000Z",
+        "updated": "2019-01-02T17:22:42.000Z",
+        "isActive": true,
+        "hasPassword": true
+      },
+      "relationships": {
+        "provider": {
+          "data": {
+            "id": "datacite",
+            "type": "providers"
+          }
+        },
+        "prefixes": {
+          "data": [
+            {
+              "id": "10.5438",
+              "type": "prefixes"
+            }
+          ]
+        }
+      }
+    }
+  ]
+}

tests/integration/test_catalogs.py

@@ -0,0 +1,17 @@
+import json
+from viringo import catalogs
+from viringo.services import datacite
+def test_build_metadata_null_dates(mocker):
+    mocked_requests_get = mocker.patch('viringo.services.datacite.requests.get')
+    with open('tests/integration/fixtures/datacite_api_doi_dateproblems.json') as json_file:
+        data = json.load(json_file)
+    mocked_requests_get.return_value.status_code = 200
+    mocked_requests_get.return_value.json.return_value = data
+
+    result = datacite.get_metadata("10.5438/prvv-nv23")
+
+    oai_server  = catalogs.DataCiteOAIServer()
+    meta = oai_server.build_metadata_map(
+        result
+    )
+    assert meta.get('date') == ['2018', 'Updated: 2018-01-18']

viringo/catalogs.py

@@ -240,8 +240,10 @@ def build_metadata_map(self, result):
         dates = []
         if result.publication_year:
             dates.append(str(result.publication_year))
-        dates.extend([date['type'] + ": " + str(date['date'])
-                      for date in result.dates])
+        date_strings = [
+            f"{d.get('type')}: {d.get('date')}" for d in result.dates
+        ]
+        dates.extend(date_strings)
 
         rights = []
         for right in result.rights: