Mid October Update

CHANGELOG.md

@@ -15,8 +15,11 @@
 
 ## Neste versjon
 
-## Versjon 2024.09.25
+## Versjon 2024.10.11
+- ✨ **Tilbakemelding-funksjon**. Man kan nå opprette tilbakemeldinger for bugs og idé.
+- 🦟 **Påmelding**. Det vil nå ikke være mulig med flere påmeldinger på et arrangement enn maksgrensen.
 
+## Versjon 2024.09.25
 - ✨**Codex arrangementer**. Det kan nå opprettes arrangementer på Codex, som medlemmer av Codex kan melde seg på.
 - ⚡**Betalingsordre**. Man kan nå se historikk over betalingsordre for en påmelding til et arrangement.
 - ✨**Gruppe**. HS kan nå opprette en ny gruppe.

app/common/enums.py

@@ -31,6 +31,21 @@ def get_user_class_number(user_class: NativeUserClass) -> int:
     return int(_class.split(".")[0])
 
 
+def get_user_class_name(user_class: int):
+    if user_class == 1:
+        return NativeUserClass.FIRST
+    elif user_class == 2:
+        return NativeUserClass.SECOND
+    elif user_class == 3:
+        return NativeUserClass.THIRD
+    elif user_class == 4:
+        return NativeUserClass.FOURTH
+    elif user_class == 5:
+        return NativeUserClass.FIFTH
+    else:
+        return NativeUserClass.ALUMNI
+
+
 # This can't be removed because it is used in the migrations. It is not used in the code
 class UserStudy(ChoiceEnum):
     DATAING = "Dataingeniør"

app/communication/enums.py

@@ -18,3 +18,9 @@ class UserNotificationSettingType(models.TextChoices):
     RESERVATION_NEW = "RESERVATION NEW", "Ny reservasjon"
     RESERVATION_APPROVED = "RESERVATION APPROVED", "Godkjent reservasjon"
     RESERVATION_CANCELLED = "RESERVATION CANCELLED", "Avslått reservasjon"
+    KONTRES = "KONTRES", "Kontres"
+    BLITZED = "BLITZED", "Blitzed"
+
+    @classmethod
+    def get_kontres_and_blitzed(cls):
+        return [cls.KONTRES, cls.BLITZED]

app/communication/migrations/0011_alter_usernotificationsetting_notification_type.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.5 on 2024-09-23 18:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("communication", "0010_alter_usernotificationsetting_notification_type"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="usernotificationsetting",
+            name="notification_type",
+            field=models.CharField(
+                choices=[
+                    ("REGISTRATION", "Påmeldingsoppdateringer"),
+                    ("UNREGISTRATION", "Avmeldingsoppdateringer"),
+                    ("STRIKE", "Prikkoppdateringer"),
+                    ("EVENT_SIGN_UP_START", "Arrangementer - påmeldingsstart"),
+                    ("EVENT_SIGN_OFF_DEADLINE", "Arrangementer - avmeldingsfrist"),
+                    ("EVENT_EVALUATION", "Arrangementer - evaluering"),
+                    ("EVENT_INFO", "Arrangementer - info fra arrangør"),
+                    ("FINE", "Grupper - bot"),
+                    ("GROUP_MEMBERSHIP", "Grupper - medlemsskap"),
+                    ("OTHER", "Andre"),
+                    ("RESERVATION NEW", "Ny reservasjon"),
+                    ("RESERVATION APPROVED", "Godkjent reservasjon"),
+                    ("RESERVATION CANCELLED", "Avslått reservasjon"),
+                    ("KONTRES", "Kontres"),
+                    ("BLITZED", "Blitzed"),
+                ],
+                max_length=30,
+            ),
+        ),
+    ]

app/communication/tests/test_send_email.py

