(1751) Multi-faceted search #1153
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
dragon-dxw
reviewed
Mar 28, 2024
dragon-dxw
reviewed
Mar 28, 2024
dragon-dxw
reviewed
Mar 28, 2024
dragon-dxw
reviewed
Mar 28, 2024
CristinaRO
reviewed
Apr 5, 2024
CristinaRO
force-pushed
the
1751-faceted-search
branch
from
53f9b68 to
2dc17e7
Compare
dragon-dxw
reviewed
Apr 8, 2024
dragon-dxw
reviewed
Apr 8, 2024
ds_judgements_public_ui/templates/includes/facets/year_search_facets.html
Outdated
Show resolved
Hide resolved
dragon-dxw
reviewed
Apr 8, 2024
ds_judgements_public_ui/templates/includes/facets/court_search_facets.html
Outdated
Show resolved
Hide resolved
dragon-dxw
reviewed
Apr 8, 2024
ds_judgements_public_ui/templates/includes/facets/year_search_facets.html
Show resolved
Hide resolved
dragon-dxw
reviewed
Apr 8, 2024
dragon-dxw
reviewed
Apr 8, 2024
dragon-dxw
reviewed
Apr 8, 2024
dragon-dxw
reviewed
Apr 8, 2024
| Generate a list of valid years as strings. | ||
| """ | ||
| today = datetime.date.today() | ||
| valid_years = range(2003, today.year) |
There was a problem hiding this comment.
This will probably bite us when we import older stuff.
dragon-dxw
reviewed
Apr 8, 2024
dragon-dxw
reviewed
Apr 8, 2024
| """ | ||
| Sorts a dictionary by value where | ||
| the values contain numbers as strings | ||
| """ |
There was a problem hiding this comment.
Does suggest we might just want to make those values ints early in the process.
There was a problem hiding this comment.
Agree to do this in future, maybe alongside changes to preserve the facet name?
dragon-dxw
reviewed
Apr 8, 2024
| Separates facets dict into non-court facets, | ||
| and court facets. | ||
| """ | ||
| court_facets = { |
There was a problem hiding this comment.
Already discussed that we want to get court/year out of the original data, but we still want the validation. Okay for now.
dragon-dxw
approved these changes
Apr 8, 2024
adam-murray
force-pushed
the
1751-faceted-search
branch
from
d98a168 to
f21c0a7
Compare
CristinaRO
force-pushed
the
1751-faceted-search
branch
3 times, most recently
from
2d0df0c to
5646185
Compare
dragon-dxw
reviewed
Apr 9, 2024
judgments/tests/test_search.py
Outdated
| # Desired court_facet is present | ||
| assert response.context["context"]["court_facets"] == {eat_court_code: "3"} | ||
| # Blank keys are not present | ||
| assert {"": "3"}.items() not in response.context["context"][ |
There was a problem hiding this comment.
I'd probably write assert "" not in complicated_dict.keys(); this currently will always pass because the value of "" is 5.
dragon-dxw
reviewed
Apr 9, 2024
judgments/tests/test_search.py
Outdated
| "court_facets" | ||
| ].items() | ||
| # Keys that don't match existing courts are not present | ||
| assert {"invalid_court": "10"}.items() not in response.context["context"][ |
There was a problem hiding this comment.
ditto except the number is fine
dragon-dxw
reviewed
Apr 9, 2024
judgments/tests/test_search.py
Outdated
| # Desired year_facet is present | ||
| assert response.context["context"]["year_facets"] == {"2010": "103"} | ||
| # Keys that don't match valid years are not present | ||
| assert {"1900": "4"}.items() not in response.context["context"][ |
Get more court data into the facet context Rather than assume a very generic, meta-programmed approach to multiple facets in the future, I am encoding a more specific approach to the only facet we have so far, the court facet. Including data about the court will allow us to get its human-friendly display name, as well as the code used to formulate the query. Display relevant courts as links We are making a fair number of assumptions here: - the link only preserves the query text - therefore any other filters that may have been selected are lost fix: Separate processing of court facets into util, do not render relevant facets template unless facets are provided! Add year facets to interface Replace year query with year facet Years selected from the facets take precedence over any previously applied filters. feat: Added template for rendering facets Put faceted search behind feature flag Use latest release of the API client Co-authored-by: adam-murray <[email protected]> Co-authored-by: dragon-dxw <[email protected]> Signed-off-by: Cristina <[email protected]>
Co-authored-by: adam-murray <[email protected]> Signed-off-by: Cristina <[email protected]>
CristinaRO
force-pushed
the
1751-faceted-search
branch
from
5646185 to
a64be4a
Compare
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.
Depends on:
nationalarchives/ds-caselaw-marklogic#58
nationalarchives/ds-caselaw-custom-api-client#575
#1169
Changes in this PR:
This PR implements handling for court and year search facets.
Trello card / Rollbar error (etc)
https://trello.com/c/XMzUM1jX/1751-🏠🎛-homepage2-faceted-search-concept-on-staging-for-testing-courtyear
Screenshots of UI changes:
Before
After