Late December Update

CHANGELOG.md

@@ -15,6 +15,10 @@
 
 ## Neste versjon
 
+## Versjon 2024.12.26
+- ✨ **Filopplasting**. Det er nå mulig for admin brukere å laste opp- og slette filer.
+- ✨ **Mail endepunkt**. Det er nå laget et endepunkt for å sende mailer.
+
 ## Versjon 2024.11.04
 - 🎨**Overordnet**. Endret variabel og funksjonsnavn til å følge konvensjoner og andre små endringer.
 - ✨ **Filtrering**. Admin kan nå filtere deltakere av et arrangement på studie, studieår, om deltakere har allergier, (om deltakere godtar å bli tatt bilde av, om deltakere har ankommet), i tillegg til søk på fornavn og etternavn.

app/common/serializers.py

@@ -7,4 +7,6 @@ class BaseModelSerializer(serializers.ModelSerializer):
     def update(self, instance, validated_data):
         if hasattr(instance, "image") and "image" in validated_data:
             replace_file(instance.image, validated_data.get("image", None))
+        if hasattr(instance, "file") and "file" in validated_data:
+            replace_file(instance.file, validated_data.get("file", None))
         return super().update(instance, validated_data)

app/communication/models/mail.py

@@ -40,5 +40,7 @@ def send(self, connection):
         return is_success
 
     def __str__(self):
-        return (f"\"{self.subject}\", to {self.users.all()[0] if self.users.count() == 1 else f'{self.users.count()} users'}, "
-                f"{'sent' if self.sent else 'eta'} {self.eta}")
+        return (
+            f"\"{self.subject}\", to {self.users.all()[0] if self.users.count() == 1 else f'{self.users.count()} users'}, "
+            f"{'sent' if self.sent else 'eta'} {self.eta}"
+        )

app/constants.py

@@ -20,4 +20,6 @@
 SLACK_BEDPRES_OG_KURS_CHANNEL_ID = "C01DCSJ8X2Q"
 SLACK_ARRANGEMENTER_CHANNEL_ID = "C01LFEFJFV3"
 
+MAX_GALLERY_SIZE = 50
+
 # TODO: Create api-urls as constants which then can be used in for example tests and urls.py files

app/content/urls.py

@@ -18,11 +18,10 @@
     UserCalendarEvents,
     UserViewSet,
     accept_form,
-    delete,
     register_with_feide,
     send_email,
-    upload,
 )
+from app.files.views.upload import delete, upload
 
 router = routers.DefaultRouter()
 
@@ -54,8 +53,8 @@
     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("send-email/", send_email),
     path("feide/", register_with_feide),
     re_path(r"users/(?P<user_id>[^/.]+)/events.ics", UserCalendarEvents()),
 ]

app/content/util/event_utils.py

@@ -3,9 +3,9 @@
 from app.content.exceptions import RefundFailedError
 from app.payment.tasks import check_if_has_paid
 from app.payment.util.payment_utils import (
+    check_access_token,
     initiate_payment,
     refund_payment,
-    check_access_token
 )
 
 

app/content/views/__init__.py

@@ -8,7 +8,6 @@
 from app.content.views.news import NewsViewSet
 from app.content.views.page import PageViewSet
 from app.content.views.short_link import ShortLinkViewSet
-from app.content.views.upload import upload, delete
 from app.content.views.strike import StrikeViewSet
 from app.content.views.toddel import ToddelViewSet
 from app.content.views.qr_code import QRCodeViewSet

app/content/views/accept_form.py

@@ -23,9 +23,11 @@ def accept_form(request):
             if len(types) == 1 and types[0].lower() == "annonse"
             else MAIL_NOK_LEADER
         )
