Skip to content

Commit

Permalink
Update Rights.kind for MITAardvark.dct_accessRights_s field to 'Acces…
Browse files Browse the repository at this point in the history
…s rights'
  • Loading branch information
jonavellecuerdo committed Feb 20, 2024
1 parent a7af146 commit 8c54755
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 11 deletions.
16 changes: 7 additions & 9 deletions tests/sources/json/test_aardvark.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def test_aardvark_transform_returns_timdex_record(aardvark_records):
citation="Test title 1. Geospatial data. "
"https://geodata.libraries.mit.edu/record/abc:123",
content_type=["Geospatial data"],
rights=[timdex.Rights(description="Access rights", kind="Access")],
rights=[timdex.Rights(description="Access rights", kind="Access rights")],
links=[
timdex.Link(
url="https://geodata.libraries.mit.edu/record/abc:123",
Expand Down Expand Up @@ -300,7 +300,7 @@ def test_aardvark_get_publication_information_success(aardvark_record_all_fields

def test_aardvark_get_rights_success(aardvark_record_all_fields):
assert MITAardvark.get_rights("source", next(aardvark_record_all_fields)) == [
timdex.Rights(description="Access note", kind="Access"),
timdex.Rights(description="Access note", kind="Access rights"),
timdex.Rights(uri="http://license.license"),
timdex.Rights(uri="http://another_license.another_license"),
timdex.Rights(description="Some person has the rights"),
Expand All @@ -314,10 +314,8 @@ def test_aardvark_get_rights_mit_restricted_success(aardvark_record_all_fields):
aardvark_record = next(aardvark_record_all_fields)
aardvark_record["dct_accessRights_s"] = "Restricted"
assert MITAardvark.get_rights("gismit", aardvark_record) == [
timdex.Rights(description="Restricted", kind="Access"),
timdex.Rights(
description="Requires MIT authentication", kind="Access to files"
),
timdex.Rights(description="Restricted", kind="Access rights"),
timdex.Rights(description="MIT authentication", kind="Access to files"),
timdex.Rights(uri="http://license.license"),
timdex.Rights(uri="http://another_license.another_license"),
timdex.Rights(description="Some person has the rights"),
Expand All @@ -331,7 +329,7 @@ def test_aardvark_get_rights_mit_public_success(aardvark_record_all_fields):
aardvark_record = next(aardvark_record_all_fields)
aardvark_record["dct_accessRights_s"] = "Public"
assert MITAardvark.get_rights("gismit", aardvark_record) == [
timdex.Rights(description="Public", kind="Access"),
timdex.Rights(description="Public", kind="Access rights"),
timdex.Rights(description="Free/open to all", kind="Access to files"),
timdex.Rights(uri="http://license.license"),
timdex.Rights(uri="http://another_license.another_license"),
Expand All @@ -346,7 +344,7 @@ def test_aardvark_get_rights_external_restricted_success(aardvark_record_all_fie
aardvark_record = next(aardvark_record_all_fields)
aardvark_record["dct_accessRights_s"] = "Restricted"
assert MITAardvark.get_rights("gisogm", aardvark_record) == [
timdex.Rights(description="Restricted", kind="Access"),
timdex.Rights(description="Restricted", kind="Access rights"),
timdex.Rights(description="Not owned by MIT", kind="Access to files"),
timdex.Rights(uri="http://license.license"),
timdex.Rights(uri="http://another_license.another_license"),
Expand All @@ -361,7 +359,7 @@ def test_aardvark_get_rights_external_public_success(aardvark_record_all_fields)
aardvark_record = next(aardvark_record_all_fields)
aardvark_record["dct_accessRights_s"] = "Public"
assert MITAardvark.get_rights("gisogm", aardvark_record) == [
timdex.Rights(description="Public", kind="Access"),
timdex.Rights(description="Public", kind="Access rights"),
timdex.Rights(description="Not owned by MIT", kind="Access to files"),
timdex.Rights(uri="http://license.license"),
timdex.Rights(uri="http://another_license.another_license"),
Expand Down
4 changes: 2 additions & 2 deletions transmogrifier/sources/json/aardvark.py
Original file line number Diff line number Diff line change
Expand Up @@ -393,7 +393,7 @@ def get_rights(source: str, source_record: dict) -> list[timdex.Rights]:
rights.append(
timdex.Rights(
description=source_record["dct_accessRights_s"],
kind="Access",
kind="Access rights",
)
)

Expand All @@ -405,7 +405,7 @@ def get_rights(source: str, source_record: dict) -> list[timdex.Rights]:
if source_record["dct_accessRights_s"] == "Restricted":
rights.append(
timdex.Rights(
description="Requires MIT authentication",
description="MIT authentication",
kind=kind_access_to_files,
)
)
Expand Down

0 comments on commit 8c54755

Please sign in to comment.