Mid Septemer Update

CHANGELOG.md

@@ -14,6 +14,9 @@
 
 ## Neste versjon
 
+## Versjon 2024.09.14
+- ⚡**Codex**. Det er nå et skille mellom dokumenter opprettet av Drift og Index.
+
 ## Versjon 2024.08.21
 - ⚡**Nyheter**. Ledere av komiteer kan nå opprette nyheter.
 - ⚡**Forms**. Alle ledere av grupper kan nå opprette gruppe spørreskjemaer.

app/common/enums.py

@@ -1,5 +1,7 @@
 from enum import Enum
 
+from django.db import models
+
 from enumchoicefield import ChoiceEnum
 
 
@@ -44,6 +46,7 @@ class Groups(ChoiceEnum):
     REDAKSJONEN = "Redaksjonen"
     FONDET = "Forvaltningsgruppen"
     PLASK = "Plask"
+    DRIFT = "Drift"
 
 
 class AppModel(ChoiceEnum):
@@ -106,3 +109,16 @@ class StrikeEnum(ChoiceEnum):
     LATE = "LATE"
     BAD_BEHAVIOR = "BAD_BEHAVIOR"
     EVAL_FORM = "EVAL_FORM"
+
+
+class CodexGroups(models.TextChoices):
+    DRIFT = "Drift"
+    INDEX = "Index"
+
+    @classmethod
+    def all(cls) -> list:
+        return [cls.DRIFT, cls.INDEX]
+
+    @classmethod
+    def reverse(cls) -> list:
+        return [cls.INDEX, cls.DRIFT]

app/common/permissions.py

@@ -63,6 +63,24 @@ def check_has_access(groups_with_access, request):
     return False
 
 
+def check_has_full_access(groups_with_access: list[str], request):
+    """Check if user has access to all groups"""
+    set_user_id(request)
+    user = request.user
+
+    if not user:
+        return False
+
+    try:
+        groups = map(str, groups_with_access)
+        return user and user.memberships.filter(
+            group__slug__iregex=r"(" + "|".join(groups) + ")"
+        ).count() == len(groups_with_access)
+    except Exception as e:
+        capture_exception(e)
+    return False
+
+
 def set_user_id(request):
     # If the id and user of the request is already set, return
     if (hasattr(request, "id") and request.id) and (

app/content/factories/minute_factory.py

@@ -3,6 +3,7 @@
 
 from app.content.factories.user_factory import UserFactory
 from app.content.models.minute import Minute
+from app.group.factories.group_factory import GroupFactory
 
 
 class MinuteFactory(DjangoModelFactory):
@@ -12,3 +13,4 @@ class Meta:
     title = factory.Faker("sentence", nb_words=4)
     content = factory.Faker("text")
     author = factory.SubFactory(UserFactory)
+    group = factory.SubFactory(GroupFactory)

app/content/migrations/0066_minute_group.py

@@ -0,0 +1,27 @@
+# Generated by Django 4.2.5 on 2024-09-12 14:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("group", "0018_fine_defense"),
+        ("content", "0065_merge_0060_minute_tag_0064_alter_userbio_description"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="minute",
+            name="group",
+            field=models.ForeignKey(
+                blank=True,
+                default=None,
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="meeting_minutes",
+                to="group.group",
+            ),
+        ),
+    ]

app/content/migrations/0067_alter_minute_group.py

@@ -0,0 +1,28 @@
+# Generated by Django 4.2.5 on 2024-09-13 06:11
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("group", "0018_fine_defense"),
+        ("content", "0066_minute_group"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="minute",
+            name="group",
+            field=models.ForeignKey(
+                blank=True,
+                choices=[("Drift", "Drift"), ("Index", "Index")],
+                default="Index",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="meeting_minutes",
+                to="group.group",
+            ),
+        ),
+    ]

app/content/models/minute.py

@@ -1,15 +1,16 @@
 from django.db import models
 
-from app.common.enums import AdminGroup
-from app.common.permissions import BasePermissionModel
+from app.common.enums import CodexGroups
+from app.common.permissions import BasePermissionModel, check_has_access
 from app.content.enums import MinuteTagEnum
 from app.content.models.user import User
+from app.group.models import Group
 from app.util.models import BaseModel
 
 
 class Minute(BaseModel, BasePermissionModel):
-    write_access = (AdminGroup.INDEX,)
-    read_access = (AdminGroup.INDEX,)
+    write_access = CodexGroups.all()
+    read_access = CodexGroups.all()
 
     title = models.CharField(max_length=200)
     content = models.TextField(default="", blank=True)
