Skip to content

Shirey/vers UUID name change #274

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 4 commits into from
Jan 5, 2022
Merged

Shirey/vers UUID name change #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
730c8fd
change revision return property dataset_uuid to uuid
shirey Dec 10, 2021
1a41360
create second /entities/ route for revisions method
shirey Dec 10, 2021
538d8c2
dataset_uuid -> uuid in response
yuanzhou Dec 13, 2021
80734db
Merge branch 'test-release' into shirey/vers-uuid-name-change
yuanzhou Jan 5, 2022
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
2 changes: 1 addition & 1 deletion entity-api-spec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ paths:
schema:
type: object
properties:
dataset_uuid:
uuid:
type: string
description: The uuid of a dataset
revision_number:
Expand Down
6 changes: 3 additions & 3 deletions src/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2079,6 +2079,7 @@ def retract_dataset(id):
list
The list of revision datasets
"""
@app.route('/entities/<id>/revisions', methods=['GET'])
@app.route('/datasets/<id>/revisions', methods=['GET'])
def get_revisions_list(id):
# By default, do not return dataset. Only return dataset if return_dataset is true
Expand All @@ -2101,7 +2102,7 @@ def get_revisions_list(id):

# Only for Dataset
if normalized_entity_type != 'Dataset':
bad_request_error("The entity of given id is not a Dataset")
bad_request_error("The entity is not a Dataset. Found entity type:" + normalized_entity_type)

# Only published/public datasets don't require token
if entity_dict['status'].lower() != DATASET_STATUS_PUBLISHED:
Expand Down Expand Up @@ -2141,7 +2142,7 @@ def get_revisions_list(id):
for revision in normalized_revisions_list:
result = {
'revision_number': revision_number,
'dataset_uuid': revision['uuid']
'uuid': revision['uuid']
}
if show_dataset:
result['dataset'] = revision
Expand Down Expand Up @@ -3460,4 +3461,3 @@ def validate_organ_code(organ_code):
print(str(e))
logger.error(e, exc_info=True)
print("Error during startup check the log file for further information")