diff options
| author | Daniel Schadt <kingdread@gmx.de> | 2026-11-11 17:51:31 +0100 |
|---|---|---|
| committer | Daniel Schadt <kingdread@gmx.de> | 2026-11-11 17:51:31 +0100 |
| commit | df2167bd7c781d54683ee52ac81175f1184faa39 (patch) | |
| tree | 6d5aefd5eb31fca780d4b0aef6e94d478c787566 | |
| parent | ad3803e12e4ded69ae4bc948bee6e41c5089dbd5 (diff) | |
| download | fietsboek-df2167bd7c781d54683ee52ac81175f1184faa39.tar.gz fietsboek-df2167bd7c781d54683ee52ac81175f1184faa39.tar.bz2 fietsboek-df2167bd7c781d54683ee52ac81175f1184faa39.zip | |
make climb browser sortable
| -rw-r--r-- | fietsboek/templates/climb_browse.jinja2 | 16 | ||||
| -rw-r--r-- | fietsboek/util.py | 18 | ||||
| -rw-r--r-- | fietsboek/views/browse.py | 11 | ||||
| -rw-r--r-- | fietsboek/views/climb.py | 51 |
4 files changed, 76 insertions, 20 deletions
diff --git a/fietsboek/templates/climb_browse.jinja2 b/fietsboek/templates/climb_browse.jinja2 index d754c46..165ce02 100644 --- a/fietsboek/templates/climb_browse.jinja2 +++ b/fietsboek/templates/climb_browse.jinja2 @@ -138,14 +138,14 @@ </div> <div class="col"> <select class="form-select ui-element" name="sort"> - <option value="DATE_DESC" {% if request.params.get("sort") == "DATE_DESC" %}selected{% endif %}>{{ _("page.browse.sort.date") }} ↓</option> - <option value="DATE_ASC" {% if request.params.get("sort") == "DATE_ASC" %}selected{% endif %}>{{ _("page.browse.sort.date") }} ↑</option> - <option value="LENGTH_DESC" {% if request.params.get("sort") == "LENGTH_DESC" %}selected{% endif %}>{{ _("page.browse.sort.length") }} ↓</option> - <option value="LENGTH_ASC" {% if request.params.get("sort") == "LENGTH_ASC" %}selected{% endif %}>{{ _("page.browse.sort.length") }} ↑</option> - <option value="UPHILL_DESC" {% if request.params.get("sort") == "UPHILL_DESC" %}selected{% endif %}>{{ _("page.browse.sort.uphill") }} ↓</option> - <option value="UPHILL_ASC" {% if request.params.get("sort") == "UPHILL_ASC" %}selected{% endif %}>{{ _("page.browse.sort.uphill") }} ↑</option> - <option value="DURATION_DESC" {% if request.params.get("sort") == "DURATION_DESC" %}selected{% endif %}>{{ _("page.browse.sort.duration") }} ↓</option> - <option value="DURATION_ASC" {% if request.params.get("sort") == "DURATION_ASC" %}selected{% endif %}>{{ _("page.browse.sort.duration") }} ↑</option> + <option value="DATE_DESC" {% if request.params.get("sort") == "DATE_DESC" %}selected{% endif %}>{{ _("page.climb_browse.sort.date") }} ↓</option> + <option value="DATE_ASC" {% if request.params.get("sort") == "DATE_ASC" %}selected{% endif %}>{{ _("page.climb_browse.sort.date") }} ↑</option> + <option value="LENGTH_DESC" {% if request.params.get("sort") == "LENGTH_DESC" %}selected{% endif %}>{{ _("page.climb_browse.sort.length") }} ↓</option> + <option value="LENGTH_ASC" {% if request.params.get("sort") == "LENGTH_ASC" %}selected{% endif %}>{{ _("page.climb_browse.sort.length") }} ↑</option> + <option value="GRADE_DESC" {% if request.params.get("sort") == "GRADE_DESC" %}selected{% endif %}>{{ _("page.climb_browse.sort.grade") }} ↓</option> + <option value="GRADE_ASC" {% if request.params.get("sort") == "GRADE_ASC" %}selected{% endif %}>{{ _("page.climb_browse.sort.grade") }} ↑</option> + <option value="CATEGORY_DESC" {% if request.params.get("sort") == "CATEGORY_DESC" %}selected{% endif %}>{{ _("page.climb_browse.sort.category") }} ↓</option> + <option value="CATEGORY_ASC" {% if request.params.get("sort") == "CATEGORY_ASC" %}selected{% endif %}>{{ _("page.climb_browse.sort.category") }} ↑</option> </select> </div> </div> diff --git a/fietsboek/util.py b/fietsboek/util.py index ecb3f43..44ab942 100644 --- a/fietsboek/util.py +++ b/fietsboek/util.py @@ -278,6 +278,23 @@ def retrieve_multiple( return objects +def get_enum(enum: type[T], value: str) -> T: + """Retrieve an enum value by a string name. + + This is equivalent to ``enum[value]``, but raises an appropriate HTTP exception on errors. + Therefore, this function is useful to parse query parameters. + + :param enum: The enum class. + :param value: Name of the value. + :return: The enum item. + :raises HTTPBadRequest: If the string does not represent a valid item. + """ + try: + return enum[value] + except KeyError as exc: + raise HTTPBadRequest(f"Invalid enum value {value!r}") from exc + + def check_password_constraints(password: str, repeat_password: Optional[str] = None): """Verifies that the password constraints match for the given password. @@ -501,6 +518,7 @@ __all__ = [ "day_name", "random_link_secret", "retrieve_multiple", + "get_enum", "check_password_constraints", "read_localized_resource", "locale_display_name", diff --git a/fietsboek/views/browse.py b/fietsboek/views/browse.py index 490b9b4..18fbc1a 100644 --- a/fietsboek/views/browse.py +++ b/fietsboek/views/browse.py @@ -65,13 +65,6 @@ def _get_date(request: Request, name: str) -> datetime.date: raise HTTPBadRequest(f"Invalid date in {name!r}") from exc -def _get_enum(enum: type[T], value: str) -> T: - try: - return enum[value] - except KeyError as exc: - raise HTTPBadRequest(f"Invalid enum value {value!r}") from exc - - def _with_page(url: str, num: int) -> str: parsed = urllib.parse.urlparse(url) query = urllib.parse.parse_qs(parsed.query) @@ -411,7 +404,7 @@ class FilterCollection(Filter): filters.append(UserTaggedFilter(request.identity)) if "type[]" in request.params: - types = {_get_enum(TrackType, value) for value in request.params.getall("type[]")} + types = {util.get_enum(TrackType, value) for value in request.params.getall("type[]")} filters.append( LambdaFilter( lambda query, track: query.where(track.type.in_(types)), @@ -524,7 +517,7 @@ def browse(request: Request) -> Response: order = ResultOrder.DATE_DESC if request.params.get("sort"): - order = _get_enum(ResultOrder, request.params.get("sort")) + order = util.get_enum(ResultOrder, request.params.get("sort")) query = apply_order(query, track, order) tracks = list( diff --git a/fietsboek/views/climb.py b/fietsboek/views/climb.py index e3594ef..1278530 100644 --- a/fietsboek/views/climb.py +++ b/fietsboek/views/climb.py @@ -2,6 +2,7 @@ import gzip import logging +from enum import Enum from pyramid.httpexceptions import ( HTTPNotAcceptable, @@ -9,13 +10,49 @@ from pyramid.httpexceptions import ( from pyramid.request import Request from pyramid.response import Response from pyramid.view import view_config -from sqlalchemy import select +from sqlalchemy import nulls_first, nulls_last, select from sqlalchemy.orm import aliased -from .. import models +from .. import models, util LOGGER = logging.getLogger(__name__) + +class ResultOrder(Enum): + """Enum representing the different ways in which the climbs can be sorted + in the result.""" + + DATE_ASC = "date-asc" + DATE_DESC = "date-desc" + LENGTH_ASC = "length-asc" + LENGTH_DESC = "length-desc" + GRADE_ASC = "grade-asc" + GRADE_DESC = "grade-desc" + CATEGORY_ASC = "category-asc" + CATEGORY_DESC = "category-desc" + + +def _apply_order(query: Select, order: ResultOrder) -> Select: + match order: + case ResultOrder.DATE_ASC: + query = query.order_by(models.Track.date_raw.asc()) + case ResultOrder.DATE_DESC: + query = query.order_by(models.Track.date_raw.desc()) + case ResultOrder.LENGTH_ASC: + query = query.order_by(models.Climb.length.asc()) + case ResultOrder.LENGTH_DESC: + query = query.order_by(models.Climb.length.desc()) + case ResultOrder.GRADE_ASC: + query = query.order_by(models.Climb.avg_grade.asc()) + case ResultOrder.GRADE_DESC: + query = query.order_by(models.Climb.avg_grade.desc()) + case ResultOrder.CATEGORY_ASC: + query = query.order_by(nulls_first(models.Climb.category.desc())) + case ResultOrder.CATEGORY_DESC: + query = query.order_by(nulls_last(models.Climb.category.asc())) + return query + + @view_config( route_name="climb-browse", renderer="fietsboek:templates/climb_browse.jinja2", @@ -23,7 +60,14 @@ LOGGER = logging.getLogger(__name__) ) def climb_browse(request: Request): tracks_qry = aliased(models.Track, models.User.visible_tracks_query(request.identity).subquery()) - climbs_qry = select(models.Climb).filter(models.Climb.track_id.in_(select(tracks_qry.id))) + climbs_qry = select(models.Climb).filter(models.Climb.track_id.in_(select(tracks_qry.id))).join(models.Climb.track) + + order = ResultOrder.DATE_DESC + if request.params.get("sort"): + order = util.get_enum(ResultOrder, request.params.get("sort")) + climbs_qry = _apply_order(climbs_qry, order) + print(climbs_qry) + climbs = list(request.dbsession.execute(climbs_qry).scalars()) return { "climbs": climbs, @@ -71,6 +115,7 @@ def climb_profile(request: Request): __all__ = [ + "climb_browse", "climb_preview", "climb_profile", ] |
