Type param #177
Merged
Type param #177
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shinyichen
requested changes
Feb 2, 2024
shinyichen
reviewed
Feb 2, 2024
shinyichen
approved these changes
Feb 2, 2024
tjacovich
reviewed
Feb 2, 2024
biblib/views/user_view.py
Outdated
| @@ -228,8 +222,9 @@ def get(self): | |||
| if sort_order not in ['asc', 'desc']: | |||
| raise ValueError | |||
|
|
|||
| ownership = get_params.get('ownership', default=False, type=check_boolean) | |||
| current_app.logger.debug("GET params: {}, start: {}, end: {}".format(get_params, start, rows)) | |||
| type = get_params.get('type', default='all', type=str) | |||
There was a problem hiding this comment.
My only concern on this is that type is a python builtin, so it might be worth renaming to something safer in case type() becomes relevant in the future.
biblib/views/user_view.py
Outdated
| libraries_response['shared_with_me'] = shared_with_me | ||
| else: | ||
| libraries_response['libraries'] = my_libraries | ||
| if type == 'all' or (type == 'owner' and main_permission in ['owner']) or (type == 'collaborator' and main_permission in ['admin', 'read', 'write']): |
There was a problem hiding this comment.
Maybe I am missing something, but do we still need this if with the filtering incorporated in the new method you wrote above?
There was a problem hiding this comment.
Yes, seems like this part and the slicing of list (below) are not needed anymore
biblib/views/user_view.py
Outdated
| @@ -58,9 +58,24 @@ def retrieve_user_email(owner_absolute_uid): | |||
| service | |||
| ) | |||
| return response | |||
|
|
|||
| @classmethod | |||
| def get_user_libraries(cls, session, service_uid, sort_col, sort_order, type): | |||
There was a problem hiding this comment.
I think this method looks good and also makes that previous query a lot more readable.
biblib/views/user_view.py
Outdated
|
|
||
| if type == 'owner': | ||
| query = query.filter(Permissions.permissions['owner'].astext.cast(Boolean).is_(True)) | ||
| elif type != 'all': |
There was a problem hiding this comment.
Is there a particular reason you opted for !='all' instead of =='collaborator'?
tjacovich
approved these changes
Feb 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Desired behavior
Request
Response