Feature/increase custom throttling rates to 50 per day

account/api/views.py

@@ -24,7 +24,7 @@ class MailRateThrottle(AnonRateThrottle):
     The IP address of the incoming request is used to generate a unique key to throttle against.
     """
 
-    rate = "10/day"
+    rate = "50/day"
 
 
 class ProfileViewSet(UpdateModelMixin, viewsets.GenericViewSet):

account/migrations/0016_order_users_by_date_joined.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.1.13 on 2024-04-30 11:01
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("account", "0015_email_and_mailing_list_jointly_unique"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="user",
+            options={"ordering": ["-date_joined"]},
+        ),
+    ]

account/models.py

@@ -32,6 +32,7 @@ def save(self, *args, **kwargs):
 
     class Meta:
         db_table = "auth_user"
+        ordering = ["-date_joined"]
 
 
 class Profile(models.Model):

account/tests/conftest.py

@@ -2,6 +2,7 @@
 from rest_framework.authtoken.models import Token
 from rest_framework.test import APIClient
 
+from account.api.views import ProfileViewSet
 from account.models import MailingList, MailingListEmail, Profile, User
 from profiles.models import Result
 
@@ -29,7 +30,20 @@ def api_client_with_custom_ip_address(ip_address):
 def users(results):
     [
         User.objects.create(username=f"test{i}", result=results[i % results.count()])
-        for i in range(20)
+        for i in range(4)
+    ]
+    return User.objects.all()
+
+
+@pytest.fixture
+def throttling_users(results):
+    num_users = (
+        int(ProfileViewSet.unsubscribe.kwargs["throttle_classes"][0].rate.split("/")[0])
+        + 2
+    )
+    [
+        User.objects.create(username=f"t_test{i}", result=results[i % results.count()])
+        for i in range(num_users)
     ]
     return User.objects.all()
 
@@ -60,6 +74,6 @@ def mailing_list_emails(mailing_lists):
         MailingListEmail.objects.create(
             email=f"test_{c}@test.com", mailing_list=mailing_lists.first()
         )
-        for c in range(20)
+        for c in range(52)
     ]
     return MailingListEmail.objects.all()

account/tests/test_api.py

@@ -43,7 +43,7 @@ def test_unauthenticated_cannot_do_anything(api_client, users):
 @pytest.mark.parametrize(
     "ip_address",
     [
-        ("199.168.1.40"),
+        ("1.1.1.1"),
     ],
 )
 def test_mailing_list_unsubscribe_throttling(
@@ -59,7 +59,7 @@ def test_mailing_list_unsubscribe_throttling(
         response = api_client_with_custom_ip_address.post(
             url, {"email": f"test_{count}@test.com"}
         )
-        assert response.status_code == 200
+        assert response.status_code == 200, response.content
         count += 1
     time.sleep(2)
     response = api_client_with_custom_ip_address.post(
@@ -245,11 +245,11 @@ def test_mailing_user_has_subscribed(api_client, users, results, mailing_lists):
 @pytest.mark.parametrize(
     "ip_address",
     [
-        ("92.68.21.220"),
+        ("1.1.1.2"),
     ],
 )
 def test_mailing_list_subscribe_throttling(
-    api_client_with_custom_ip_address, mailing_list_emails, users
+    api_client_with_custom_ip_address, throttling_users
 ):
     num_requests = int(
         ProfileViewSet.subscribe.kwargs["throttle_classes"][0].rate.split("/")[0]
@@ -261,15 +261,15 @@ def test_mailing_list_subscribe_throttling(
             url,
             {
                 "email": f"throttlling_test_{count}@test.com",
-                "user": users[count].id,
+                "user": throttling_users[count].id,
             },
         )
-        assert response.status_code == 201
+        assert response.status_code == 201, response.content
         count += 1
 
     time.sleep(2)
     response = api_client_with_custom_ip_address.post(
-        url, {"email": f"test_{count}@test.com", "user": users[count].id}
+        url, {"email": f"test_{count}@test.com", "user": throttling_users[count].id}
     )
     assert response.status_code == 429
 
@@ -322,7 +322,7 @@ def test_mailing_list_subscribe_with_invalid_post_data(
 @pytest.mark.parametrize(
     "ip_address",
     [
-        ("100.1.1.40"),
+        ("1.1.1.3"),
     ],
 )
 def test_mailing_list_unsubscribe(
@@ -343,7 +343,7 @@ def test_mailing_list_unsubscribe(
 @pytest.mark.parametrize(
     "ip_address",
     [
-        ("101.1.1.40"),
+        ("1.1.1.4"),
     ],
 )
 def test_mailing_list_unsubscribe_non_existing_email(
@@ -365,7 +365,7 @@ def test_mailing_list_unsubscribe_non_existing_email(
 @pytest.mark.parametrize(
     "ip_address",
     [
-        ("12.6.121.22"),
+        ("1.1.1.5"),
     ],
 )
 def test_mailing_list_unsubscribe_email_not_provided(
@@ -374,34 +374,3 @@ def test_mailing_list_unsubscribe_email_not_provided(
     url = reverse("account:profiles-unsubscribe")
     response = api_client_with_custom_ip_address.post(url)
     assert response.status_code == 400
-
-
-@pytest.mark.django_db
-@pytest.mark.parametrize(
-    "ip_address",
-    [
-        ("100.19.91.40"),
-    ],
-)
-def test_mailing_list_unique_constraints(api_client_with_custom_ip_address, users):
-    url = reverse("account:profiles-subscribe")
-    user = users.get(username="test1")
-    response = api_client_with_custom_ip_address.post(
-        url, {"email": "[email protected]", "user": user.id}
-    )
-    assert response.status_code == 201
-    assert MailingListEmail.objects.count() == 1
-    # Subscribed as the result (MailingList) is different than for user 'test1'
-    user = users.get(username="test2")
-    response = api_client_with_custom_ip_address.post(
-        url, {"email": "[email protected]", "user": user.id}
-    )
-    assert response.status_code == 201
-    assert MailingListEmail.objects.count() == 2
-    # Fails, as the email and result are not jointly unique.
-    user = users.get(username="test3")
-    response = api_client_with_custom_ip_address.post(
-        url, {"email": "[email protected]", "user": user.id}
-    )
-    assert response.status_code == 400
-    assert MailingListEmail.objects.count() == 2

profiles/api/utils.py

@@ -22,7 +22,7 @@ class StartPollRateThrottle(AnonRateThrottle):
     The IP address of the incoming request is used to generate a unique key to throttle against.
     """
 
-    rate = "10/day"
+    rate = "50/day"
 
 
 class CustomValidationError(ValidationError):