Skip to content

BDMS-27: order sort filter locations #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jirhiker merged 1 commit into from
Aug 1, 2025
Merged

BDMS-27: order sort filter locations #51

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions api/location.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
# ===============================================================================
from typing import Union

from fastapi import Depends
from fastapi import Depends, Query
from fastapi_pagination.ext.sqlalchemy import paginate
from sqlalchemy import select, func
from sqlalchemy.orm import Session
Expand All @@ -29,7 +29,7 @@
from schemas_v2.location import CreateLocation, LocationResponse, UpdateLocation
from schemas_v2.thing import LocationWellResponse
from services.geospatial_helper import make_within_wkt
from services.query_helper import make_query
from services.query_helper import make_query, order_sort_filter
from services.crud_helper import model_patcher

from fastapi import APIRouter
Expand Down Expand Up @@ -133,6 +133,9 @@ async def get_location(
within: str = None,
query: str = None,
expand: str = None,
sort: str = None,
order: str = None,
filter_: str = Query(alias="filter", default=None),
) -> CustomPage[Union[LocationResponse, LocationWellResponse]]:
"""
Retrieve all wells from the database.
Expand All @@ -159,6 +162,8 @@ def transformer(items):
return [LocationWellResponse.model_validate(item) for item in items]
return [LocationResponse.model_validate(item) for item in items]

sql = order_sort_filter(sql, Location, sort, order, filter_)

return paginate(query=sql, conn=session, transformer=transformer)


Expand Down
Loading