mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-11-01 02:33:22 -04:00
feat: implemented "order by" API parameters for recipe, food, and unit queries (#1356)
* Added API params to order by different properties * fix for incorrect var name * removed invalid default order_by * implemented fallback for invalid user input
This commit is contained in:
@@ -56,7 +56,9 @@ class RepositoryGeneric(Generic[Schema, Model]):
|
||||
|
||||
return {**dct, **kwargs}
|
||||
|
||||
def get_all(self, limit: int = None, order_by: str = None, start=0, override=None) -> list[Schema]:
|
||||
def get_all(
|
||||
self, limit: int = None, order_by: str = None, order_descending: bool = True, start=0, override=None
|
||||
) -> list[Schema]:
|
||||
# sourcery skip: remove-unnecessary-cast
|
||||
eff_schema = override or self.schema
|
||||
|
||||
@@ -65,10 +67,19 @@ class RepositoryGeneric(Generic[Schema, Model]):
|
||||
q = self._query().filter_by(**fltr)
|
||||
|
||||
if order_by:
|
||||
if order_attr := getattr(self.model, str(order_by)):
|
||||
order_attr = order_attr.desc()
|
||||
try:
|
||||
order_attr = getattr(self.model, str(order_by))
|
||||
if order_descending:
|
||||
order_attr = order_attr.desc()
|
||||
|
||||
else:
|
||||
order_attr = order_attr.asc()
|
||||
|
||||
q = q.order_by(order_attr)
|
||||
|
||||
except AttributeError:
|
||||
self.logger.info(f'Attempted to sort by unknown sort property "{order_by}"; ignoring')
|
||||
|
||||
return [eff_schema.from_orm(x) for x in q.offset(start).limit(limit).all()]
|
||||
|
||||
def multi_query(
|
||||
|
||||
Reference in New Issue
Block a user