@@ -0,0 +1,216 @@
+import os
+from unittest.mock import patch
+
+from rest_framework import status
+
+import pytest
+
+from app.communication.enums import UserNotificationSettingType
+from app.communication.notifier import Notify
+from app.content.factories import UserFactory
+from app.util.test_utils import get_api_client
+
+EMAIL_URL = "/send-email/"
+EMAIL_API_KEY = os.environ.get("EMAIL_API_KEY")
+
+
+def _get_email_url():
+    return f"{EMAIL_URL}"
+
+
+@pytest.mark.django_db
+@patch.object(Notify, "send", return_value=None)
+def test_send_email_success(mock_send):
+    """
+    Test that the send_email endpoint sends an email successfully.
+    """
+    test_user = UserFactory()
+
+    data = {
+        "user_id_list": [test_user.user_id],
+        "notification_type": "KONTRES",
+        "title": "Test Notification",
+        "paragraphs": ["This is a test paragraph.", "This is another paragraph."],
+    }
+
+    client = get_api_client(user=test_user)
+    url = _get_email_url()
+    headers = {"api_key": EMAIL_API_KEY}
+    response = client.post(url, data, format="json", **headers)
+
+    assert response.status_code == status.HTTP_201_CREATED
+    mock_send.assert_called_once()
+
+
+@pytest.mark.django_db
+@patch.object(Notify, "send", return_value=None)
+def test_send_email_fails_when_field_missing(mock_send):
+    """
+    Test that the send_email endpoint returns 400 when one of the fields is missing.
+    """
+    test_user = UserFactory()
+
+    data = {
+        "user_id_list": [test_user.user_id],
+        "title": "Test Notification",
+        "paragraphs": ["This is a test paragraph.", "This is another paragraph."],
+    }
+
+    client = get_api_client(user=test_user)
+    url = _get_email_url()
+    headers = {"api_key": EMAIL_API_KEY}
+    response = client.post(url, data, format="json", **headers)
+
+    assert response.status_code == status.HTTP_400_BAD_REQUEST
+    mock_send.assert_not_called()
+
+
+@pytest.mark.django_db
+@patch.object(Notify, "send", return_value=None)
+def test_send_email_fails_when_wrong_api_key(mock_send):
+    """
+    Test that the send_email endpoint returns 403 when the API key is invalid.
+    """
+    test_user = UserFactory()
+
+    data = {
+        "user_id_list": [test_user.user_id],
+        "notification_type": "KONTRES",
+        "title": "Test Notification",
+        "paragraphs": ["This is a test paragraph.", "This is another paragraph."],
+    }
+
+    client = get_api_client(user=test_user)
+    url = _get_email_url()
+    headers = {"api_key": "wrong_key"}
+    response = client.post(url, data, format="json", **headers)
+
+    assert response.status_code == status.HTTP_403_FORBIDDEN
+    mock_send.assert_not_called()
+
+
+@pytest.mark.django_db
+@patch.object(Notify, "send", return_value=None)
+def test_send_email_fails_when_user_id_invalid(mock_send):
+    """
+    Test that the send_email endpoint returns 404 when the user id is invalid.
+    """
+    test_user = UserFactory()
+
+    data = {
+        "user_id_list": [999],
+        "notification_type": "KONTRES",
+        "title": "Test Notification",
+        "paragraphs": ["This is a test paragraph.", "This is another paragraph."],
+    }
+
+    client = get_api_client(user=test_user)
+    url = _get_email_url()
+    headers = {"api_key": EMAIL_API_KEY}
+    response = client.post(url, data, format="json", **headers)
+
+    assert response.status_code == status.HTTP_404_NOT_FOUND
+    mock_send.assert_not_called()
+
+
+@pytest.mark.django_db
+@patch.object(Notify, "send", return_value=None)
+@pytest.mark.parametrize(
+    "notification_type", UserNotificationSettingType.get_kontres_and_blitzed()
+)
+def test_email_success_with_kontres_and_blitzed(mock_send, notification_type):
+    """
+    Tests that the send_email endpoint works with both KONTRES and BLITZED notification types.
+    """
+    test_user = UserFactory()
+
+    data = {
+        "user_id_list": [test_user.user_id],
+        "notification_type": notification_type,
+        "title": "Test Notification",
+        "paragraphs": ["This is a test paragraph.", "This is another paragraph."],
+    }
+
+    client = get_api_client(user=test_user)
+    url = _get_email_url()
+    headers = {"api_key": EMAIL_API_KEY}
+    response = client.post(url, data, format="json", **headers)
+
+    assert response.status_code == status.HTTP_201_CREATED
+    mock_send.assert_called_once()
+
+
+@pytest.mark.django_db
+@patch.object(Notify, "send", return_value=None)
+def test_send_email_success_with_user_id_list(mock_send):
+    """
+    Test that the send_email endpoint sends an email successfully to a list of users.
+    """
+    test_user1 = UserFactory()
+    test_user2 = UserFactory()
+    test_user3 = UserFactory()
+
+    data = {
+        "user_id_list": [
+            test_user.user_id for test_user in [test_user1, test_user2, test_user3]
+        ],
+        "notification_type": "KONTRES",
+        "title": "Test Notification",
+        "paragraphs": ["This is a test paragraph.", "This is another paragraph."],
+    }
+
+    client = get_api_client(user=test_user1)
+    url = _get_email_url()
+    headers = {"api_key": EMAIL_API_KEY}
+    response = client.post(url, data, format="json", **headers)
+
+    assert response.status_code == status.HTTP_201_CREATED
+    mock_send.assert_called_once()
+
+
+@pytest.mark.django_db
+@patch.object(Notify, "send", return_value=None)
+def test_send_email_fails_when_user_id_list_is_empty(mock_send):
+    """
+    Test that the send_email endpoint returns 400 when the user id list is empty.
+    """
+    test_user = UserFactory()
+
+    data = {
+        "user_id_list": [],
+        "notification_type": "KONTRES",
+        "title": "Test Notification",
+        "paragraphs": ["This is a test paragraph.", "This is another paragraph."],
+    }
+
+    client = get_api_client(user=test_user)
+    url = _get_email_url()
+    headers = {"api_key": EMAIL_API_KEY}
+    response = client.post(url, data, format="json", **headers)
+
+    assert response.status_code == status.HTTP_400_BAD_REQUEST
+    mock_send.assert_not_called()
+
+
+@pytest.mark.django_db
+@patch.object(Notify, "send", return_value=None)
+def test_send_email_fails_when_user_paragraph_list_is_empty(mock_send):
+    """
+    Test that the send_email endpoint returns 400 when the paragraph list is empty.
+    """
+    test_user = UserFactory()
+
+    data = {
+        "user_id_list": [test_user.user_id],
+        "notification_type": "KONTRES",
+        "title": "Test Notification",
+        "paragraphs": [],
+    }
+
+    client = get_api_client(user=test_user)
+    url = _get_email_url()
+    headers = {"api_key": EMAIL_API_KEY}
+    response = client.post(url, data, format="json", **headers)
+
+    assert response.status_code == status.HTTP_400_BAD_REQUEST
+    mock_send.assert_not_called()