-        title = (f"{body['info']['bedrift']} vil ha {', '.join(types[:-1])}"
-                 f"{' og ' if len(types) > 1 else ''}{', '.join(types[-1:])}, "
-                 f"{', '.join(times[:-1])}{' og ' if len(times) > 1 else ''}{', '.join(times[-1:])}")
+        title = (
+            f"{body['info']['bedrift']} vil ha {', '.join(types[:-1])}"
+            f"{' og ' if len(types) > 1 else ''}{', '.join(types[-1:])}, "
+            f"{', '.join(times[:-1])}{' og ' if len(times) > 1 else ''}{', '.join(times[-1:])}"
+        )
 
         is_success = send_html_email(
             to_mails=[to_mail],

app/content/views/registration.py

@@ -13,6 +13,7 @@
 from app.common.pagination import BasePagination
 from app.common.permissions import (
     BasicViewPermission,
+    check_has_access,
     is_admin_group_user,
     is_admin_user,
 )
@@ -157,20 +158,29 @@ def _admin_unregister(self, registration):
     def add_registration(self, request, *_args, **_kwargs):
         """Add registration to event for admins"""
 
-        if not is_admin_group_user(request):
+        event_id = self.kwargs.get("event_id", None)
+        user_id = request.data["user"]
+
+        event = get_object_or_404(Event, id=event_id)
+        user = get_object_or_404(User, user_id=user_id)
+
+        organizing_group = event.organizer
+
+        is_member_or_leader_of_organizing_group = check_has_access(
+            [organizing_group], request
+        )
+
+        if (
+            not is_admin_group_user(request)
+            and not is_member_or_leader_of_organizing_group
+        ):
             return Response(
                 {
                     "detail": "Du har ikke tillatelse til å opprette en påmelding på dette arrangementet"
                 },
                 status=status.HTTP_403_FORBIDDEN,
             )
 
-        event_id = self.kwargs.get("event_id", None)
-        user_id = request.data["user"]
-
-        event = get_object_or_404(Event, id=event_id)
-        user = get_object_or_404(User, user_id=user_id)
-
         if not user.accepts_event_rules:
             return Response(
                 {

app/content/views/user_bio.py

@@ -49,6 +49,4 @@ def update(self, request, *args, **kwargs):
 
     def destroy(self, request, *args, **kwargs):
         super().destroy(request, *args, **kwargs)
-        return Response(
-            {"detail": "Brukerbio ble slettet"}, status=status.HTTP_200_OK
-        )
+        return Response({"detail": "Brukerbio ble slettet"}, status=status.HTTP_200_OK)

app/content/views/user_calendar_events.py

@@ -23,7 +23,7 @@ def __call__(self, request, *args, **kwargs):
             return JsonResponse(
                 {
                     "detail": "Denne brukeren har skrudd av offentlig deling av påmeldinger til arrangementer. "
-                              "Du kan derfor ikke hente ut brukerens arrangementer som .ics-fil"
+                    "Du kan derfor ikke hente ut brukerens arrangementer som .ics-fil"
                 },
                 status=status.HTTP_403_FORBIDDEN,
             )

app/feedback/factories/bug_factory.py

@@ -11,3 +11,7 @@ class Meta:
 
     title = factory.Sequence(lambda n: f"Bug{n}")
     author = factory.SubFactory(UserFactory)
+    description = factory.Faker("text")
+    url = factory.Faker("url")
+    platform = factory.Faker("word")
+    browser = factory.Faker("word")

app/feedback/factories/idea_factory.py

@@ -11,3 +11,4 @@ class Meta:
 
     title = factory.Sequence(lambda n: f"Idea{n}")
     author = factory.SubFactory(UserFactory)
+    description = factory.Faker("text")

app/feedback/filters/feedback.py

@@ -0,0 +1,46 @@
+from django.db.models import Q
+from django_filters import rest_framework as filters
+from django_filters.rest_framework import OrderingFilter
+
+from app.feedback.models import Feedback
+from app.feedback.models.bug import Bug
+from app.feedback.models.idea import Idea
+
+
+class FeedbackFilter(filters.FilterSet):
+    feedback_type = filters.CharFilter(
+        method="filter_feedback_type", label="List of feedback type"
+    )
+
+    status = filters.CharFilter(
+        method="filter_status",
+        label="List of feedback status",
+    )
+
+    ordering = OrderingFilter(
+        fields=(
+            "created_at",
+            "updated_at",
+        )
+    )
+
+    def filter_feedback_type(self, queryset, _name, feedback_type):
+        if feedback_type == "Idea":
+            return queryset.filter(Q(instance_of=Idea))
+        elif feedback_type == "Bug":
+            return queryset.filter(Q(instance_of=Bug))
+        else:
+            return queryset
+
+    def filter_status(self, queryset, _name, value):
+        return queryset.filter(status=value)
+
+    class Meta:
+        model = Feedback
+        fields = [
+            "title",
+            "author",
+            "status",
+            "created_at",
+            "updated_at",
+        ]

app/feedback/migrations/0002_alter_feedback_options_bug_browser_bug_platform_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.5 on 2024-10-21 18:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("feedback", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="feedback",
+            options={"ordering": ("-created_at",)},
+        ),
+        migrations.AddField(
+            model_name="bug",
+            name="Browser",
+            field=models.CharField(default="", max_length=200),
+        ),
+        migrations.AddField(
+            model_name="bug",
+            name="Platform",
+            field=models.CharField(default="", max_length=200),
+        ),
+        migrations.AddField(
+            model_name="bug",
+            name="Url",
+            field=models.URLField(blank=True, null=True),
+        ),
+    ]

app/feedback/migrations/0003_rename_browser_bug_browser_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.5 on 2024-10-21 22:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("feedback", "0002_alter_feedback_options_bug_browser_bug_platform_and_more"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="bug",
+            old_name="Browser",
+            new_name="browser",
+        ),
+        migrations.RenameField(
+            model_name="bug",
+            old_name="Platform",
+            new_name="platform",
+        ),
+        migrations.RenameField(
+            model_name="bug",
+            old_name="Url",
+            new_name="url",
+        ),
+    ]

app/feedback/models/bug.py

@@ -1,5 +1,9 @@
+from django.db import models
+
 from app.feedback.models.feedback import Feedback
 
 
 class Bug(Feedback):
-    pass
+    url = models.URLField(max_length=200, blank=True, null=True)
+    browser = models.CharField(max_length=200, default="")
+    platform = models.CharField(max_length=200, default="")

app/feedback/models/feedback.py

@@ -26,7 +26,7 @@ def __str__(self):
         return f"{self.title} - {self.status}"
 
     class Meta:
-        ordering = ("created_at",)
+        ordering = ("-created_at",)
 
     @classmethod
     def has_read_permission(cls, request):

app/feedback/serializers/__init__.py

@@ -1,3 +1,11 @@
-from app.feedback.serializers.bug import BugListSerializer
-from app.feedback.serializers.idea import IdeaListSerializer
+from app.feedback.serializers.bug import (
+    BugDetailSerializer,
+    BugCreateSerializer,
+    BugUpdateSerializer,
+)
+from app.feedback.serializers.idea import (
+    IdeaDetailSerializer,
+    IdeaCreateSerializer,
+    IdeaUpdateSerializer,
+)
 from app.feedback.serializers.feedback import FeedbackListPolymorphicSerializer

app/feedback/serializers/bug.py

@@ -3,7 +3,7 @@
 from app.feedback.models.bug import Bug
 
 
-class BugListSerializer(BaseModelSerializer):
+class BugSerializer(BaseModelSerializer):
     author = SimpleUserSerializer(read_only=True)
 
     class Meta:
@@ -14,4 +14,51 @@ class Meta:
             "status",
             "created_at",
             "author",
+            "description",
+        )
+
+
+class BugCreateSerializer(BaseModelSerializer):
+    class Meta:
+        model = Bug
+        fields = (
+            "title",
+            "description",
+        )
+
+    def create(self, validated_data):
+        user = self.context["request"].user
+        validated_data["author"] = user
+
+        return super().create(validated_data)
+
+
+class BugUpdateSerializer(BaseModelSerializer):
+    class Meta:
+        model = Bug
+        fields = (
+            "title",
+            "description",
+            "status",
+        )
+
+        def update(self, instance, validated_data):
+            return super().update(instance, validated_data)
+
+
+class BugDetailSerializer(BaseModelSerializer):
+    author = SimpleUserSerializer(read_only=True)
+
+    class Meta:
+        model = Bug
+        fields = (
+            "id",
+            "title",
+            "description",
+            "status",
+            "created_at",
+            "author",
+            "url",
+            "platform",
+            "browser",
         )