Skip to content

Small change to keep code aligned with SenNet, which logs and returns… #493

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jun 20, 2023
Merged

Small change to keep code aligned with SenNet, which logs and returns… #493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75697c6
Small change to keep code aligned with SenNet, which logs and returns…
Jun 16, 2023
4a065eb
Merge branch 'main' of https://github.com/hubmapconsortium/entity-api…
yuanzhou Jun 20, 2023
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
11 changes: 10 additions & 1 deletion src/schema/schema_validators.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,19 @@ def verify_DOI_pair(property_key, normalized_entity_type, request, existing_data
# Since both DOI parameters are present, make sure neither is the empty string
if new_data_dict['doi_url'] == '' or new_data_dict['registered_doi'] == '':
raise ValueError( f"The properties 'doi_url' and 'registered_doi' cannot be empty, when specified.")

# Check if doi_url matches registered_doi with the expected prefix
if new_data_dict['doi_url'] != SchemaConstants.DOI_BASE_URL + new_data_dict['registered_doi']:
try:
expected_doi_url = SchemaConstants.DOI_BASE_URL + new_data_dict['registered_doi']
except Exception as e:
# If SchemaConstants.DOI_BASE_URL is not set, or there is some other
# problem, give up and fail this validation.
logger.error(f"During verify_DOI_pair schema validator, unexpected exception e={str(e)}")
raise ValueError(f"An unexpected error occurred during evaluation of DOI parameters. See logs.")
if expected_doi_url and new_data_dict['doi_url'] != expected_doi_url:
raise ValueError( f"The 'doi_url' property should match the 'registered_doi' property, after"
f" the prefix {SchemaConstants.DOI_BASE_URL}.")

"""
Validate every entity in a list is of entity_type accepted

Expand Down