rest: Add pagination support #1361
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
houndci-bot
reviewed
Nov 2, 2023
| else: | ||
| if search_options['include_neighbors'] not in (True, False): | ||
| raise NipapValueError("Invalid value for option 'include_neighbors'. Only true and false valid. " | ||
| "Supplied value: '{}'".format(search_options['include_neighbors'])) | ||
|
|
||
| # max_result | ||
| if 'max_result' not in search_options: | ||
| search_options['max_result'] = 50 | ||
| search_options['max_result'] = prefix_search_options_spec['max_result'] |
| @@ -3159,15 +3173,15 @@ def search_prefix(self, auth, query, search_options=None): | |||
|
|
|||
| # include_neighbors | |||
| if 'include_neighbors' not in search_options: | |||
| search_options['include_neighbors'] = False | |||
| search_options['include_neighbors'] = prefix_search_options_spec['include_neighbors'] | |||
| @@ -3150,7 +3164,7 @@ def search_prefix(self, auth, query, search_options=None): | |||
|
|
|||
| # children_depth | |||
| if 'children_depth' not in search_options: | |||
| search_options['children_depth'] = 0 | |||
| search_options['children_depth'] = prefix_search_options_spec['children_depth'] | |||
| else: | ||
| if search_options['include_all_children'] not in (True, False): | ||
| raise NipapValueError("Invalid value for option 'include_all_children'. Only true and false valid. " | ||
| "Supplied value: '{}'".format(search_options['include_all_children'])) | ||
|
|
||
| # parents_depth | ||
| if 'parents_depth' not in search_options: | ||
| search_options['parents_depth'] = 0 | ||
| search_options['parents_depth'] = prefix_search_options_spec['parents_depth'] |
| @@ -3133,15 +3147,15 @@ def search_prefix(self, auth, query, search_options=None): | |||
|
|
|||
| # include_children | |||
| if 'include_all_children' not in search_options: | |||
| search_options['include_all_children'] = False | |||
| search_options['include_all_children'] = prefix_search_options_spec['include_all_children'] | |||
There was a problem hiding this comment.
line too long (103 > 79 characters)
| @@ -233,7 +237,7 @@ def get(self, args): | |||
| } | |||
|
|
|||
| try: | |||
| result = self.nip.search_prefix(args.get('auth'), search_query) | |||
| result = self.nip.search_prefix(args.get('auth'), search_query, search_options) | |||
|
|
||
| # Test offset 75 | ||
| parameters['offset'] = 35 | ||
| get_prefix_request = requests.get(self.server_url, headers=self.headers, params=parameters) |
|
|
||
| # Test max result 100 | ||
| parameters['max_result'] = 60 | ||
| get_prefix_request = requests.get(self.server_url, headers=self.headers, params=parameters) |
| parameters = {'order_id': 'test'} | ||
|
|
||
| # Test default max result of 50 amd offset 0 | ||
| get_prefix_request = requests.get(self.server_url, headers=self.headers, params=parameters) |
| @@ -481,6 +481,45 @@ def test_prefix_search_error_message(self): | |||
|
|
|||
| self.assertTrue(get_prefix_request.text.__contains__('\'prefixeere\' unknown')) | |||
|
|
|||
| def test_prefix_pagination(self): | |||
| """ Add prefixes with the same order_id, expect different number of prefixes in result | |||
erikoqvist
force-pushed
the
add_pagination_to_rest_api
branch
from
3b666fb
to
2bef229
Compare
|
Upgrade tests due to NIPAP not properly restarting after the upgrade. I'm working on that one... LGTM! |
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.
No description provided.