Skip to content
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.

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

fix: proxy get_all to page_all #3312

Merged
merged 2 commits into from
Mar 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 8 additions & 23 deletions mealie/repos/repository_generic.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,33 +80,18 @@ def get_all(
limit: int | None = None,
order_by: str | None = None,
order_descending: bool = True,
start=0,
override=None,
) -> list[Schema]:
self.logger.warning('"get_all" method is deprecated; use "page_all" instead')

# sourcery skip: remove-unnecessary-cast
eff_schema = override or self.schema

fltr = self._filter_builder()

q = self._query(override_schema=eff_schema).filter_by(**fltr)

if order_by:
try:
order_attr = getattr(self.model, str(order_by))
if order_descending:
order_attr = order_attr.desc()

else:
order_attr = order_attr.asc()
pq = PaginationQuery(
per_page=limit or -1,
order_by=order_by,
order_direction=OrderDirection.desc if order_descending else OrderDirection.asc,
page=1,
)

q = q.order_by(order_attr)
results = self.page_all(pq, override=override)

except AttributeError:
self.logger.info(f'Attempted to sort by unknown sort property "{order_by}"; ignoring')
result = self.session.execute(q.offset(start).limit(limit)).unique().scalars().all()
return [eff_schema.model_validate(x) for x in result]
return results.items

def multi_query(
self,
Expand Down