mirror of
https://github.com/pacnpal/thrillwiki_django_no_react.git
synced 2025-12-27 10:07:05 -05:00
feat: Introduce lists and reviews apps, refactor user list functionality from accounts, and add user profile fields.
This commit is contained in:
pacnpal
@@ -31,8 +31,6 @@ from apps.core.admin import (
|
||||
from .models import (
|
||||
EmailVerification,
|
||||
PasswordReset,
|
||||
TopList,
|
||||
TopListItem,
|
||||
User,
|
||||
UserProfile,
|
||||
)
|
||||
@@ -81,18 +79,6 @@ class UserProfileInline(admin.StackedInline):
|
||||
)
|
||||
|
||||
|
||||
class TopListItemInline(admin.TabularInline):
|
||||
"""
|
||||
Inline admin for TopListItem within TopList admin.
|
||||
|
||||
Shows list items ordered by rank with content linking.
|
||||
"""
|
||||
|
||||
model = TopListItem
|
||||
extra = 1
|
||||
fields = ("content_type", "object_id", "rank", "notes")
|
||||
ordering = ("rank",)
|
||||
show_change_link = True
|
||||
|
||||
|
||||
@admin.register(User)
|
||||
@@ -683,181 +669,4 @@ class PasswordResetAdmin(ReadOnlyAdminMixin, BaseModelAdmin):
|
||||
return actions
|
||||
|
||||
|
||||
@admin.register(TopList)
|
||||
class TopListAdmin(
|
||||
QueryOptimizationMixin, ExportActionMixin, TimestampFieldsMixin, BaseModelAdmin
|
||||
):
|
||||
"""
|
||||
Admin interface for user top lists.
|
||||
|
||||
Manages user-created top lists with inline item editing
|
||||
and category filtering.
|
||||
"""
|
||||
|
||||
list_display = (
|
||||
"title",
|
||||
"user_link",
|
||||
"category",
|
||||
"item_count",
|
||||
"created_at",
|
||||
"updated_at",
|
||||
)
|
||||
list_filter = ("category", "created_at", "updated_at")
|
||||
list_select_related = ["user"]
|
||||
list_prefetch_related = ["items"]
|
||||
search_fields = ("title", "user__username", "description")
|
||||
autocomplete_fields = ["user"]
|
||||
inlines = [TopListItemInline]
|
||||
|
||||
export_fields = ["id", "title", "user", "category", "created_at", "updated_at"]
|
||||
export_filename_prefix = "top_lists"
|
||||
|
||||
fieldsets = (
|
||||
(
|
||||
"Basic Information",
|
||||
{
|
||||
"fields": ("user", "title", "category", "description"),
|
||||
"description": "List identification and categorization.",
|
||||
},
|
||||
),
|
||||
(
|
||||
"Timestamps",
|
||||
{
|
||||
"fields": ("created_at", "updated_at"),
|
||||
"classes": ("collapse",),
|
||||
},
|
||||
),
|
||||
)
|
||||
readonly_fields = ("created_at", "updated_at")
|
||||
|
||||
@admin.display(description="User")
|
||||
def user_link(self, obj):
|
||||
"""Display user as clickable link."""
|
||||
if obj.user:
|
||||
from django.urls import reverse
|
||||
|
||||
url = reverse("admin:accounts_customuser_change", args=[obj.user.pk])
|
||||
return format_html('<a href="{}">{}</a>', url, obj.user.username)
|
||||
return "-"
|
||||
|
||||
@admin.display(description="Items")
|
||||
def item_count(self, obj):
|
||||
"""Display count of items in the list."""
|
||||
if hasattr(obj, "_item_count"):
|
||||
return obj._item_count
|
||||
return obj.items.count()
|
||||
|
||||
def get_queryset(self, request):
|
||||
"""Optimize queryset with item count annotation."""
|
||||
qs = super().get_queryset(request)
|
||||
qs = qs.annotate(_item_count=Count("items", distinct=True))
|
||||
return qs
|
||||
|
||||
@admin.action(description="Publish selected lists")
|
||||
def publish_lists(self, request, queryset):
|
||||
"""Mark selected lists as published."""
|
||||
# Assuming there's a published field
|
||||
self.message_user(request, f"Published {queryset.count()} lists.")
|
||||
|
||||
@admin.action(description="Unpublish selected lists")
|
||||
def unpublish_lists(self, request, queryset):
|
||||
"""Mark selected lists as unpublished."""
|
||||
self.message_user(request, f"Unpublished {queryset.count()} lists.")
|
||||
|
||||
def get_actions(self, request):
|
||||
"""Add custom actions."""
|
||||
actions = super().get_actions(request)
|
||||
actions["publish_lists"] = (
|
||||
self.publish_lists,
|
||||
"publish_lists",
|
||||
"Publish selected lists",
|
||||
)
|
||||
actions["unpublish_lists"] = (
|
||||
self.unpublish_lists,
|
||||
"unpublish_lists",
|
||||
"Unpublish selected lists",
|
||||
)
|
||||
return actions
|
||||
|
||||
|
||||
@admin.register(TopListItem)
|
||||
class TopListItemAdmin(QueryOptimizationMixin, BaseModelAdmin):
|
||||
"""
|
||||
Admin interface for top list items.
|
||||
|
||||
Manages individual items within top lists with
|
||||
content type linking and reordering.
|
||||
"""
|
||||
|
||||
list_display = (
|
||||
"top_list_link",
|
||||
"content_type",
|
||||
"object_id",
|
||||
"rank",
|
||||
"content_preview",
|
||||
)
|
||||
list_filter = ("top_list__category", "content_type", "rank")
|
||||
list_select_related = ["top_list", "top_list__user", "content_type"]
|
||||
search_fields = ("top_list__title", "notes", "top_list__user__username")
|
||||
autocomplete_fields = ["top_list"]
|
||||
ordering = ("top_list", "rank")
|
||||
|
||||
fieldsets = (
|
||||
(
|
||||
"List Information",
|
||||
{
|
||||
"fields": ("top_list", "rank"),
|
||||
"description": "The list this item belongs to and its position.",
|
||||
},
|
||||
),
|
||||
(
|
||||
"Item Details",
|
||||
{
|
||||
"fields": ("content_type", "object_id", "notes"),
|
||||
"description": "The content this item references.",
|
||||
},
|
||||
),
|
||||
)
|
||||
|
||||
@admin.display(description="Top List")
|
||||
def top_list_link(self, obj):
|
||||
"""Display top list as clickable link."""
|
||||
if obj.top_list:
|
||||
from django.urls import reverse
|
||||
|
||||
url = reverse("admin:accounts_toplist_change", args=[obj.top_list.pk])
|
||||
return format_html('<a href="{}">{}</a>', url, obj.top_list.title)
|
||||
return "-"
|
||||
|
||||
@admin.display(description="Content")
|
||||
def content_preview(self, obj):
|
||||
"""Display preview of linked content."""
|
||||
try:
|
||||
content_obj = obj.content_type.get_object_for_this_type(pk=obj.object_id)
|
||||
return str(content_obj)[:50]
|
||||
except Exception:
|
||||
return format_html('<span style="color: red;">Not found</span>')
|
||||
|
||||
@admin.action(description="Move up in list")
|
||||
def move_up(self, request, queryset):
|
||||
"""Move selected items up in their lists."""
|
||||
for item in queryset:
|
||||
if item.rank > 1:
|
||||
item.rank -= 1
|
||||
item.save(update_fields=["rank"])
|
||||
self.message_user(request, "Items moved up.")
|
||||
|
||||
@admin.action(description="Move down in list")
|
||||
def move_down(self, request, queryset):
|
||||
"""Move selected items down in their lists."""
|
||||
for item in queryset:
|
||||
item.rank += 1
|
||||
item.save(update_fields=["rank"])
|
||||
self.message_user(request, "Items moved down.")
|
||||
|
||||
def get_actions(self, request):
|
||||
"""Add reordering actions."""
|
||||
actions = super().get_actions(request)
|
||||
actions["move_up"] = (self.move_up, "move_up", "Move up in list")
|
||||
actions["move_down"] = (self.move_down, "move_down", "Move down in list")
|
||||
return actions
|
||||
|
||||
@@ -112,6 +112,51 @@ theme_preferences = ChoiceGroup(
|
||||
)
|
||||
|
||||
|
||||
# =============================================================================
|
||||
# UNIT SYSTEMS
|
||||
# =============================================================================
|
||||
|
||||
unit_systems = ChoiceGroup(
|
||||
name="unit_systems",
|
||||
choices=[
|
||||
RichChoice(
|
||||
value="metric",
|
||||
label="Metric",
|
||||
description="Use metric units (meters, km/h)",
|
||||
metadata={
|
||||
"color": "blue",
|
||||
"icon": "ruler",
|
||||
"css_class": "text-blue-600 bg-blue-50",
|
||||
"units": {
|
||||
"distance": "m",
|
||||
"speed": "km/h",
|
||||
"weight": "kg",
|
||||
"large_distance": "km",
|
||||
},
|
||||
"sort_order": 1,
|
||||
}
|
||||
),
|
||||
RichChoice(
|
||||
value="imperial",
|
||||
label="Imperial",
|
||||
description="Use imperial units (feet, mph)",
|
||||
metadata={
|
||||
"color": "green",
|
||||
"icon": "ruler",
|
||||
"css_class": "text-green-600 bg-green-50",
|
||||
"units": {
|
||||
"distance": "ft",
|
||||
"speed": "mph",
|
||||
"weight": "lbs",
|
||||
"large_distance": "mi",
|
||||
},
|
||||
"sort_order": 2,
|
||||
}
|
||||
),
|
||||
]
|
||||
)
|
||||
|
||||
|
||||
# =============================================================================
|
||||
# PRIVACY LEVELS
|
||||
# =============================================================================
|
||||
@@ -557,6 +602,7 @@ notification_priorities = ChoiceGroup(
|
||||
# Register each choice group individually
|
||||
register_choices("user_roles", user_roles.choices, "accounts", "User role classifications")
|
||||
register_choices("theme_preferences", theme_preferences.choices, "accounts", "Theme preference options")
|
||||
register_choices("unit_systems", unit_systems.choices, "accounts", "Unit system preferences")
|
||||
register_choices("privacy_levels", privacy_levels.choices, "accounts", "Privacy level settings")
|
||||
register_choices("top_list_categories", top_list_categories.choices, "accounts", "Top list category types")
|
||||
register_choices("notification_types", notification_types.choices, "accounts", "Notification type classifications")
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -11,6 +11,7 @@ from django.utils import timezone
|
||||
from apps.core.history import TrackedModel
|
||||
from apps.core.choices import RichChoiceField
|
||||
import pghistory
|
||||
# from django_cloudflareimages_toolkit.models import CloudflareImage
|
||||
|
||||
|
||||
def generate_random_id(model_class, id_field):
|
||||
@@ -214,10 +215,11 @@ class UserProfile(models.Model):
|
||||
help_text="Legacy display name field - use User.display_name instead",
|
||||
)
|
||||
avatar = models.ForeignKey(
|
||||
'django_cloudflareimages_toolkit.CloudflareImage',
|
||||
"django_cloudflareimages_toolkit.CloudflareImage",
|
||||
on_delete=models.SET_NULL,
|
||||
null=True,
|
||||
blank=True,
|
||||
related_name="user_profiles",
|
||||
help_text="User's avatar image",
|
||||
)
|
||||
pronouns = models.CharField(
|
||||
@@ -225,6 +227,16 @@ class UserProfile(models.Model):
|
||||
)
|
||||
|
||||
bio = models.TextField(max_length=500, blank=True, help_text="User biography")
|
||||
location = models.CharField(
|
||||
max_length=100, blank=True, help_text="User's location (City, Country)"
|
||||
)
|
||||
unit_system = RichChoiceField(
|
||||
choice_group="unit_systems",
|
||||
domain="accounts",
|
||||
max_length=10,
|
||||
default="metric",
|
||||
help_text="Preferred measurement system",
|
||||
)
|
||||
|
||||
# Social media links
|
||||
twitter = models.URLField(blank=True, help_text="Twitter profile URL")
|
||||
@@ -380,65 +392,6 @@ class PasswordReset(models.Model):
|
||||
verbose_name_plural = "Password Resets"
|
||||
|
||||
|
||||
# @pghistory.track()
|
||||
|
||||
|
||||
class TopList(TrackedModel):
|
||||
user = models.ForeignKey(
|
||||
User,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="top_lists",
|
||||
help_text="User who created this list",
|
||||
)
|
||||
title = models.CharField(max_length=100, help_text="Title of the top list")
|
||||
category = RichChoiceField(
|
||||
choice_group="top_list_categories",
|
||||
domain="accounts",
|
||||
max_length=2,
|
||||
help_text="Category of items in this list",
|
||||
)
|
||||
description = models.TextField(blank=True, help_text="Description of the list")
|
||||
created_at = models.DateTimeField(auto_now_add=True)
|
||||
updated_at = models.DateTimeField(auto_now=True)
|
||||
|
||||
class Meta(TrackedModel.Meta):
|
||||
verbose_name = "Top List"
|
||||
verbose_name_plural = "Top Lists"
|
||||
ordering = ["-updated_at"]
|
||||
|
||||
def __str__(self):
|
||||
return (
|
||||
f"{self.user.get_display_name()}'s {self.category} Top List: {self.title}"
|
||||
)
|
||||
|
||||
|
||||
# @pghistory.track()
|
||||
|
||||
|
||||
class TopListItem(TrackedModel):
|
||||
top_list = models.ForeignKey(
|
||||
TopList,
|
||||
on_delete=models.CASCADE,
|
||||
related_name="items",
|
||||
help_text="Top list this item belongs to",
|
||||
)
|
||||
content_type = models.ForeignKey(
|
||||
"contenttypes.ContentType",
|
||||
on_delete=models.CASCADE,
|
||||
help_text="Type of item (park, ride, etc.)",
|
||||
)
|
||||
object_id = models.PositiveIntegerField(help_text="ID of the item")
|
||||
rank = models.PositiveIntegerField(help_text="Position in the list")
|
||||
notes = models.TextField(blank=True, help_text="User's notes about this item")
|
||||
|
||||
class Meta(TrackedModel.Meta):
|
||||
verbose_name = "Top List Item"
|
||||
verbose_name_plural = "Top List Items"
|
||||
ordering = ["rank"]
|
||||
unique_together = [["top_list", "rank"]]
|
||||
|
||||
def __str__(self):
|
||||
return f"#{self.rank} in {self.top_list.title}"
|
||||
|
||||
|
||||
@pghistory.track()
|
||||
|
||||
@@ -19,7 +19,9 @@ class UserSerializer(serializers.ModelSerializer):
|
||||
"""
|
||||
|
||||
avatar_url = serializers.SerializerMethodField()
|
||||
display_name = serializers.SerializerMethodField()
|
||||
display_name = serializers.CharField(source="profile.display_name", required=False)
|
||||
unit_system = serializers.CharField(source="profile.unit_system", required=False)
|
||||
location = serializers.CharField(source="profile.location", required=False)
|
||||
|
||||
class Meta:
|
||||
model = User
|
||||
@@ -31,6 +33,8 @@ class UserSerializer(serializers.ModelSerializer):
|
||||
"date_joined",
|
||||
"is_active",
|
||||
"avatar_url",
|
||||
"unit_system",
|
||||
"location",
|
||||
]
|
||||
read_only_fields = ["id", "date_joined", "is_active"]
|
||||
|
||||
@@ -40,9 +44,15 @@ class UserSerializer(serializers.ModelSerializer):
|
||||
return obj.profile.avatar.url
|
||||
return None
|
||||
|
||||
def get_display_name(self, obj) -> str:
|
||||
"""Get user display name"""
|
||||
return obj.get_display_name()
|
||||
def update(self, instance, validated_data):
|
||||
profile_data = validated_data.pop("profile", {})
|
||||
profile = instance.profile
|
||||
|
||||
for attr, value in profile_data.items():
|
||||
setattr(profile, attr, value)
|
||||
profile.save()
|
||||
|
||||
return super().update(instance, validated_data)
|
||||
|
||||
|
||||
class LoginSerializer(serializers.Serializer):
|
||||
|
||||
@@ -20,10 +20,10 @@ from django.core.files.uploadedfile import UploadedFile
|
||||
from apps.accounts.models import (
|
||||
User,
|
||||
PasswordReset,
|
||||
TopList,
|
||||
EmailVerification,
|
||||
UserProfile,
|
||||
)
|
||||
from apps.lists.models import UserList
|
||||
from django_forwardemail.services import EmailService
|
||||
from apps.parks.models import ParkReview
|
||||
from apps.rides.models import RideReview
|
||||
@@ -208,9 +208,9 @@ class ProfileView(DetailView):
|
||||
.order_by("-created_at")[:5]
|
||||
)
|
||||
|
||||
def _get_user_top_lists(self, user: User) -> QuerySet[TopList]:
|
||||
def _get_user_top_lists(self, user: User) -> QuerySet[UserList]:
|
||||
return (
|
||||
TopList.objects.filter(user=user)
|
||||
UserList.objects.filter(user=user)
|
||||
.select_related("user", "user__profile")
|
||||
.prefetch_related("items")
|
||||
.order_by("-created_at")[:5]
|
||||
@@ -232,6 +232,12 @@ class SettingsView(LoginRequiredMixin, TemplateView):
|
||||
if display_name := request.POST.get("display_name"):
|
||||
profile.display_name = display_name
|
||||
|
||||
if unit_system := request.POST.get("unit_system"):
|
||||
profile.unit_system = unit_system
|
||||
|
||||
if location := request.POST.get("location"):
|
||||
profile.location = location
|
||||
|
||||
if "avatar" in request.FILES:
|
||||
avatar_file = cast(UploadedFile, request.FILES["avatar"])
|
||||
profile.avatar.save(avatar_file.name, avatar_file, save=False)
|
||||
|
||||
Reference in New Issue
Block a user