Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Generated by Django 2.2.3 on 2019-09-17 14:07

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('api', '0041_add_default_ordering_deleted_messages'),
]

operations = [
migrations.AlterModelOptions(
name='infraction',
options={'ordering': ['-inserted_at']},
),
]
5 changes: 5 additions & 0 deletions pydis_site/apps/api/models/bot/infraction.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,3 +66,8 @@ def __str__(self):
if self.hidden:
s += " (hidden)"
return s

class Meta:
"""Defines the meta options for the infraction model."""

ordering = ['-inserted_at']
5 changes: 3 additions & 2 deletions pydis_site/apps/api/tests/test_infractions.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,16 @@ def setUpTestData(cls): # noqa
)

def test_list_all(self):
"""Tests the list-view, which should be ordered by inserted_at (newest first)."""
url = reverse('bot:infraction-list', host='api')
response = self.client.get(url)

self.assertEqual(response.status_code, 200)
infractions = response.json()

self.assertEqual(len(infractions), 2)
self.assertEqual(infractions[0]['id'], self.ban_hidden.id)
self.assertEqual(infractions[1]['id'], self.ban_inactive.id)
self.assertEqual(infractions[0]['id'], self.ban_inactive.id)
self.assertEqual(infractions[1]['id'], self.ban_hidden.id)

def test_filter_search(self):
url = reverse('bot:infraction-list', host='api')
Expand Down