remove some obsolete models

Author: pinwheeeel

core/admin.py

@@ -7,9 +7,6 @@
 from django.contrib.flatpages.models import FlatPage
 from django.db.models import Q, TimeField
 from django.forms import Textarea
-from django.urls import reverse
-from django.utils.html import format_html
-from django.utils.safestring import mark_safe
 from django.utils.translation import gettext_lazy as _
 from martor.widgets import AdminMartorWidget
 from reversion.admin import VersionAdmin
@@ -26,9 +23,8 @@
     UserAdminForm,
     UserCreationAdminForm,
 )
-from .models import Comment, StaffMember
+from .models import StaffMember
 from .utils.actions import (
-    approve_comments,
     archive_page,
     normalize_late_start,
     resend_approval_email,
@@ -42,15 +38,13 @@
     set_event_visible,
     set_post_archived,
     set_post_unarchived,
-    unapprove_comments,
     wipe_club_bios,
 )
 from .utils.admin import generic_post_formfield_for_manytomany
 from .utils.announcements import request_announcement_approval
 from .utils.filters import (
     BlogPostAuthorListFilter,
     OrganizationListFilter,
-    PostTypeFilter,
 )
 
 User = get_user_model()
@@ -207,8 +201,8 @@ def get_form(self, request, obj=None, **kwargs):
 
 
 class PostAdmin(admin.ModelAdmin):
-    readonly_fields = ["like_count", "save_count", "comments"]
-    fields = ["like_count", "save_count", "comments"]
+    readonly_fields = ["like_count", "save_count"]
+    fields = ["like_count", "save_count"]
 
     def like_count(self, obj) -> int:
         return obj.like_count
@@ -223,15 +217,6 @@ def save_count(self, obj) -> int:
 
     save_count.short_description = "Save Count"
 
-    def comments(self, obj):
-        objs = [
-            f'<a target="_blank" href="/admin/core/comment/{comment.pk}">{comment.body[:10]}</a>'
-            for comment in obj.comments.all()
-        ]
-        return mark_safe(",".join(objs))
-
-    comments.short_description = "Comments"
-
     class Meta:
         abstract = True
 
@@ -714,40 +699,6 @@ class CustomFlatPageAdmin(FlatPageAdmin):
     )
 
 
-class RaffleAdmin(admin.ModelAdmin):
-    list_display = ["__str__", "open_start", "open_end"]
-
-
-class CommentAdmin(admin.ModelAdmin):
-    formfield_overrides = {
-        django.db.models.TextField: {"widget": AdminMartorWidget},
-    }
-    list_display = ["author", "content_object", "created_at"]
-    search_fields = ["author__username", "body"]
-    actions = [approve_comments, unapprove_comments]
-    readonly_fields = ["created_at", "likes"]
-    list_filter = ["live", PostTypeFilter]
-    actions_on_top = True
-    actions_on_bottom = True
-    date_hierarchy = "created_at"
-
-    @staticmethod
-    def likes(obj: Comment):
-        return obj.like_count
-
-    def get_queryset(self, request):
-        return Comment.objects.filter(author__isnull=False).order_by("-created_at")
-
-    def content_object(self, obj):
-        url = reverse(
-            f"admin:{obj.content_type.app_label}_{obj.content_type.model}_change",
-            args=[obj.object_id],
-        )
-        return format_html('<a href="{}">{}</a>', url, str(obj.content_object))
-
-    content_object.short_description = "Associated Post"
-
-
 class BannerAdmin(admin.ModelAdmin):
     list_display = ["name", "start_date", "end_date"]
     search_fields = ["name"]
@@ -760,14 +711,11 @@ class BannerAdmin(admin.ModelAdmin):
 admin.site.register(models.SchedulePattern, SchedulePatternAdmin)
 admin.site.register(models.ScheduleOverride, ScheduleOverrideAdmin)
 admin.site.register(models.Organization, OrganizationAdmin)
-admin.site.register(models.DailyAnnouncement, DailyAnnouncementAdmin)
 admin.site.register(models.Announcement, AnnouncementAdmin)
 admin.site.register(models.BlogPost, BlogPostAdmin)
 admin.site.register(models.Exhibit, ExhibitAdmin)
-# admin.site.register(models.Comment, CommentAdmin) atm it's not used, so we don't need it
 admin.site.register(models.Tag, TagAdmin)
 admin.site.register(models.Event, EventAdmin)
-admin.site.register(models.Raffle, RaffleAdmin)
 admin.site.register(models.StaffMember)
 admin.site.register(models.Banner, BannerAdmin)
 

core/api/serializers/custom/__init__.py

@@ -7,7 +7,7 @@
 
 from core.api.utils.github import get_model_choices
 from core.api.utils.gravatar import gravatar_url
-from core.models import Comment, Organization, Tag, User
+from core.models import Organization, Tag, User
 
 
 class PrimaryKeyAndSlugRelatedField(serializers.SlugRelatedField):
@@ -92,33 +92,6 @@ def to_representation(self, obj):
         }
 
 
-class CommentSerializer(serializers.ModelSerializer):
-    author = SingleUserSerializer()
-    has_children = serializers.SerializerMethodField(read_only=True)
-    edited = serializers.SerializerMethodField(read_only=True)
-    likes = LikeField()
-
-    @staticmethod
-    def get_edited(obj: Comment) -> bool:
-        return obj.last_modified != obj.created_at
-
-    @staticmethod
-    def get_has_children(obj: Comment) -> bool:
-        return obj.children.exists()
-
-    class Meta:
-        model = Comment
-        fields = [
-            "id",
-            "body",
-            "author",
-            "has_children",
-            "created_at",
-            "edited",
-            "likes",
-        ]
-
-
 class SingleUserField(ChoiceField):
     def __init__(self, **kwargs):
         self.slug_field = "username"
@@ -282,12 +255,3 @@ def to_internal_value(self, data):
                 )
 
         return Tag.objects.filter(id__in=data)
-
-
-class CommentField(Field):
-    def __init__(self, **kwargs):
-        kwargs["read_only"] = True
-        super().__init__(**kwargs)
-
-    def to_representation(self, obj):
-        return CommentSerializer(obj, many=True).data

core/api/utils/polymorphism.py

@@ -15,7 +15,6 @@
 from core.api.v3.objects import (
     AnnouncementProvider,
     BlogPostProvider,
-    CommentProvider,
     EventProvider,
     ExhibitProvider,
     FlatPageProvider,
@@ -85,7 +84,6 @@ def get_path_by_provider(provider: BaseProvider) -> str:
     "user": UserProvider,
     "tag": TagProvider,
     "timetable": TimetableProvider,
-    "comment": CommentProvider,
     "like": LikeProvider,
 }
 
@@ -118,7 +116,7 @@ def get_providers_by_operation(
 
     Example:
     >>> get_providers_by_operation("single")
-    ["announcement", "blog-post", "exhibit", "event", "organization", "flatpage", "user", "tag", "timetable", "comment", "like"]
+    ["announcement", "blog-post", "exhibit", "event", "organization", "flatpage", "user", "tag", "timetable", "like"]
     """
     operation = operation.lower()
     return [

core/api/v3/objects/__init__.py

@@ -4,7 +4,7 @@
 from .exhibit import ExhibitProvider
 from .flatpage import FlatPageProvider
 from .organization import OrganizationProvider
-from .post_interactions import CommentProvider, LikeProvider
+from .post_interactions import LikeProvider
 from .tag import TagProvider
 from .timetable import TimetableProvider
 from .user import UserProvider
@@ -18,7 +18,6 @@
     "TagProvider",
     "TimetableProvider",
     "UserProvider",
-    "CommentProvider",
     "LikeProvider",
     "FlatPageProvider",
 ]

core/api/v3/objects/announcement.py

@@ -8,7 +8,6 @@
 from rest_framework.exceptions import ValidationError
 
 from core.api.serializers.custom import (
-    CommentField,
     LikeField,
     OrganizationField,
     SingleUserField,
@@ -33,7 +32,6 @@ def always_fail_validator(value, serializer_field):
 
 class Serializer(serializers.ModelSerializer):
     message = serializers.CharField(read_only=True)
-    comments = CommentField()
     likes = LikeField()
     tags = TagRelatedField()
     author = SingleUserField()
@@ -99,7 +97,6 @@ class Meta:
             "supervisor",
             "tags",
             "likes",
-            "comments",
             "message",
         ]
 

core/api/v3/objects/blog_post.py

@@ -3,7 +3,6 @@
 from rest_framework import permissions, serializers
 
 from core.api.serializers.custom import (
-    CommentField,
     LikeField,
     SingleUserField,
     TagRelatedField,
@@ -15,7 +14,6 @@
 
 class Serializer(serializers.ModelSerializer):
     likes = LikeField()
-    comments = CommentField()
     author = SingleUserField()
     tags = TagRelatedField()
 
@@ -44,7 +42,6 @@ class Meta:
             "is_published",
             "tags",
             "likes",
-            "comments",
         ]
 
 

core/api/v3/objects/exhibit.py

@@ -2,7 +2,6 @@
 from rest_framework import permissions, serializers
 
 from core.api.serializers.custom import (
-    CommentField,
     LikeField,
     SingleUserField,
     TagRelatedField,
@@ -14,7 +13,6 @@
 
 class Serializer(serializers.ModelSerializer):
     likes = LikeField()
-    comments = CommentField()
     tags = TagRelatedField()
     author = SingleUserField()
 
@@ -34,7 +32,6 @@ class Meta:
             "show_after",
             "tags",
             "likes",
-            "comments",
         ]