Skip to content

Commit f8912b3

Browse files
committed
address bugs and inconsistencies in REST API v0 endpoints
1 parent 2322d40 commit f8912b3

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

backend/apps/api/rest/v0/issue.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ def list_issues(
8989
if filters.state:
9090
issues = issues.filter(state=filters.state)
9191

92-
if ordering and ordering.lstrip("-") == "updated_at":
92+
if ordering:
9393
return issues.order_by(ordering, "id")
94-
return issues.order_by(ordering or "-created_at", "-updated_at", "id")
94+
return issues.order_by("-created_at", "-updated_at", "id")
9595

9696

9797
@router.get(

backend/apps/api/rest/v0/milestone.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ def list_milestones(
9494
if filters.state:
9595
milestones = milestones.filter(state=filters.state)
9696

97-
if ordering and ordering.lstrip("-") == "updated_at":
97+
if ordering:
9898
return milestones.order_by(ordering, "id")
99-
return milestones.order_by(ordering or "-created_at", "-updated_at", "id")
99+
return milestones.order_by("-created_at", "-updated_at", "id")
100100

101101

102102
@router.get(

backend/apps/api/rest/v0/release.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,9 @@ def list_release(
9090
if filters.tag_name:
9191
releases = releases.filter(tag_name=filters.tag_name)
9292

93-
if ordering and ordering.lstrip("-") == "created_at":
93+
if ordering:
9494
return releases.order_by(ordering, "id")
95-
return releases.order_by(ordering or "-published_at", "-created_at", "id")
95+
return releases.order_by("-published_at", "-created_at", "id")
9696

9797

9898
@router.get(

backend/apps/api/rest/v0/repository.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@ def list_repository(
7272
if filters.organization_id:
7373
repositories = repositories.filter(organization__login__iexact=filters.organization_id)
7474

75-
if ordering and ordering.lstrip("-") == "updated_at":
75+
if ordering:
7676
return repositories.order_by(ordering, "id")
77-
return repositories.order_by(ordering or "-created_at", "-updated_at", "id")
77+
return repositories.order_by("-created_at", "-updated_at", "id")
7878

7979

8080
@router.get(

backend/tests/apps/api/rest/v0/issue_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def test_list_issues_with_custom_ordering(self, mock_objects):
143143
mock_objects.select_related.assert_called_once_with(
144144
"repository", "repository__organization"
145145
)
146-
mock_select_related.order_by.assert_called_once_with("created_at", "-updated_at", "id")
146+
mock_select_related.order_by.assert_called_once_with("created_at", "id")
147147
assert result == mock_ordered
148148

149149
@patch("apps.api.rest.v0.issue.IssueModel.objects")

backend/tests/apps/api/rest/v0/milestone_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def test_list_milestones_with_custom_ordering(self, mock_objects):
115115
mock_objects.select_related.assert_called_once_with(
116116
"repository", "repository__organization"
117117
)
118-
mock_select_related.order_by.assert_called_once_with("created_at", "-updated_at", "id")
118+
mock_select_related.order_by.assert_called_once_with("created_at", "id")
119119
assert result == mock_ordered
120120

121121
@patch("apps.api.rest.v0.milestone.MilestoneModel.objects")

backend/tests/apps/api/rest/v0/repository_test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_list_repository_with_custom_ordering(self, mock_objects):
5454
result = list_repository(mock_request, filters=mock_filters, ordering="created_at")
5555

5656
mock_objects.select_related.assert_called_once_with("organization")
57-
mock_select.order_by.assert_called_once_with("created_at", "-updated_at", "id")
57+
mock_select.order_by.assert_called_once_with("created_at", "id")
5858
assert result == mock_ordered
5959

6060
@patch("apps.api.rest.v0.repository.RepositoryModel.objects")

0 commit comments

Comments
 (0)