Implement Order Filter for Python ICAT Backend #158
Merged
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
- This will remove circular imports in a later change - Also helps to tidy up the code base by separating the filter handler from the abstract classes of the filters
- If there's more than one order filter in a request, the others get overwritten due to the way setOrder() works in Python ICAT
- This is to remove a circular dependency that I found while implementing an order filter - Also added a couple of __init__.py files which didn't previously exist
common/icat/helpers.py
Outdated
| @@ -394,3 +387,19 @@ def get_entity_with_filters(client, table_name, filters): | |||
| raise MissingRecordError("No results found") | |||
| else: | |||
| return data | |||
|
|
|||
|
|
|||
| def manage_order_filters(filters): | |||
There was a problem hiding this comment.
This could probably be given a more descriptive name - like clear_order_filters?
There was a problem hiding this comment.
I've just pushed a change which renames this function and where it's used, definitely prefer the new name.
louise-davies
approved these changes
Aug 27, 2020
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.
This PR will close #140.
This PR adds the functionality of order filters in get by filter requests. Multiple order filters can be added to a request, and they'll be added in the order which they're given in the request.
Due to a circular dependency, I've moved the location of
create_condition()fromcommon/filters.pytocommon/icat/filters.pywhich seems sensible considering that's an Python ICAT specific piece of functionality.All unit tests that passed before this change, still pass. The 4 failures are related to
/sessionsendpoints and will be fixed when I adapt the unit tests to run on the Python ICAT backend.Once #153 has been merged into
master, I will change the base branch of this PR to bemaster(it's currentlypython-icat-where-filter-#142as that's what I branched from originally).