app/content/serializers/user.py

@@ -127,6 +127,7 @@ class Meta:
             "user_id",
             "first_name",
             "last_name",
+            "image",
         )
 
 

app/content/urls.py

@@ -20,6 +20,7 @@
     accept_form,
     delete,
     register_with_feide,
+    send_email,
     upload,
 )
 
@@ -53,6 +54,7 @@
     re_path(r"", include(router.urls)),
     path("accept-form/", accept_form),
     path("upload/", upload),
+    path("send-email/", send_email),
     path("delete-file/<str:container_name>/<str:blob_name>/", delete),
     path("feide/", register_with_feide),
     re_path(r"users/(?P<user_id>[^/.]+)/events.ics", UserCalendarEvents()),

app/content/views/__init__.py

@@ -16,3 +16,4 @@
 from app.content.views.logentry import LogEntryViewSet
 from app.content.views.minute import MinuteViewSet
 from app.content.views.feide import register_with_feide
+from app.content.views.send_email import send_email

app/content/views/cheatsheet.py

@@ -4,7 +4,8 @@
 
 from sentry_sdk import capture_exception
 
-from app.common.enums import UserClass, UserStudy
+from app.common.enums import NativeUserStudy as UserStudy
+from app.common.enums import get_user_class_name
 from app.common.pagination import BasePagination
 from app.common.permissions import BasicViewPermission, is_admin_user
 from app.common.viewsets import BaseViewSet
@@ -24,8 +25,9 @@ class CheatsheetViewSet(BaseViewSet):
 
     def get_object(self):
         if "pk" not in self.kwargs:
+            grade = get_user_class_name(int(self.kwargs["grade"]))
             return self.filter_queryset(self.queryset).filter(
-                grade=UserClass(int(self.kwargs["grade"])),
+                grade=grade,
                 study=UserStudy[self.kwargs["study"]],
             )
 

app/content/views/registration.py

@@ -1,5 +1,6 @@
 import uuid
 
+from django.db.transaction import atomic
 from django.shortcuts import get_object_or_404
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import filters, status
@@ -48,6 +49,7 @@ def _is_own_registration(self):
     def _is_not_own_registration(self):
         return not self._is_own_registration()
 
+    @atomic
     def create(self, request, *args, **kwargs):
         """Register the current user for the given event."""
 
@@ -68,7 +70,7 @@ def create(self, request, *args, **kwargs):
         serializer.is_valid(raise_exception=True)
 
         event_id = self.kwargs.get("event_id", None)
-        event = Event.objects.get(pk=event_id)
+        event = Event.objects.select_for_update().get(pk=event_id)
 
         registration = super().perform_create(
             serializer, event=event, user=request.user