Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix[data builder]: Access doi value directly in literature #475

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions inspire_schemas/builders/data.py
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ def add_literature(self, doi=None, record=None):
"""Add literature.

:param doi: doi of the literature
:type doi: dict
:type doi: str

:param record: dictionary with ``$ref`` pointing to proper record.
:type record: dict
Expand All @@ -311,6 +311,6 @@ def add_literature(self, doi=None, record=None):
}

if doi:
literature_dict['doi'] = doi
literature_dict['doi'] = {"value": doi}

self._append_to('literature', literature_dict)
1 change: 0 additions & 1 deletion tests/integration/fixtures/data_example.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,6 @@
"literature": [
{
"doi": {
"source": "amet Ut",
"value": "10.912/W/K[Bz"
},
"record": {
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/test_builders.py
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ def test_data_builder(data_data):

literatures = data_data['literature']
for literature in literatures:
builder.add_literature(literature.get("doi"), literature.get('record'))
builder.add_literature(literature.get("doi", {}).get("value"), literature.get('record'))
assert builder.record['literature'] == literatures

urls = data_data['urls']
Expand Down
16 changes: 14 additions & 2 deletions tests/unit/test_data_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ def test_add_abstract():
abstract = "This is a test abstract."
source = "Test Source"
builder.add_abstract(abstract, source)
builder.validate_record()
result = builder.record.get("abstracts")
expected = [{"source": source, "value": abstract}]
assert result == expected
Expand All @@ -55,6 +56,7 @@ def test_add_author():
"emails": ["[email protected]"],
}
builder.add_author(author_data)
builder.validate_record()
result = builder.record.get("authors")
expected = [author_data]
assert result == expected
Expand All @@ -66,6 +68,7 @@ def test_add_title():
subtitle = "An Even Better Subtitle"
source = "Test Source"
builder.add_title(title, subtitle, source)
builder.validate_record()
result = builder.record.get("titles")
expected = [
{"source": source, "title": title, "subtitle": subtitle},
Expand All @@ -76,6 +79,7 @@ def test_add_creation_date():
builder = DataBuilder()
creation_date = "2020-01-01"
builder.add_creation_date(creation_date)
builder.validate_record()
result = builder.record.get("creation_date")
assert result == creation_date

Expand All @@ -84,6 +88,7 @@ def test_add_doi():
doi = "10.1234/example.doi"
source = "Test Source"
builder.add_doi(doi, source)
builder.validate_record()
result = builder.record.get("dois")
expected = [{"source": source, "value": "10.1234/example.doi"}]
assert result == expected
Expand All @@ -94,6 +99,7 @@ def test_add_keyword():
keyword = "Physics"
source = "Test Source"
builder.add_keyword(keyword, source)
builder.validate_record()
result = builder.record.get("keywords")
expected = [{"source": source, "value": keyword}]
assert result == expected
Expand All @@ -104,6 +110,7 @@ def test_add_accelerator_experiment():
legacy_name = "FNAL-E-0900"
experiment_record = {"$ref": "http://example.com/api/experiments/123"}
builder.add_accelerator_experiment(legacy_name, record=experiment_record)
builder.validate_record()
result = builder.record.get("accelerator_experiments")
expected = [{"legacy_name": legacy_name, "record": experiment_record}]
assert result == expected
Expand All @@ -116,12 +123,17 @@ def test_add_literature():
record = {"$ref": "http://example.com/api/literature/123"}

builder.add_literature(doi, record=record)
builder.validate_record()

result = builder.record.get("literature")
expected = [
{
"doi": doi,
"record": record,
"doi":{
"value":"10.1234/example.doi"
},
"record":{
"$ref":"http://example.com/api/literature/123"
}
}
]

Expand Down