Partial search #20
Merged
Partial search #20
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
Up to now we only searched for exact matches, which was never the intention! With this change, searching for e.g. "water" will also return entries containing "waters" and "waterclock". Apparently this only works with text, not keyword fields (see https://stackoverflow.com/questions/46696190) but this covers all the fields we are searching for (we do have some keyword fields, but those are only used for sorting, not matching).
This restores the OR behaviour of searching for multiple words (see #17). It will be easy to change if we want to make AND the default behaviour.
The Elasticsearch client will be needed for tests of the search results, so it's easier if it's accessible to all test files. Same for the test glossary entries.
|
The setup of the test data could be improved, but that can be done as part of using an Elasticsearch plugin for pytest (see this comment in #6). I think this is ready for review now. |
ageorgou
added
infrastructure
raquelalegre
approved these changes
Jun 5, 2019
| # Also note that this fixture cannot be module-scoped because monkeypatch is | ||
| # function-scoped. | ||
| monkeypatch.setattr(ingest.bulk_upload, "INDEX_NAME", test_index_name) | ||
| assert ingest.bulk_upload.INDEX_NAME == test_index_name # just making sure |
There was a problem hiding this comment.
It has taken me a little while and some StackOverflow research to feel OK about an assert being inside of a fixture.
There was a problem hiding this comment.
I've just tested it myself: a bad assertion in a fixture makes all tests that use it fail, before any code in those tests is run. I think it's safe enough to leave in!
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.
Fixes #17, partially addresses #6.
This makes it so partial matches will be returned - for example, searching for
catwill match bothcatandcatch(in any of the searched fields). As before, if a user searches for multiple words (separated by spaces), this will return results matching any of those words.Main parts: