Fix up and format

lego/api/urls.py

@@ -1,12 +1,11 @@
 from django.conf import settings
 from django.conf.urls import include
-from .v1 import urlpatterns as v1_urlpatterns
 from django.http import Http404, HttpResponseRedirect
 from django.urls import re_path, resolve
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import RedirectView
 
-from .v1 import router as v1
+from .v1 import urlpatterns as v1_urlpatterns
 
 
 @csrf_exempt

lego/api/v1.py

@@ -1,5 +1,6 @@
-from rest_framework import routers
 from django.urls import include, path
+from rest_framework import routers
+
 from lego.apps.articles.views import ArticlesViewSet
 from lego.apps.comments.views import CommentViewSet
 from lego.apps.companies.views import (
@@ -33,8 +34,8 @@
     FollowEventViewSet,
     FollowUserViewSet,
 )
-from lego.apps.forums.views import ForumsViewSet, ThreadViewSet
 from lego.apps.forums.urls import urlpatterns as forums_urls
+from lego.apps.forums.views import ForumsViewSet, ThreadViewSet
 from lego.apps.frontpage.views import FrontpageViewSet
 from lego.apps.gallery.views import GalleryPictureViewSet, GalleryViewSet
 from lego.apps.ical.viewsets import ICalTokenViewset, ICalViewset
@@ -207,6 +208,6 @@
 router.register(r"webhooks-stripe", StripeWebhook, basename="webhooks-stripe")
 
 urlpatterns = [
-    path('', include(router.urls)),  
-    path('forums/', include((forums_urls, 'forums'))), 
+    path("", include(router.urls)),
+    path("forums/", include((forums_urls, "forums"))),
 ]

lego/apps/forums/admin.py

@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.

lego/apps/forums/models.py

@@ -1,10 +1,8 @@
-from django.conf import settings
-from django.db.models import CASCADE, ForeignKey, PositiveIntegerField
+from django.db.models import CASCADE, ForeignKey
 
 from lego.apps.content.models import Content
 from lego.apps.forums.permissions import ForumPermissionHandler, ThreadPermissionHandler
 from lego.apps.permissions.models import ObjectPermissionsModel
-from lego.apps.users.models import User
 from lego.utils.models import BasisModel
 
 
@@ -16,7 +14,6 @@ class Meta:
 
 class Thread(Content, BasisModel, ObjectPermissionsModel):
     forum = ForeignKey(Forum, on_delete=CASCADE, related_name="threads")
-    sticky = PositiveIntegerField(default=0, blank=True)
 
     class Meta:
         abstract = False

lego/apps/forums/permissions.py

@@ -1,8 +1,5 @@
-from django.db.models import Q
-
 from lego.apps.permissions.constants import CREATE, DELETE, EDIT, LIST, VIEW
 from lego.apps.permissions.permissions import PermissionHandler
-from lego.apps.permissions.utils import get_permission_handler
 
 
 class ForumPermissionHandler(PermissionHandler):
@@ -20,10 +17,9 @@ def has_perm(
         check_keyword_permissions=True,
         **kwargs
     ):
-
         if perm == LIST:
             return True
-        
+
         if not user.is_authenticated:
             return False
 

lego/apps/forums/serializers.py

@@ -3,12 +3,7 @@
 
 from lego.apps.comments.serializers import CommentSerializer
 from lego.apps.content.fields import ContentSerializerField
-from lego.apps.files.fields import ImageField
 from lego.apps.forums.models import Forum, Thread
