aboutsummaryrefslogtreecommitdiffstats
path: root/pydis_site
diff options
context:
space:
mode:
authorGravatar Sebastiaan Zeeff <[email protected]>2019-09-26 16:30:12 +0200
committerGravatar Sebastiaan Zeeff <[email protected]>2019-09-26 16:36:47 +0200
commitce22f1e0a67f47aca48b5c548d7d1a544b9fe71d (patch)
tree1c1ecbe6349845e1c1e93220313ae2294afa7012 /pydis_site
parentMigrate hidden warnings to notes (diff)
Reject unhidden note or hidden warning infraction
https://github.com/python-discord/site/issues/260 This commit adds validation steps to the InfractionSerializer to make sure that `"warning"` infractions can never be set with `hidden=True` and note infractions can never be set with `hidden=False` usng the API. This is the final step in decoupling "note" infractions and "warning" infractions. This commit implements the final part of and closes #260
Diffstat (limited to 'pydis_site')
-rw-r--r--pydis_site/apps/api/serializers.py5
-rw-r--r--pydis_site/apps/api/tests/test_infractions.py48
2 files changed, 38 insertions, 15 deletions
diff --git a/pydis_site/apps/api/serializers.py b/pydis_site/apps/api/serializers.py
index 5466b06b..326e20e1 100644
--- a/pydis_site/apps/api/serializers.py
+++ b/pydis_site/apps/api/serializers.py
@@ -115,9 +115,12 @@ class InfractionSerializer(ModelSerializer):
raise ValidationError({'expires_at': [f'{infr_type} infractions cannot expire.']})
hidden = attrs.get('hidden')
- if hidden and infr_type in ('superstar',):
+ if hidden and infr_type in ('superstar', 'warning'):
raise ValidationError({'hidden': [f'{infr_type} infractions cannot be hidden.']})
+ if not hidden and infr_type in ('note', ):
+ raise ValidationError({'hidden': [f'{infr_type} infractions must be hidden.']})
+
return attrs
diff --git a/pydis_site/apps/api/tests/test_infractions.py b/pydis_site/apps/api/tests/test_infractions.py
index 0092d355..c58c32e2 100644
--- a/pydis_site/apps/api/tests/test_infractions.py
+++ b/pydis_site/apps/api/tests/test_infractions.py
@@ -257,32 +257,52 @@ class CreationTests(APISubdomainTestCase):
def test_returns_400_for_expiring_non_expirable_type(self):
url = reverse('bot:infraction-list', host='api')
- data = {
- 'user': self.user.id,
- 'actor': self.user.id,
- 'type': 'kick',
- 'expires_at': '5018-11-20T15:52:00+00:00'
- }
- response = self.client.post(url, data=data)
- self.assertEqual(response.status_code, 400)
- self.assertEqual(response.json(), {
- 'expires_at': [f'{data["type"]} infractions cannot expire.']
- })
+ for infraction_type in ('kick', 'warning'):
+ data = {
+ 'user': self.user.id,
+ 'actor': self.user.id,
+ 'type': infraction_type,
+ 'expires_at': '5018-11-20T15:52:00+00:00'
+ }
+
+ response = self.client.post(url, data=data)
+ self.assertEqual(response.status_code, 400)
+ self.assertEqual(response.json(), {
+ 'expires_at': [f'{data["type"]} infractions cannot expire.']
+ })
def test_returns_400_for_hidden_non_hideable_type(self):
url = reverse('bot:infraction-list', host='api')
+
+ for infraction_type in ('superstar', 'warning'):
+ data = {
+ 'user': self.user.id,
+ 'actor': self.user.id,
+ 'type': infraction_type,
+ 'hidden': True
+ }
+
+ response = self.client.post(url, data=data)
+ self.assertEqual(response.status_code, 400)
+ self.assertEqual(response.json(), {
+ 'hidden': [f'{data["type"]} infractions cannot be hidden.']
+ })
+
+ def test_returns_400_for_non_hidden_required_hidden_type(self):
+ url = reverse('bot:infraction-list', host='api')
+
data = {
'user': self.user.id,
'actor': self.user.id,
- 'type': 'superstar',
- 'hidden': True
+ 'type': 'note',
+ 'hidden': False,
}
response = self.client.post(url, data=data)
self.assertEqual(response.status_code, 400)
self.assertEqual(response.json(), {
- 'hidden': [f'{data["type"]} infractions cannot be hidden.']
+ 'hidden': [f'{data["type"]} infractions must be hidden.']
})