@@ -24,6 +25,22 @@ class Minute(BaseModel, BasePermissionModel):
         on_delete=models.SET_NULL,
         related_name="meeting_minutes",
     )
+    group = models.ForeignKey(
+        Group,
+        blank=True,
+        null=True,
+        default=CodexGroups.INDEX,
+        choices=CodexGroups.choices,
+        on_delete=models.SET_NULL,
+        related_name="meeting_minutes",
+    )
+
+    @classmethod
+    def has_create_permission(cls, request):
+        data = request.data
+        if "group" in data:
+            return check_has_access([data["group"]], request)
+        return False
 
     @classmethod
     def has_update_permission(cls, request):
@@ -41,10 +58,13 @@ def has_object_read_permission(self, request):
         return self.has_read_permission(request)
 
     def has_object_update_permission(self, request):
-        return self.has_write_permission(request)
+        data = request.data
+        if "group" in data:
+            return check_has_access([data["group"]], request)
+        return False
 
     def has_object_destroy_permission(self, request):
-        return self.has_write_permission(request)
+        return check_has_access([self.group.slug], request)
 
     def has_object_retrieve_permission(self, request):
         return self.has_read_permission(request)

app/content/serializers/minute.py

@@ -1,6 +1,7 @@
 from rest_framework import serializers
 
 from app.content.models import Minute, User
+from app.group.serializers import SimpleGroupSerializer
 
 
 class SimpleUserSerializer(serializers.ModelSerializer):
@@ -12,7 +13,7 @@ class Meta:
 class MinuteCreateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Minute
-        fields = ("title", "content", "tag")
+        fields = ("title", "content", "tag", "group")
 
     def create(self, validated_data):
         author = self.context["request"].user
@@ -22,24 +23,35 @@ def create(self, validated_data):
 
 class MinuteSerializer(serializers.ModelSerializer):
     author = SimpleUserSerializer(read_only=True)
+    group = SimpleGroupSerializer(read_only=True)
 
     class Meta:
         model = Minute
-        fields = ("id", "title", "content", "author", "created_at", "updated_at", "tag")
+        fields = (
+            "id",
+            "title",
+            "content",
+            "author",
+            "created_at",
+            "updated_at",
+            "tag",
+            "group",
+        )
 
 
 class MinuteUpdateSerializer(serializers.ModelSerializer):
     class Meta:
         model = Minute
-        fields = ("id", "title", "content", "tag")
+        fields = ("id", "title", "content", "tag", "group")
 
     def update(self, instance, validated_data):
         return super().update(instance, validated_data)
 
 
 class MinuteListSerializer(serializers.ModelSerializer):
     author = SimpleUserSerializer(read_only=True)
+    group = SimpleGroupSerializer(read_only=True)
 
     class Meta:
         model = Minute
-        fields = ("id", "title", "author", "created_at", "updated_at", "tag")
+        fields = ("id", "title", "author", "created_at", "updated_at", "tag", "group")

app/content/views/minute.py

@@ -1,9 +1,15 @@
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import filters, status
+from rest_framework.exceptions import NotFound
 from rest_framework.response import Response
 
+from app.common.enums import CodexGroups
 from app.common.pagination import BasePagination
-from app.common.permissions import BasicViewPermission
+from app.common.permissions import (
+    BasicViewPermission,
+    check_has_access,
+    check_has_full_access,
+)
 from app.common.viewsets import BaseViewSet
 from app.content.filters import MinuteFilter
 from app.content.models import Minute
@@ -30,6 +36,16 @@ class MinuteViewSet(BaseViewSet):
         "author__user_id",
     ]
 
+    def get_queryset(self):
+        if check_has_full_access(CodexGroups.all(), self.request):
+            return self.queryset
+        elif check_has_access([CodexGroups.DRIFT], self.request):
+            return self.queryset.filter(group=CodexGroups.DRIFT)
+        elif check_has_access([CodexGroups.INDEX], self.request):
+            return self.queryset.filter(group=CodexGroups.INDEX)
+
+        raise NotFound()
+
     def get_serializer_class(self):
         if hasattr(self, "action") and self.action == "list":
             return MinuteListSerializer

app/kontres/views/reservation.py

@@ -85,5 +85,5 @@ def update(self, request, *args, **kwargs):
     def destroy(self, request, *args, **kwargs):
         super().destroy(self, request, *args, **kwargs)
         return Response(
-            {"detail": "Reservasjonen ble slettet."}, status=status.HTTP_204_NO_CONTENT
+            {"detail": "Reservasjonen ble slettet."}, status=status.HTTP_200_OK
         )