Skip to content

updated order_by for issues #191

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
lrodden merged 1 commit into from
Aug 4, 2024
Merged

updated order_by for issues #191

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
14 changes: 7 additions & 7 deletions app/api/v1/ops/services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2697,19 +2697,19 @@ def get_issues(request: object) -> object:
issues = Issue.objects.filter(
affected__icontains={'id': page_id},
account=account
).order_by('status', '-time_created')
).order_by('-status', '-time_created')
# get all issues scoped page if page_id passed
if site_id is not None:
issues = Issue.objects.filter(
affected__icontains={'id': site_id},
account=account
).order_by('status', '-time_created')
).order_by('-status', '-time_created')

# get all account assocoiated issues
if issues is None:
issues = Issue.objects.filter(
account=account
).order_by('status', '-time_created')
).order_by('-status', '-time_created')

# serialize and return
paginator = LimitOffsetPagination()
Expand Down Expand Up @@ -2783,7 +2783,7 @@ def search_issues(request: object) -> object:
Q(account=account, title__icontains=query) |
Q(account=account, details__icontains=query) |
Q(account=account, affected__icontains={'str':query})
).order_by('status', '-time_created')
).order_by('-status', '-time_created')

# serialize and rerturn
paginator = LimitOffsetPagination()
Expand Down Expand Up @@ -2870,20 +2870,20 @@ def get_issues_zapier(request: object) -> object:
issues = Issue.objects.filter(
account=account,
affected__icontains=page_id,
).order_by('-time_created')
).order_by('-status','-time_created')

# get all site associated issues
if site_id:
issues = Issue.objects.filter(
account=account,
affected__icontains=site_id,
).order_by('-time_created')
).order_by('-status', '-time_created')

# get all account assocoiated issues
if issues is None:
issues = Issue.objects.filter(
account=account
).order_by('status', '-time_created')
).order_by('-status', '-time_created')

# build response data
data = []
Expand Down