-from lego.apps.polls.serializers import DetailedPollSerializer
-from lego.apps.tags.serializers import TagSerializerMixin
-from lego.apps.users.fields import PublicUserField
-from lego.apps.users.models import User
 from lego.apps.users.serializers.users import PublicUserSerializer
 from lego.utils.serializers import (
     BasisModelSerializer,
@@ -23,6 +18,7 @@ class DetailedThreadSerializer(BasisModelSerializer):
     content_target = CharField(read_only=True)
     content = ContentSerializerField(source="text", required=True)
     sticky = serializers.IntegerField(default=0, required=False)
+
     class Meta:
         model = Thread
         fields = (
@@ -34,7 +30,7 @@ class Meta:
             "forum",
             "created_by",
             "content_target",
-            "sticky"
+            "sticky",
         )
 
 
@@ -65,7 +61,15 @@ class DetailedForumSerializer(BasisModelSerializer):
 
     class Meta:
         model = Forum
-        fields = ("id", "title", "description", "created_at", "threads", "created_by", "content_target")
+        fields = (
+            "id",
+            "title",
+            "description",
+            "created_at",
+            "threads",
+            "created_by",
+            "content_target",
+        )
 
 
 class DetailedAdminForumSerializer(
@@ -80,7 +84,6 @@ class Meta:
 
 
 class PublicForumSerializer(BasisModelSerializer):
-
     class Meta:
         model = Forum
         fields = (

lego/apps/forums/tests.py

@@ -1,5 +1,3 @@
-import uuid
-
 from django.urls import reverse
 from rest_framework import status
 
@@ -168,6 +166,3 @@ def test_post_comment_authenticated_user(self):
         }
         response = self.client.post(get_comment_list_url(), comment_data)
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
-
-
-# Further tests for specific user roles, permissions on actions like editing or deleting threads/comments, etc., would follow a similar pattern.

lego/apps/forums/urls.py

@@ -1,9 +1,25 @@
 # forums/urls.py
 
 from django.urls import path
-from .views import ThreadViewSet, ForumsViewSet
+
+from .views import ThreadViewSet
 
 urlpatterns = [
-    path('<int:forum_id>/threads/', ThreadViewSet.as_view({'get': 'list', 'post': 'create'}), name='forum-threads-list'),
-    path('<int:forum_id>/threads/<int:pk>/', ThreadViewSet.as_view({'get': 'retrieve', 'put': 'update', 'patch': 'partial_update', 'delete': 'destroy'}), name='forum-thread-detail'),
+    path(
+        "<int:forum_id>/threads/",
+        ThreadViewSet.as_view({"get": "list", "post": "create"}),
+        name="forum-threads-list",
+    ),
+    path(
+        "<int:forum_id>/threads/<int:pk>/",
+        ThreadViewSet.as_view(
+            {
+                "get": "retrieve",
+                "put": "update",
+                "patch": "partial_update",
+                "delete": "destroy",
+            }
+        ),
+        name="forum-thread-detail",
+    ),
 ]

lego/apps/forums/views.py

@@ -1,8 +1,7 @@
 from django.http import Http404
 from django.shortcuts import get_object_or_404
-from rest_framework import status, viewsets
+from rest_framework import viewsets
 from rest_framework.exceptions import NotAuthenticated, PermissionDenied
-from rest_framework.response import Response
 
 from lego.apps.forums.models import Forum, Thread
 from lego.apps.forums.serializers import (
@@ -21,7 +20,6 @@ class ForumsViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):
     queryset = Forum.objects.all()
     ordering = "-created_at"
     serializer_class = DetailedForumSerializer
-
 
     def get_serializer_class(self):
         if self.action == "list":
@@ -54,7 +52,7 @@ class ThreadViewSet(AllowedPermissionsMixin, viewsets.ModelViewSet):
 
     def get_queryset(self):
         queryset = super().get_queryset().select_related("created_by")
-        forum_id = self.kwargs.get('forum_id', None)
+        forum_id = self.kwargs.get("forum_id", None)
         if forum_id:
             queryset = queryset.filter(forum_id=forum_id)
 

lego/utils/views.py

@@ -21,7 +21,13 @@ def list(self, request):
         site_meta = settings.SITE
 
         # Allow non-logged in users to see these as well:
-        allow_anonymous_entities = ["events", "articles", "joblistings", "galleries", "forums"]
+        allow_anonymous_entities = [
+            "events",
+            "articles",
+            "joblistings",
+            "galleries",
+            "forums",
+        ]
 
         # Whereas these require that a user has keyword permissions:
         permission_entities = {