[DEPENDABOT] Update: Bump django-allauth from 65.2.0 to 65.3.0

Bumps [django-allauth](https://github.com/sponsors/pennersr) from 65.2.0 to 65.3.0.
- [Commits](https://github.com/sponsors/pennersr/commits)

---
updated-dependencies:
- dependency-name: django-allauth
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.clinerules

@@ -1,30 +0,0 @@
-# Project Startup Rules
-
-## Development Server
-IMPORTANT: Always follow these instructions exactly when starting the development server:
-
-```bash
-lsof -ti :8000 | xargs kill -9; find . -type d -name "__pycache__" -exec rm -r {} +; uv run manage.py tailwind runserver
-```
-
-Note: These steps must be executed in this exact order as a single command to ensure consistent behavior.
-
-## Package Management
-IMPORTANT: When a Python package is needed, only use UV to add it:
-```bash
-uv add <package>
-```
-Do not attempt to install packages using any other method.
-
-## Django Management Commands
-IMPORTANT: When running any Django manage.py commands (migrations, shell, etc.), always use UV:
-```bash
-uv run manage.py <command>
-```
-This applies to all management commands including but not limited to:
-- Making migrations: `uv run manage.py makemigrations`
-- Applying migrations: `uv run manage.py migrate`
-- Creating superuser: `uv run manage.py createsuperuser`
-- Starting shell: `uv run manage.py shell`
-
-NEVER use `python manage.py` or `uv run python manage.py`. Always use `uv run manage.py` directly.

.github/workflows/django.yml

@@ -2,40 +2,29 @@ name: Django CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ main ]
+    branches: [ "main" ]
 
 jobs:
-  test:
+  build:
-    runs-on: ${{ matrix.os }}
+
+    runs-on: ubuntu-latest
     strategy:
+      max-parallel: 4
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        python-version: [3.12]
-        python-version: [3.13.1]
 
     steps:
     - uses: actions/checkout@v4
-    
-    - name: Install Homebrew on Linux
-      if: runner.os == 'Linux'
-      run: |
-        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-        echo "/home/linuxbrew/.linuxbrew/bin" >> $GITHUB_PATH
-    
-    - name: Install GDAL with Homebrew
-      run: brew install gdal
-      
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
-        
     - name: Install Dependencies
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-        
     - name: Run Tests
       run: |
         python manage.py test

.github/workflows/review.yml

@@ -1,34 +0,0 @@
-name: Claude Code Review
-
-permissions:
-  contents: read
-  pull-requests: write
-
-on:
-  # Run on new/updated PRs
-  pull_request:
-    types: [opened, reopened, synchronize]
-  
-  # Allow manual triggers for existing PRs
-  workflow_dispatch:
-    inputs:
-      pr_number:
-        description: 'Pull Request Number'
-        required: true
-        type: string
-
-jobs:
-  code-review:
-    runs-on: ubuntu-latest
-    environment: development_environment
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          
-      - name: Run Claude Review
-        uses: pacnpal/claude-code-review@main
-        with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          anthropic-key: ${{ secrets.ANTHROPIC_API_KEY }}
-          pr-number: ${{ github.event.pull_request.number || inputs.pr_number }}

.gitignore

@@ -353,8 +353,7 @@ cython_debug/
 .LSOverride
 
 # Icon must end with two \r
-Icon
+Icon
-
 
 
 # Thumbnails
@@ -374,8 +373,3 @@ Icon
 .AppleDesktop
 Network Trash Folder
 Temporary Items
-backend/.env
-.env
-frontend
-uv.lock
-.django_tailwind_cli/tailwindcss-macos-arm64-4.1.13

FRONTEND_IMPLEMENTATION_PLAN.md

@@ -1,123 +0,0 @@
-# Frontend Implementation Plan - Phase 1 Critical Components
-
-## Current State Analysis ✅
-
-### Completed Components
-- **Authentication System** - Modal-based auth with social integration ✅
-- **Toast Notification System** - Advanced toast system with animations ✅  
-- **Theme Management** - Working well ✅
-- **Header Navigation** - Enhanced with modal integration ✅
-- **Base Template Structure** - Solid foundation ✅
-- **Basic Alpine.js Components** - Core components implemented ✅
-
-### Missing Critical Components (Phase 1 - High Priority)
-
-## 1. Enhanced Search with Autocomplete 🎯
-**Current**: Basic search exists but lacks autocomplete and advanced features
-**Needed**: 
-- Debounced search with API integration
-- Search suggestions dropdown UI
-- Search result highlighting
-- Keyboard navigation for search suggestions
-- Recent searches and popular searches
-
-## 2. Enhanced Park/Ride Cards 🎯
-**Current**: Basic card components exist
-**Needed**:
-- Sophisticated hover effects and animations
-- Card interaction states (hover, focus, active)
-- Loading states for card images
-- Card action buttons (favorite, share, etc.)
-- Image lazy loading and error handling
-
-## 3. User Profile Management 🎯
-**Current**: Basic profile pages exist
-**Needed**:
-- Comprehensive profile editing interface
-- Avatar upload with preview functionality
-- Profile sections (basic info, preferences, privacy)
-- Form validation and error handling
-- Settings persistence
-
-## 4. Advanced Filtering System 🎯
-**Current**: Basic filtering exists
-**Needed**:
-- Multi-select filter components
-- Range slider filters
-- Date picker filters
-- URL state synchronization for filters
-- Filter presets and saved searches
-
-## 5. Loading States & Skeletons 🎯
-**Current**: Basic loading indicators
-**Needed**:
-- Skeleton loading components
-- Loading spinners and indicators
-- Optimistic updates
-- Loading states for forms and buttons
-
-## Implementation Priority Order
-
-### Week 1: Core Interactive Components
-1. **Enhanced Search Component** (2-3 days)
-2. **Advanced Card Components** (2-3 days)
-3. **Loading States System** (1-2 days)
-
-### Week 2: User Experience Features
-1. **User Profile Management** (3-4 days)
-2. **Advanced Filtering System** (3-4 days)
-
-## Technical Approach
-
-### 1. Enhanced Search Component
-```javascript
-Alpine.data('advancedSearch', () => ({
-  query: '',
-  suggestions: [],
-  recentSearches: [],
-  popularSearches: [],
-  loading: false,
-  showSuggestions: false,
-  selectedIndex: -1,
-  debounceTimer: null,
-  
-  // Implementation details...
-}))
-```
-
-### 2. Enhanced Card Component
-```javascript
-Alpine.data('enhancedCard', (cardData) => ({
-  data: cardData,
-  imageLoaded: false,
-  imageError: false,
-  favorited: false,
-  
-  // Hover effects, animations, interactions
-}))
-```
-
-### 3. Skeleton Loading System
-```html
-<!-- Skeleton templates for different content types -->
-<div class="skeleton-card">
-  <div class="skeleton-image"></div>
-  <div class="skeleton-text"></div>
-</div>
-```
-
-## Success Metrics
-- Search response time < 200ms
-- Card interactions feel smooth (60fps)
-- Loading states provide clear feedback
-- User profile updates work seamlessly
-- Filtering provides instant feedback
-
-## Next Steps
-1. Start with Enhanced Search Component implementation
-2. Create comprehensive card component system
-3. Implement skeleton loading system
-4. Build user profile management interface
-5. Create advanced filtering system
-
-This plan focuses on the most impactful user experience improvements that will bring the Django frontend to parity with the React implementation.

README.md

@@ -1 +0,0 @@
-ThrillWiki.com

accounts/management/commands/cleanup_test_data.py

@@ -1,67 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group
-from reviews.models import Review
-from parks.models import Park
-from rides.models import Ride
-from media.models import Photo
-
-User = get_user_model()
-
-
-class Command(BaseCommand):
-    help = "Cleans up test users and data created during e2e testing"
-
-    def handle(self, *args, **kwargs):
-        # Delete test users
-        test_users = User.objects.filter(username__in=["testuser", "moderator"])
-        count = test_users.count()
-        test_users.delete()
-        self.stdout.write(self.style.SUCCESS(f"Deleted {count} test users"))
-
-        # Delete test reviews
-        reviews = Review.objects.filter(user__username__in=["testuser", "moderator"])
-        count = reviews.count()
-        reviews.delete()
-        self.stdout.write(self.style.SUCCESS(f"Deleted {count} test reviews"))
-
-        # Delete test photos
-        photos = Photo.objects.filter(uploader__username__in=["testuser", "moderator"])
-        count = photos.count()
-        photos.delete()
-        self.stdout.write(self.style.SUCCESS(f"Deleted {count} test photos"))
-
-        # Delete test parks
-        parks = Park.objects.filter(name__startswith="Test Park")
-        count = parks.count()
-        parks.delete()
-        self.stdout.write(self.style.SUCCESS(f"Deleted {count} test parks"))
-
-        # Delete test rides
-        rides = Ride.objects.filter(name__startswith="Test Ride")
-        count = rides.count()
-        rides.delete()
-        self.stdout.write(self.style.SUCCESS(f"Deleted {count} test rides"))
-
-        # Clean up test files
-        import os
-        import glob
-
-        # Clean up test uploads
-        media_patterns = [
-            "media/uploads/test_*",
-            "media/avatars/test_*",
-            "media/park/test_*",
-            "media/rides/test_*",
-        ]
-
-        for pattern in media_patterns:
-            files = glob.glob(pattern)
-            for f in files:
-                try:
-                    os.remove(f)
-                    self.stdout.write(self.style.SUCCESS(f"Deleted {f}"))
-                except OSError as e:
-                    self.stdout.write(self.style.WARNING(f"Error deleting {f}: {e}"))
-
-        self.stdout.write(self.style.SUCCESS("Test data cleanup complete"))

accounts/management/commands/create_test_users.py

@@ -1,56 +0,0 @@
-from django.core.management.base import BaseCommand
-from django.contrib.auth import get_user_model
-from django.contrib.auth.models import Group, Permission
-
-User = get_user_model()
-
-
-class Command(BaseCommand):
-    help = "Creates test users for e2e testing"
-
-    def handle(self, *args, **kwargs):
-        # Create regular test user
-        if not User.objects.filter(username="testuser").exists():
-            user = User.objects.create_user(
-                username="testuser",
-                email="testuser@example.com",
-                [PASSWORD-REMOVED]",
-            )
-            self.stdout.write(self.style.SUCCESS(f"Created test user: {user.username}"))
-        else:
-            self.stdout.write(self.style.WARNING("Test user already exists"))
-
-        # Create moderator user
-        if not User.objects.filter(username="moderator").exists():
-            moderator = User.objects.create_user(
-                username="moderator",
-                email="moderator@example.com",
-                [PASSWORD-REMOVED]",
-            )
-
-            # Create moderator group if it doesn't exist
-            moderator_group, created = Group.objects.get_or_create(name="Moderators")
-
-            # Add relevant permissions
-            permissions = Permission.objects.filter(
-                codename__in=[
-                    "change_review",
-                    "delete_review",
-                    "change_park",
-                    "change_ride",
-                    "moderate_photos",
-                    "moderate_comments",
-                ]
-            )
-            moderator_group.permissions.add(*permissions)
-
-            # Add user to moderator group
-            moderator.groups.add(moderator_group)
-
-            self.stdout.write(
-                self.style.SUCCESS(f"Created moderator user: {moderator.username}")
-            )
-        else:
-            self.stdout.write(self.style.WARNING("Moderator user already exists"))
-
-        self.stdout.write(self.style.SUCCESS("Test users setup complete"))

accounts/management/commands/verify_discord_settings.py

@@ -22,7 +22,7 @@ class Command(BaseCommand):
                 self.stdout.write(f'- {site.domain} ({site.name})')
             
             # Show callback URL
-            callback_url = 'http://localhost:8000/accounts/discord/login/callback/'
+            callback_url = f'http://localhost:8000/accounts/discord/login/callback/'
             self.stdout.write('\nCallback URL to configure in Discord Developer Portal:')
             self.stdout.write(callback_url)
             

accounts/migrations/0001_initial.py

@@ -1,11 +1,9 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.3 on 2024-11-12 18:07
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
 import django.db.models.deletion
 import django.utils.timezone
-import pgtrigger.compiler
-import pgtrigger.migrations
 from django.conf import settings
 from django.db import migrations, models
 
@@ -17,7 +15,6 @@ class Migration(migrations.Migration):
     dependencies = [
         ("auth", "0012_alter_user_first_name_max_length"),
         ("contenttypes", "0002_remove_content_type_name"),
-        ("pghistory", "0006_delete_aggregateevent"),
     ]
 
     operations = [
@@ -232,7 +229,15 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name="TopList",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
                 ("title", models.CharField(max_length=100)),
                 (
                     "category",
@@ -263,145 +268,6 @@ class Migration(migrations.Migration):
                 "ordering": ["-updated_at"],
             },
         ),
-        migrations.CreateModel(
-            name="TopListEvent",
-            fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
-                ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
-                ("pgh_label", models.TextField(help_text="The event label.")),
-                ("id", models.BigIntegerField()),
-                ("title", models.CharField(max_length=100)),
-                (
-                    "category",
-                    models.CharField(
-                        choices=[
-                            ("RC", "Roller Coaster"),
-                            ("DR", "Dark Ride"),
-                            ("FR", "Flat Ride"),
-                            ("WR", "Water Ride"),
-                            ("PK", "Park"),
-                        ],
-                        max_length=2,
-                    ),
-                ),
-                ("description", models.TextField(blank=True)),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
-                (
-                    "pgh_context",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        to="pghistory.context",
-                    ),
-                ),
-                (
-                    "pgh_obj",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="events",
-                        to="accounts.toplist",
-                    ),
-                ),
-                (
-                    "user",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        related_query_name="+",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
-        migrations.CreateModel(
-            name="TopListItem",
-            fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
-                ("object_id", models.PositiveIntegerField()),
-                ("rank", models.PositiveIntegerField()),
-                ("notes", models.TextField(blank=True)),
-                (
-                    "content_type",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="contenttypes.contenttype",
-                    ),
-                ),
-                (
-                    "top_list",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="items",
-                        to="accounts.toplist",
-                    ),
-                ),
-            ],
-            options={
-                "ordering": ["rank"],
-            },
-        ),
-        migrations.CreateModel(
-            name="TopListItemEvent",
-            fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
-                ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
-                ("pgh_label", models.TextField(help_text="The event label.")),
-                ("id", models.BigIntegerField()),
-                ("object_id", models.PositiveIntegerField()),
-                ("rank", models.PositiveIntegerField()),
-                ("notes", models.TextField(blank=True)),
-                (
-                    "content_type",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        related_query_name="+",
-                        to="contenttypes.contenttype",
-                    ),
-                ),
-                (
-                    "pgh_context",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        to="pghistory.context",
-                    ),
-                ),
-                (
-                    "pgh_obj",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="events",
-                        to="accounts.toplistitem",
-                    ),
-                ),
-                (
-                    "top_list",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        related_query_name="+",
-                        to="accounts.toplist",
-                    ),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
         migrations.CreateModel(
             name="UserProfile",
             fields=[
@@ -452,66 +318,40 @@ class Migration(migrations.Migration):
                 ),
             ],
         ),
-        pgtrigger.migrations.AddTrigger(
+        migrations.CreateModel(
-            model_name="toplist",
+            name="TopListItem",
-            trigger=pgtrigger.compiler.Trigger(
+            fields=[
-                name="insert_insert",
+                (
-                sql=pgtrigger.compiler.UpsertTriggerSql(
+                    "id",
-                    func='INSERT INTO "accounts_toplistevent" ("category", "created_at", "description", "id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "title", "updated_at", "user_id") VALUES (NEW."category", NEW."created_at", NEW."description", NEW."id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."title", NEW."updated_at", NEW."user_id"); RETURN NULL;',
+                    models.BigAutoField(
-                    hash="[AWS-SECRET-REMOVED]",
+                        auto_created=True,
-                    operation="INSERT",
+                        primary_key=True,
-                    pgid="pgtrigger_insert_insert_26546",
+                        serialize=False,
-                    table="accounts_toplist",
+                        verbose_name="ID",
-                    when="AFTER",
+                    ),
                 ),
-            ),
+                ("object_id", models.PositiveIntegerField()),
-        ),
+                ("rank", models.PositiveIntegerField()),
-        pgtrigger.migrations.AddTrigger(
+                ("notes", models.TextField(blank=True)),
-            model_name="toplist",
+                (
-            trigger=pgtrigger.compiler.Trigger(
+                    "content_type",
-                name="update_update",
+                    models.ForeignKey(
-                sql=pgtrigger.compiler.UpsertTriggerSql(
+                        on_delete=django.db.models.deletion.CASCADE,
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
+                        to="contenttypes.contenttype",
-                    func='INSERT INTO "accounts_toplistevent" ("category", "created_at", "description", "id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "title", "updated_at", "user_id") VALUES (NEW."category", NEW."created_at", NEW."description", NEW."id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."title", NEW."updated_at", NEW."user_id"); RETURN NULL;',
+                    ),
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_84849",
-                    table="accounts_toplist",
-                    when="AFTER",
                 ),
-            ),
+                (
-        ),
+                    "top_list",
-        migrations.AlterUniqueTogether(
+                    models.ForeignKey(
-            name="toplistitem",
+                        on_delete=django.db.models.deletion.CASCADE,
-            unique_together={("top_list", "rank")},
+                        related_name="items",
-        ),
+                        to="accounts.toplist",
-        pgtrigger.migrations.AddTrigger(
+                    ),
-            model_name="toplistitem",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id") VALUES (NEW."content_type_id", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."rank", NEW."top_list_id"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_56dfc",
-                    table="accounts_toplistitem",
-                    when="AFTER",
                 ),
-            ),
+            ],
-        ),
+            options={
-        pgtrigger.migrations.AddTrigger(
+                "ordering": ["rank"],
-            model_name="toplistitem",
+                "unique_together": {("top_list", "rank")},
-            trigger=pgtrigger.compiler.Trigger(
+            },
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id") VALUES (NEW."content_type_id", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."rank", NEW."top_list_id"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_2b6e3",
-                    table="accounts_toplistitem",
-                    when="AFTER",
-                ),
-            ),
         ),
     ]

accounts/migrations/0002_remove_toplistitem_insert_insert_and_more.py

@@ -1,93 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-21 17:55
-
-import django.utils.timezone
-import pgtrigger.compiler
-import pgtrigger.migrations
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("accounts", "0001_initial"),
-    ]
-
-    operations = [
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="toplistitem",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="toplistitem",
-            name="update_update",
-        ),
-        migrations.AddField(
-            model_name="toplistitem",
-            name="created_at",
-            field=models.DateTimeField(
-                auto_now_add=True, default=django.utils.timezone.now
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="toplistitem",
-            name="updated_at",
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name="toplistitemevent",
-            name="created_at",
-            field=models.DateTimeField(
-                auto_now_add=True, default=django.utils.timezone.now
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="toplistitemevent",
-            name="updated_at",
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AlterField(
-            model_name="toplist",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="toplistitem",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="toplistitem",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "created_at", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id", "updated_at") VALUES (NEW."content_type_id", NEW."created_at", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."rank", NEW."top_list_id", NEW."updated_at"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_56dfc",
-                    table="accounts_toplistitem",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="toplistitem",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "created_at", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id", "updated_at") VALUES (NEW."content_type_id", NEW."created_at", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."rank", NEW."top_list_id", NEW."updated_at"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_2b6e3",
-                    table="accounts_toplistitem",
-                    when="AFTER",
-                ),
-            ),
-        ),
-    ]

accounts/migrations/0003_remove_toplist_insert_insert_and_more.py

@@ -1,89 +0,0 @@
-# Generated by Django 5.2.6 on 2025-09-20 13:40
-
-import pgtrigger.compiler
-import pgtrigger.migrations
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("accounts", "0002_remove_toplistitem_insert_insert_and_more"),
-    ]
-
-    operations = [
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="toplist",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="toplist",
-            name="update_update",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="toplistitem",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="toplistitem",
-            name="update_update",
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="toplist",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "accounts_toplistevent" ("category", "created_at", "description", "id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "title", "updated_at", "user_id") VALUES (NEW."category", NEW."created_at", NEW."description", NEW."id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."title", NEW."updated_at", NEW."user_id"); RETURN NULL;',
-                    hash="0b9e68b3aa0d3fb8f50bd832b99b70201d44aa11",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_26546",
-                    table="accounts_toplist",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="toplist",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "accounts_toplistevent" ("category", "created_at", "description", "id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "title", "updated_at", "user_id") VALUES (NEW."category", NEW."created_at", NEW."description", NEW."id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."title", NEW."updated_at", NEW."user_id"); RETURN NULL;',
-                    hash="3ae1293b8b1fe574bac9f388b60d19613347931e",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_84849",
-                    table="accounts_toplist",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="toplistitem",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "created_at", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id", "updated_at") VALUES (NEW."content_type_id", NEW."created_at", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."rank", NEW."top_list_id", NEW."updated_at"); RETURN NULL;',
-                    hash="1091ef1cc7668e112916df0c12f222bd25cfe921",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_56dfc",
-                    table="accounts_toplistitem",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="toplistitem",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "accounts_toplistitemevent" ("content_type_id", "created_at", "id", "notes", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "rank", "top_list_id", "updated_at") VALUES (NEW."content_type_id", NEW."created_at", NEW."id", NEW."notes", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."rank", NEW."top_list_id", NEW."updated_at"); RETURN NULL;',
-                    hash="81227a3b4af9432d2b868cd8680bee7896da8acc",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_2b6e3",
-                    table="accounts_toplistitem",
-                    when="AFTER",
-                ),
-            ),
-        ),
-    ]

accounts/mixins.py

@@ -26,7 +26,7 @@ class TurnstileMixin:
             'remoteip': request.META.get('REMOTE_ADDR'),
         }
 
-        response = requests.post(settings.TURNSTILE_VERIFY_URL, data=data, timeout=60)
+        response = requests.post(settings.TURNSTILE_VERIFY_URL, data=data)
         result = response.json()
 
         if not result.get('success'):

accounts/models.py

@@ -2,24 +2,22 @@ from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+import random
 from PIL import Image, ImageDraw, ImageFont
 from io import BytesIO
 import base64
 import os
-import secrets
-from history_tracking.models import TrackedModel
-import pghistory
 
 def generate_random_id(model_class, id_field):
     """Generate a random ID starting at 4 digits, expanding to 5 if needed"""
     while True:
         # Try to get a 4-digit number first
-        new_id = str(secrets.SystemRandom().randint(1000, 9999))
+        new_id = str(random.randint(1000, 9999))
         if not model_class.objects.filter(**{id_field: new_id}).exists():
             return new_id
         
         # If all 4-digit numbers are taken, try 5 digits
-        new_id = str(secrets.SystemRandom().randint(10000, 99999))
+        new_id = str(random.randint(10000, 99999))
         if not model_class.objects.filter(**{id_field: new_id}).exists():
             return new_id
 
@@ -160,8 +158,7 @@ class PasswordReset(models.Model):
         verbose_name = "Password Reset"
         verbose_name_plural = "Password Resets"
 
-@pghistory.track()
+class TopList(models.Model):
-class TopList(TrackedModel):
     class Categories(models.TextChoices):
         ROLLER_COASTER = 'RC', _('Roller Coaster')
         DARK_RIDE = 'DR', _('Dark Ride')
@@ -189,8 +186,7 @@ class TopList(TrackedModel):
     def __str__(self):
         return f"{self.user.get_display_name()}'s {self.category} Top List: {self.title}"
 
-@pghistory.track()
+class TopListItem(models.Model):
-class TopListItem(TrackedModel):
     top_list = models.ForeignKey(
         TopList,
         on_delete=models.CASCADE,

accounts/signals.py

@@ -31,7 +31,7 @@ def create_user_profile(sender, instance, created, **kwargs):
                 
                 if avatar_url:
                     try:
-                        response = requests.get(avatar_url, timeout=60)
+                        response = requests.get(avatar_url)
                         if response.status_code == 200:
                             img_temp = NamedTemporaryFile(delete=True)
                             img_temp.write(response.content)

analytics/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.3 on 2024-11-12 18:07
 
 import django.db.models.deletion
 from django.db import migrations, models

backend/.django_tailwind_cli/source.css

@@ -1 +0,0 @@
-@import "tailwindcss";

cline_docs/activeContext.md

@@ -1,21 +1,16 @@
 # Active Context
 
 ## Current Focus
-- Database schema synchronization and fixes
+- Moderation system development and enhancement
-- Parks model and pghistory integration
+- Dashboard interface improvements
-- Ensuring model-database consistency
+- Submission review workflow
 
 ## Recent Changes
-Fixed critical database schema mismatch in parks app:
+Working on moderation system components:
-- Updated Park model to include operator and property_owner fields
+- Dashboard interface
-- Added missing owner_id column to parks_parkevent table
+- Submission list views
-- Fixed pghistory triggers that were failing due to missing columns
+- Moderation navigation
-- Resolved park detail page errors (parks/magic-kingdom/ now working)
+- Content review workflow
-
-### Schema Updates Made
-- parks/models.py: Added operator and property_owner ForeignKey fields
-- parks/migrations/0006_auto_20250920_0944.py: Added owner_id column to parks_parkevent table
-- Database now properly supports all three ownership relationships: owner, operator, property_owner
 
 ## Active Files
 

cline_docs/frontendArchitecture.md

@@ -1,208 +0,0 @@
-# Frontend Architecture Documentation
-Last Updated: 2024-02-21
-
-## Core Technologies
-
-### 1. HTMX
-- Used for dynamic updates and server interactions
-- Enables partial page updates without full reloads
-- Integrated with Django backend for seamless data exchange
-- Used for form submissions and dynamic content loading
-
-### 2. AlpineJS
-- Handles client-side interactivity and state management
-- Used for dropdowns, modals, and other interactive components
-- Provides reactive data binding and event handling
-- Key features used:
-  - x-data for component state
-  - x-show/x-if for conditional rendering
-  - x-model for two-way data binding
-  - x-on for event handling
-
-### 3. Tailwind CSS
-- Utility-first CSS framework for styling
-- Custom configuration in tailwind.config.js
-- Responsive design utilities
-- Dark mode support with class-based implementation
-- Custom color scheme with primary/secondary colors
-
-## Styling System
-
-### 1. Base Styles
-- Font: Poppins (400, 500, 600, 700 weights)
-- Color Scheme:
-  - Primary: Indigo (#4F46E5)
-  - Secondary: Rose (#E11D48)
-  - Gradients for interactive elements
-  - Dark mode compatible color palette
-
-### 2. Component Classes
-- Button Variants:
-  - .btn-primary: Gradient background with hover effects
-  - .btn-secondary: Light/dark mode aware styling
-  - Social login buttons with brand colors
-- Form Elements:
-  - .form-input: Styled input fields
-  - .form-label: Consistent label styling
-  - .form-error: Error message styling
-- Cards:
-  - .card: Base card styling with shadows
-  - .auth-card: Special styling for authentication forms
-- Status Badges:
-  - .status-operating: Green success state
-  - .status-closed: Red error state
-  - .status-construction: Yellow warning state
-
-### 3. Layout Components
-- Responsive container system
-- Grid system using Tailwind's grid utilities
-- Flexbox-based navigation and content layouts
-- Mobile-first responsive design
-
-## Interactive Components
-
-### 1. Navigation
-- Responsive header with mobile menu
-- User dropdown menu with authentication states
-- Theme toggle (light/dark mode)
-- Mobile-optimized navigation drawer
-
-### 2. Forms
-- Location autocomplete system
-- Form validation with error states
-- CSRF protection integration
-- File upload handling
-
-### 3. Alerts System
-- Timed auto-dismissing alerts
-- Slide animations for entry/exit
-- Context-aware styling (success, error, info, warning)
-- Accessible notifications
-
-### 4. Modal System
-- HTMX-powered dynamic content loading
-- Alpine.js state management
-- Backdrop blur effects
-- Keyboard navigation support
-
-## JavaScript Architecture
-
-### 1. Core Functionality
-- Theme management with local storage persistence
-- HTMX configuration and setup
-- Alpine.js component initialization
-- Event delegation and handling
-
-### 2. Location Autocomplete
-- Progressive enhancement for location fields
-- Country/Region/City hierarchical selection
-- Dynamic filtering based on parent selections
-- AJAX-powered suggestions
-
-### 3. Form Handling
-- Client-side validation
-- File upload preview
-- Dynamic form updates
-- Error state management
-
-## Performance Optimizations
-
-### 1. Asset Loading
-- Deferred script loading
-- Preloaded critical assets
-- Minified production assets
-- Cached static resources
-
-### 2. Rendering
-- Progressive enhancement
-- Partial page updates
-- Lazy loading of images
-- Optimized animation performance
-
-### 3. State Management
-- Efficient DOM updates
-- Debounced search inputs
-- Throttled scroll handlers
-- Memory leak prevention
-
-## Accessibility Features
-
-### 1. Semantic HTML
-- Proper heading hierarchy
-- ARIA labels and roles
-- Semantic landmark regions
-- Meaningful alt text
-
-### 2. Keyboard Navigation
-- Focus management
-- Skip links
-- Keyboard shortcuts
-- Focus trapping in modals
-
-### 3. Screen Readers
-- ARIA live regions for alerts
-- Status role for notifications
-- Description text for icons
-- Form label associations
-
-## Development Workflow
-
-### 1. CSS Organization
-- Utility-first approach
-- Component-specific styles
-- Shared design tokens
-- Dark mode variants
-
-### 2. JavaScript Patterns
-- Event delegation
-- Component encapsulation
-- State management
-- Error handling
-
-### 3. Testing Considerations
-- Browser compatibility
-- Responsive design testing
-- Accessibility testing
-- Performance monitoring
-
-## Browser Support
-
-### 1. Supported Browsers
-- Chrome (latest 2 versions)
-- Firefox (latest 2 versions)
-- Safari (latest 2 versions)
-- Edge (latest version)
-
-### 2. Fallbacks
-- Graceful degradation
-- No-script support
-- Legacy browser handling
-- Progressive enhancement
-
-## Security Measures
-
-### 1. CSRF Protection
-- Token validation
-- Secure form submission
-- Protected AJAX requests
-- Session handling
-
-### 2. XSS Prevention
-- Content sanitization
-- Escaped output
-- Secure cookie handling
-- Input validation
-
-## Future Considerations
-
-### 1. Potential Improvements
-- Component library development
-- Enhanced type checking
-- Performance monitoring
-- Automated testing
-
-### 2. Maintenance
-- Regular dependency updates
-- Browser compatibility checks
-- Performance optimization
-- Security audits

cline_docs/techContext.md

@@ -20,22 +20,22 @@
 
 ### Frontend Technologies
 1. HTMX
-   - Dynamic updates and server interactions
+   - Dynamic updates
-   - Partial rendering and progressive enhancement
+   - Partial rendering
-   - Server-side processing and form handling
+   - Server-side processing
-   - See frontendArchitecture.md for detailed implementation
+   - Progressive enhancement
 
 2. AlpineJS
-   - UI state management and reactivity
+   - UI state management
-   - Component behavior and lifecycle
+   - Component behavior
-   - Event handling and DOM manipulation
+   - Event handling
-   - See frontendArchitecture.md for component patterns
+   - DOM manipulation
 
 3. Tailwind CSS
-   - Utility-first styling with custom configuration
+   - Utility-first styling
-   - Component design system
+   - Component design
-   - Responsive layouts and dark mode support
+   - Responsive layouts
-   - See frontendArchitecture.md for styling guide
+   - Custom configuration
 
 ## Integration Patterns
 
@@ -87,24 +87,16 @@
 
 ### Frontend Libraries
 1. CSS Framework
-   - Tailwind CSS with custom configuration
+   - Tailwind CSS
-   - Theme system with light/dark mode support
+   - Custom plugins
-   - Component-specific style patterns
+   - Theme configuration
-   - See frontendArchitecture.md for complete styling guide
+   - Utility classes
 
 2. JavaScript
-   - AlpineJS for reactive components
+   - AlpineJS core
-   - HTMX for server interactions
+   - HTMX library
-   - Location autocomplete system
+   - Utility functions
-   - Alert and modal components
+   - Custom components
-   - See frontendArchitecture.md for component documentation
-
-3. UI Components
-   - Form elements and validation
-   - Navigation and menus
-   - Status indicators and badges
-   - Modal and alert system
-   - See frontendArchitecture.md for implementation details
 
 ## Infrastructure Choices
 
@@ -151,14 +143,10 @@
 
 ### Technology Limitations
 1. Frontend
-   - HTMX/AlpineJS only (no React/Vue/Angular)
+   - HTMX/AlpineJS only
-   - Progressive enhancement approach required
+   - No additional frameworks
-   - Must support latest 2 versions of major browsers
+   - Browser compatibility
-   - See frontendArchitecture.md for detailed browser support
+   - Performance requirements
-   - Performance targets:
-     * First contentful paint < 1.5s
-     * Time to interactive < 2s
-     * Core Web Vitals compliance
 
 2. Backend
    - Django version constraints

companies/admin.py

@@ -1,15 +1,16 @@
 from django.contrib import admin
+from simple_history.admin import SimpleHistoryAdmin
 from .models import Company, Manufacturer
 
 @admin.register(Company)
-class CompanyAdmin(admin.ModelAdmin):
+class CompanyAdmin(SimpleHistoryAdmin):
     list_display = ('id', 'name', 'headquarters', 'website', 'created_at')
     search_fields = ('name', 'headquarters', 'description')
     prepopulated_fields = {'slug': ('name',)}
     readonly_fields = ('created_at', 'updated_at')
 
 @admin.register(Manufacturer)
-class ManufacturerAdmin(admin.ModelAdmin):
+class ManufacturerAdmin(SimpleHistoryAdmin):
     list_display = ('id', 'name', 'headquarters', 'website', 'created_at')
     search_fields = ('name', 'headquarters', 'description')
     prepopulated_fields = {'slug': ('name',)}

companies/migrations/0001_initial.py

@@ -1,8 +1,5 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.3 on 2024-11-12 18:07
 
-import django.db.models.deletion
-import pgtrigger.compiler
-import pgtrigger.migrations
 from django.db import migrations, models
 
 
@@ -10,15 +7,21 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [
+    dependencies = []
-        ("pghistory", "0006_delete_aggregateevent"),
-    ]
 
     operations = [
         migrations.CreateModel(
             name="Company",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
                 ("name", models.CharField(max_length=255)),
                 ("slug", models.SlugField(max_length=255, unique=True)),
                 ("website", models.URLField(blank=True)),
@@ -34,31 +37,18 @@ class Migration(migrations.Migration):
                 "ordering": ["name"],
             },
         ),
-        migrations.CreateModel(
-            name="CompanyEvent",
-            fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
-                ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
-                ("pgh_label", models.TextField(help_text="The event label.")),
-                ("id", models.BigIntegerField()),
-                ("name", models.CharField(max_length=255)),
-                ("slug", models.SlugField(db_index=False, max_length=255)),
-                ("website", models.URLField(blank=True)),
-                ("headquarters", models.CharField(blank=True, max_length=255)),
-                ("description", models.TextField(blank=True)),
-                ("total_parks", models.IntegerField(default=0)),
-                ("total_rides", models.IntegerField(default=0)),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
         migrations.CreateModel(
             name="Manufacturer",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
                 ("name", models.CharField(max_length=255)),
                 ("slug", models.SlugField(max_length=255, unique=True)),
                 ("website", models.URLField(blank=True)),
@@ -73,125 +63,4 @@ class Migration(migrations.Migration):
                 "ordering": ["name"],
             },
         ),
-        migrations.CreateModel(
-            name="ManufacturerEvent",
-            fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
-                ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
-                ("pgh_label", models.TextField(help_text="The event label.")),
-                ("id", models.BigIntegerField()),
-                ("name", models.CharField(max_length=255)),
-                ("slug", models.SlugField(db_index=False, max_length=255)),
-                ("website", models.URLField(blank=True)),
-                ("headquarters", models.CharField(blank=True, max_length=255)),
-                ("description", models.TextField(blank=True)),
-                ("total_rides", models.IntegerField(default=0)),
-                ("total_roller_coasters", models.IntegerField(default=0)),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="company",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "companies_companyevent" ("created_at", "description", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "total_parks", "total_rides", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."slug", NEW."total_parks", NEW."total_rides", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_a4101",
-                    table="companies_company",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="company",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "companies_companyevent" ("created_at", "description", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "total_parks", "total_rides", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."slug", NEW."total_parks", NEW."total_rides", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_3d5ae",
-                    table="companies_company",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        migrations.AddField(
-            model_name="companyevent",
-            name="pgh_context",
-            field=models.ForeignKey(
-                db_constraint=False,
-                null=True,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="+",
-                to="pghistory.context",
-            ),
-        ),
-        migrations.AddField(
-            model_name="companyevent",
-            name="pgh_obj",
-            field=models.ForeignKey(
-                db_constraint=False,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="events",
-                to="companies.company",
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="manufacturer",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "companies_manufacturerevent" ("created_at", "description", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "total_rides", "total_roller_coasters", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."slug", NEW."total_rides", NEW."total_roller_coasters", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_5c0b6",
-                    table="companies_manufacturer",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="manufacturer",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "companies_manufacturerevent" ("created_at", "description", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "total_rides", "total_roller_coasters", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."slug", NEW."total_rides", NEW."total_roller_coasters", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_81971",
-                    table="companies_manufacturer",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        migrations.AddField(
-            model_name="manufacturerevent",
-            name="pgh_context",
-            field=models.ForeignKey(
-                db_constraint=False,
-                null=True,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="+",
-                to="pghistory.context",
-            ),
-        ),
-        migrations.AddField(
-            model_name="manufacturerevent",
-            name="pgh_obj",
-            field=models.ForeignKey(
-                db_constraint=False,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="events",
-                to="companies.manufacturer",
-            ),
-        ),
     ]

companies/migrations/0002_add_designer_model.py

@@ -0,0 +1,28 @@
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('companies', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Designer',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('slug', models.SlugField(max_length=255, unique=True)),
+                ('website', models.URLField(blank=True)),
+                ('description', models.TextField(blank=True)),
+                ('total_rides', models.IntegerField(default=0)),
+                ('total_roller_coasters', models.IntegerField(default=0)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+            ],
+            options={
+                'ordering': ['name'],
+            },
+        ),
+    ]

companies/migrations/0002_alter_company_id_alter_manufacturer_id.py

@@ -1,27 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-21 17:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("companies", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="company",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="manufacturer",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-    ]

companies/migrations/0003_remove_company_insert_insert_and_more.py

@@ -1,89 +0,0 @@
-# Generated by Django 5.2.6 on 2025-09-20 13:40
-
-import pgtrigger.compiler
-import pgtrigger.migrations
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("companies", "0002_alter_company_id_alter_manufacturer_id"),
-    ]
-
-    operations = [
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="company",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="company",
-            name="update_update",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="manufacturer",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="manufacturer",
-            name="update_update",
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="company",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "companies_companyevent" ("created_at", "description", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "total_parks", "total_rides", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."slug", NEW."total_parks", NEW."total_rides", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="413671b13a748fb5f1acd57e8ec4af12ad7ae215",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_a4101",
-                    table="companies_company",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="company",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "companies_companyevent" ("created_at", "description", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "total_parks", "total_rides", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."slug", NEW."total_parks", NEW."total_rides", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="ee3eff1c96e46769347b8463d527668b7ece63c4",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_3d5ae",
-                    table="companies_company",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="manufacturer",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "companies_manufacturerevent" ("created_at", "description", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "total_rides", "total_roller_coasters", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."slug", NEW."total_rides", NEW."total_roller_coasters", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="ac3c4c31aa8dffe569154454a6c4479d189c0f64",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_5c0b6",
-                    table="companies_manufacturer",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="manufacturer",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "companies_manufacturerevent" ("created_at", "description", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "total_rides", "total_roller_coasters", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."slug", NEW."total_rides", NEW."total_roller_coasters", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="c46f36f5811cd843ff61eab3ae77624ae2e69f60",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_81971",
-                    table="companies_manufacturer",
-                    when="AFTER",
-                ),
-            ),
-        ),
-    ]

companies/models.py

@@ -2,11 +2,11 @@ from django.db import models
 from django.utils.text import slugify
 from django.urls import reverse
 from typing import Tuple, Optional, ClassVar, TYPE_CHECKING
-import pghistory
-from history_tracking.models import TrackedModel, HistoricalSlug
 
-@pghistory.track()
+if TYPE_CHECKING:
-class Company(TrackedModel):
+    from history_tracking.models import HistoricalSlug
+
+class Company(models.Model):
     name = models.CharField(max_length=255)
     slug = models.SlugField(max_length=255, unique=True)
     website = models.URLField(blank=True)
@@ -37,18 +37,8 @@ class Company(TrackedModel):
         try:
             return cls.objects.get(slug=slug), False
         except cls.DoesNotExist:
-            # Check pghistory first
+            # Check historical slugs
-            history_model = cls.get_history_model()
+            from history_tracking.models import HistoricalSlug
-            history_entry = (
-                history_model.objects.filter(slug=slug)
-                .order_by('-pgh_created_at')
-                .first()
-            )
-            
-            if history_entry:
-                return cls.objects.get(id=history_entry.pgh_obj_id), True
-            
-            # Check manual slug history as fallback
             try:
                 historical = HistoricalSlug.objects.get(
                     content_type__model='company',
@@ -58,8 +48,7 @@ class Company(TrackedModel):
             except (HistoricalSlug.DoesNotExist, cls.DoesNotExist):
                 raise cls.DoesNotExist()
 
-@pghistory.track()
+class Manufacturer(models.Model):
-class Manufacturer(TrackedModel):
     name = models.CharField(max_length=255)
     slug = models.SlugField(max_length=255, unique=True)
     website = models.URLField(blank=True)
@@ -89,18 +78,8 @@ class Manufacturer(TrackedModel):
         try:
             return cls.objects.get(slug=slug), False
         except cls.DoesNotExist:
-            # Check pghistory first
+            # Check historical slugs
-            history_model = cls.get_history_model()
+            from history_tracking.models import HistoricalSlug
-            history_entry = (
-                history_model.objects.filter(slug=slug)
-                .order_by('-pgh_created_at')
-                .first()
-            )
-            
-            if history_entry:
-                return cls.objects.get(id=history_entry.pgh_obj_id), True
-            
-            # Check manual slug history as fallback
             try:
                 historical = HistoricalSlug.objects.get(
                     content_type__model='manufacturer',
@@ -109,3 +88,43 @@ class Manufacturer(TrackedModel):
                 return cls.objects.get(pk=historical.object_id), True
             except (HistoricalSlug.DoesNotExist, cls.DoesNotExist):
                 raise cls.DoesNotExist()
+
+class Designer(models.Model):
+    name = models.CharField(max_length=255)
+    slug = models.SlugField(max_length=255, unique=True)
+    website = models.URLField(blank=True)
+    description = models.TextField(blank=True)
+    total_rides = models.IntegerField(default=0)
+    total_roller_coasters = models.IntegerField(default=0)
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+
+    objects: ClassVar[models.Manager['Designer']]
+
+    class Meta:
+        ordering = ['name']
+
+    def __str__(self) -> str:
+        return self.name
+
+    def save(self, *args, **kwargs) -> None:
+        if not self.slug:
+            self.slug = slugify(self.name)
+        super().save(*args, **kwargs)
+
+    @classmethod
+    def get_by_slug(cls, slug: str) -> Tuple['Designer', bool]:
+        """Get designer by slug, checking historical slugs if needed"""
+        try:
+            return cls.objects.get(slug=slug), False
+        except cls.DoesNotExist:
+            # Check historical slugs
+            from history_tracking.models import HistoricalSlug
+            try:
+                historical = HistoricalSlug.objects.get(
+                    content_type__model='designer',
+                    slug=slug
+                )
+                return cls.objects.get(pk=historical.object_id), True
+            except (HistoricalSlug.DoesNotExist, cls.DoesNotExist):
+                raise cls.DoesNotExist()

companies/views.py

@@ -206,7 +206,7 @@ class ManufacturerDetailView(SlugRedirectMixin, EditSubmissionMixin, PhotoSubmis
 
 
 def _handle_submission(
-    request: Any, form: Any, model: ModelType, success_url: str = ""
+    request: Any, form: Any, model: ModelType, success_url: str
 ) -> HttpResponseRedirect:
     """Helper method to handle form submissions"""
     cleaned_data = form.cleaned_data.copy()
@@ -214,7 +214,6 @@ def _handle_submission(
         user=request.user,
         content_type=ContentType.objects.get_for_model(model),
         submission_type="CREATE",
-        status="NEW",
         changes=cleaned_data,
         reason=request.POST.get("reason", ""),
         source=request.POST.get("source", ""),
@@ -230,12 +229,6 @@ def _handle_submission(
         submission.status = "APPROVED"
         submission.handled_by = request.user
         submission.save()
-        
-        # Generate success URL if not provided
-        if not success_url:
-            success_url = reverse(
-                f"companies:{model.__name__.lower()}_detail", kwargs={"slug": obj.slug}
-            )
         messages.success(request, f'Successfully created {getattr(obj, "name", "")}')
         return HttpResponseRedirect(success_url)
 
@@ -251,7 +244,10 @@ class CompanyCreateView(LoginRequiredMixin, CreateView):
     object: Optional[Company]
 
     def form_valid(self, form: CompanyForm) -> HttpResponseRedirect:
-        return _handle_submission(self.request, form, self.model, "")
+        success_url = reverse(
+            "companies:company_detail", kwargs={"slug": form.instance.slug}
+        )
+        return _handle_submission(self.request, form, self.model, success_url)
 
     def get_success_url(self) -> str:
         if self.object is None:
@@ -266,7 +262,10 @@ class ManufacturerCreateView(LoginRequiredMixin, CreateView):
     object: Optional[Manufacturer]
 
     def form_valid(self, form: ManufacturerForm) -> HttpResponseRedirect:
-        return _handle_submission(self.request, form, self.model, "")
+        success_url = reverse(
+            "companies:manufacturer_detail", kwargs={"slug": form.instance.slug}
+        )
+        return _handle_submission(self.request, form, self.model, success_url)
 
     def get_success_url(self) -> str:
         if self.object is None:

core/forms.py

@@ -1,39 +0,0 @@
-"""Core forms and form components."""
-from django.conf import settings
-from django.core.exceptions import PermissionDenied
-from django.utils.translation import gettext_lazy as _
-
-from autocomplete import Autocomplete
-
-
-class BaseAutocomplete(Autocomplete):
-    """Base autocomplete class for consistent autocomplete behavior across the project.
-    
-    This class extends django-htmx-autocomplete's base Autocomplete class to provide:
-    - Project-wide defaults for autocomplete behavior
-    - Translation strings
-    - Authentication enforcement
-    - Sensible search configuration
-    """
-    # Search configuration
-    minimum_search_length = 2  # More responsive than default 3
-    max_results = 10  # Reasonable limit for performance
-
-    # UI text configuration using gettext for i18n
-    no_result_text = _("No matches found")
-    narrow_search_text = _("Showing %(page_size)s of %(total)s matches. Please refine your search.")
-    type_at_least_n_characters = _("Type at least %(n)s characters...")
-
-    # Project-wide component settings
-    placeholder = _("Search...")
-
-    @staticmethod
-    def auth_check(request):
-        """Enforce authentication by default.
-        
-        This can be overridden in subclasses if public access is needed.
-        Configure AUTOCOMPLETE_BLOCK_UNAUTHENTICATED in settings to disable.
-        """
-        block_unauth = getattr(settings, 'AUTOCOMPLETE_BLOCK_UNAUTHENTICATED', True)
-        if block_unauth and not request.user.is_authenticated:
-            raise PermissionDenied(_("Authentication required"))

core/middleware.py

@@ -1,27 +0,0 @@
-import pghistory
-from django.contrib.auth.models import AnonymousUser
-from django.core.handlers.wsgi import WSGIRequest
-
-class RequestContextProvider(pghistory.context):
-    """Custom context provider for pghistory that extracts information from the request."""
-    def __call__(self, request: WSGIRequest) -> dict:
-        return {
-            'user': str(request.user) if request.user and not isinstance(request.user, AnonymousUser) else None,
-            'ip': request.META.get('REMOTE_ADDR'),
-            'user_agent': request.META.get('HTTP_USER_AGENT'),
-            'session_key': request.session.session_key if hasattr(request, 'session') else None
-        }
-
-# Initialize the context provider
-request_context = RequestContextProvider()
-
-class PgHistoryContextMiddleware:
-    """
-    Middleware that ensures request object is available to pghistory context.
-    """
-    def __init__(self, get_response):
-        self.get_response = get_response
-
-    def __call__(self, request):
-        response = self.get_response(request)
-        return response

core/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.3 on 2024-11-12 18:07
 
 import django.db.models.deletion
 from django.db import migrations, models

core/models.py

@@ -2,7 +2,6 @@ from django.db import models
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.utils.text import slugify
-from history_tracking.models import TrackedModel
 
 class SlugHistory(models.Model):
     """
@@ -27,7 +26,7 @@ class SlugHistory(models.Model):
     def __str__(self):
         return f"Old slug '{self.old_slug}' for {self.content_object}"
 
-class SluggedModel(TrackedModel):
+class SluggedModel(models.Model):
     """
     Abstract base model that provides slug functionality with history tracking.
     """
@@ -77,18 +76,7 @@ class SluggedModel(TrackedModel):
             # Try to get by current slug first
             return cls.objects.get(slug=slug), False
         except cls.DoesNotExist:
-            # Check pghistory first
+            # Try to find in slug history
-            history_model = cls.get_history_model()
-            history_entry = (
-                history_model.objects.filter(slug=slug)
-                .order_by('-pgh_created_at')
-                .first()
-            )
-            
-            if history_entry:
-                return cls.objects.get(id=history_entry.pgh_obj_id), True
-            
-            # Try to find in manual slug history as fallback
             history = SlugHistory.objects.filter(
                 content_type=ContentType.objects.get_for_model(cls),
                 old_slug=slug

designers/admin.py

@@ -1,13 +1,10 @@
 from django.contrib import admin
-from django.utils.text import slugify
+from simple_history.admin import SimpleHistoryAdmin
 from .models import Designer
 
 @admin.register(Designer)
-class DesignerAdmin(admin.ModelAdmin):
+class DesignerAdmin(SimpleHistoryAdmin):
     list_display = ('name', 'headquarters', 'founded_date', 'website')
     search_fields = ('name', 'headquarters')
+    list_filter = ('founded_date',)
     prepopulated_fields = {'slug': ('name',)}
-    readonly_fields = ('created_at', 'updated_at')
-
-    def get_queryset(self, request):
-        return super().get_queryset(request).select_related()

designers/migrations/0001_initial.py

@@ -1,8 +1,8 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.3 on 2024-11-12 18:07
 
 import django.db.models.deletion
-import pgtrigger.compiler
+import simple_history.models
-import pgtrigger.migrations
+from django.conf import settings
 from django.db import migrations, models
 
 
@@ -11,14 +11,22 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("pghistory", "0006_delete_aggregateevent"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
             name="Designer",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
                 ("name", models.CharField(max_length=255)),
                 ("slug", models.SlugField(max_length=255, unique=True)),
                 ("description", models.TextField(blank=True)),
@@ -33,73 +41,48 @@ class Migration(migrations.Migration):
             },
         ),
         migrations.CreateModel(
-            name="DesignerEvent",
+            name="HistoricalDesigner",
             fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
+                (
-                ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
+                    "id",
-                ("pgh_label", models.TextField(help_text="The event label.")),
+                    models.BigIntegerField(
-                ("id", models.BigIntegerField()),
+                        auto_created=True, blank=True, db_index=True, verbose_name="ID"
+                    ),
+                ),
                 ("name", models.CharField(max_length=255)),
-                ("slug", models.SlugField(db_index=False, max_length=255)),
+                ("slug", models.SlugField(max_length=255)),
                 ("description", models.TextField(blank=True)),
                 ("website", models.URLField(blank=True)),
                 ("founded_date", models.DateField(blank=True, null=True)),
                 ("headquarters", models.CharField(blank=True, max_length=255)),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("created_at", models.DateTimeField(blank=True, editable=False)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
+                ("updated_at", models.DateTimeField(blank=True, editable=False)),
+                ("history_id", models.AutoField(primary_key=True, serialize=False)),
+                ("history_date", models.DateTimeField(db_index=True)),
+                ("history_change_reason", models.CharField(max_length=100, null=True)),
+                (
+                    "history_type",
+                    models.CharField(
+                        choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
+                        max_length=1,
+                    ),
+                ),
+                (
+                    "history_user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
             ],
             options={
-                "abstract": False,
+                "verbose_name": "historical designer",
+                "verbose_name_plural": "historical designers",
+                "ordering": ("-history_date", "-history_id"),
+                "get_latest_by": ("history_date", "history_id"),
             },
-        ),
+            bases=(simple_history.models.HistoricalChanges, models.Model),
-        pgtrigger.migrations.AddTrigger(
-            model_name="designer",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "designers_designerevent" ("created_at", "description", "founded_date", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."founded_date", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."slug", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_9be65",
-                    table="designers_designer",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="designer",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "designers_designerevent" ("created_at", "description", "founded_date", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."founded_date", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."slug", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_b5f91",
-                    table="designers_designer",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        migrations.AddField(
-            model_name="designerevent",
-            name="pgh_context",
-            field=models.ForeignKey(
-                db_constraint=False,
-                null=True,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="+",
-                to="pghistory.context",
-            ),
-        ),
-        migrations.AddField(
-            model_name="designerevent",
-            name="pgh_obj",
-            field=models.ForeignKey(
-                db_constraint=False,
-                on_delete=django.db.models.deletion.DO_NOTHING,
-                related_name="events",
-                to="designers.designer",
-            ),
         ),
     ]

designers/migrations/0002_alter_designer_id.py

@@ -1,20 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-21 17:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("designers", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="designer",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-    ]

designers/migrations/0003_remove_designer_insert_insert_and_more.py

@@ -1,52 +0,0 @@
-# Generated by Django 5.2.6 on 2025-09-20 13:40
-
-import pgtrigger.compiler
-import pgtrigger.migrations
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("designers", "0002_alter_designer_id"),
-    ]
-
-    operations = [
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="designer",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="designer",
-            name="update_update",
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="designer",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "designers_designerevent" ("created_at", "description", "founded_date", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."founded_date", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."slug", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="876eaa3e1c7cf234f03cc706fa4e5e508ed780db",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_9be65",
-                    table="designers_designer",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="designer",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "designers_designerevent" ("created_at", "description", "founded_date", "headquarters", "id", "name", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "slug", "updated_at", "website") VALUES (NEW."created_at", NEW."description", NEW."founded_date", NEW."headquarters", NEW."id", NEW."name", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."slug", NEW."updated_at", NEW."website"); RETURN NULL;',
-                    hash="edb092b6a122ca5827740a9afcdc6a885fe69c1c",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_b5f91",
-                    table="designers_designer",
-                    when="AFTER",
-                ),
-            ),
-        ),
-    ]

designers/models.py

@@ -1,10 +1,8 @@
 from django.db import models
 from django.utils.text import slugify
-from history_tracking.models import TrackedModel
+from simple_history.models import HistoricalRecords
-import pghistory
 
-@pghistory.track()
+class Designer(models.Model):
-class Designer(TrackedModel):
     name = models.CharField(max_length=255)
     slug = models.SlugField(max_length=255, unique=True)
     description = models.TextField(blank=True)
@@ -13,6 +11,7 @@ class Designer(TrackedModel):
     headquarters = models.CharField(max_length=255, blank=True)
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
+    history = HistoricalRecords()
 
     class Meta:
         ordering = ['name']
@@ -31,13 +30,8 @@ class Designer(TrackedModel):
         try:
             return cls.objects.get(slug=slug), False
         except cls.DoesNotExist:
-            # Check historical slugs using pghistory
+            # Check historical slugs
-            history_model = cls.get_history_model()
+            history = cls.history.filter(slug=slug).order_by('-history_date').first()
-            history = (
-                history_model.objects.filter(slug=slug)
-                .order_by('-pgh_created_at')
-                .first()
-            )
             if history:
-                return cls.objects.get(id=history.pgh_obj_id), True
+                return cls.objects.get(id=history.id), True
             raise cls.DoesNotExist("No designer found with this slug")

email_service/management/commands/test_email_service.py

@@ -77,7 +77,7 @@ class Command(BaseCommand):
         # If no recipient specified, use the from_email address for testing
         to_email = options['to'] or 'test@thrillwiki.com'
 
-        self.stdout.write(self.style.SUCCESS('Using configuration:'))
+        self.stdout.write(self.style.SUCCESS(f'Using configuration:'))
         self.stdout.write(f'  From: {from_email}')
         self.stdout.write(f'  To: {to_email}')
         self.stdout.write(f'  API Key: {"*" * len(api_key)}')
@@ -146,8 +146,8 @@ class Command(BaseCommand):
                 },
                 headers={
                     'Content-Type': 'application/json',
-                }, 
+                }
-            timeout=60)
+            )
 
             if response.status_code == 200:
                 self.stdout.write(self.style.SUCCESS('✓ API endpoint test successful'))

email_service/migrations/0001_initial.py

@@ -1,8 +1,6 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.3 on 2024-11-12 18:07
 
 import django.db.models.deletion
-import pgtrigger.compiler
-import pgtrigger.migrations
 from django.db import migrations, models
 
 
@@ -11,7 +9,6 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("pghistory", "0006_delete_aggregateevent"),
         ("sites", "0002_alter_domain_unique"),
     ]
 
@@ -19,7 +16,15 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name="EmailConfiguration",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
                 ("api_key", models.CharField(max_length=255)),
                 ("from_email", models.EmailField(max_length=254)),
                 (
@@ -44,86 +49,4 @@ class Migration(migrations.Migration):
                 "verbose_name_plural": "Email Configurations",
             },
         ),
-        migrations.CreateModel(
-            name="EmailConfigurationEvent",
-            fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
-                ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
-                ("pgh_label", models.TextField(help_text="The event label.")),
-                ("id", models.BigIntegerField()),
-                ("api_key", models.CharField(max_length=255)),
-                ("from_email", models.EmailField(max_length=254)),
-                (
-                    "from_name",
-                    models.CharField(
-                        help_text="The name that will appear in the From field of emails",
-                        max_length=255,
-                    ),
-                ),
-                ("reply_to", models.EmailField(max_length=254)),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
-                (
-                    "pgh_context",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        to="pghistory.context",
-                    ),
-                ),
-                (
-                    "pgh_obj",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="events",
-                        to="email_service.emailconfiguration",
-                    ),
-                ),
-                (
-                    "site",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        related_query_name="+",
-                        to="sites.site",
-                    ),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="emailconfiguration",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "email_service_emailconfigurationevent" ("api_key", "created_at", "from_email", "from_name", "id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "reply_to", "site_id", "updated_at") VALUES (NEW."api_key", NEW."created_at", NEW."from_email", NEW."from_name", NEW."id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."reply_to", NEW."site_id", NEW."updated_at"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_08c59",
-                    table="email_service_emailconfiguration",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="emailconfiguration",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "email_service_emailconfigurationevent" ("api_key", "created_at", "from_email", "from_name", "id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "reply_to", "site_id", "updated_at") VALUES (NEW."api_key", NEW."created_at", NEW."from_email", NEW."from_name", NEW."id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."reply_to", NEW."site_id", NEW."updated_at"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_992a4",
-                    table="email_service_emailconfiguration",
-                    when="AFTER",
-                ),
-            ),
-        ),
     ]

email_service/migrations/0002_alter_emailconfiguration_id.py

@@ -1,20 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-21 17:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("email_service", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="emailconfiguration",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-    ]

email_service/migrations/0003_remove_emailconfiguration_insert_insert_and_more.py

@@ -1,52 +0,0 @@
-# Generated by Django 5.2.6 on 2025-09-20 13:40
-
-import pgtrigger.compiler
-import pgtrigger.migrations
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("email_service", "0002_alter_emailconfiguration_id"),
-    ]
-
-    operations = [
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="emailconfiguration",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="emailconfiguration",
-            name="update_update",
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="emailconfiguration",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "email_service_emailconfigurationevent" ("api_key", "created_at", "from_email", "from_name", "id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "reply_to", "site_id", "updated_at") VALUES (NEW."api_key", NEW."created_at", NEW."from_email", NEW."from_name", NEW."id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."reply_to", NEW."site_id", NEW."updated_at"); RETURN NULL;',
-                    hash="f19f3c7f7d904d5f850a2ff1e0bf1312e855c8c0",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_08c59",
-                    table="email_service_emailconfiguration",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="emailconfiguration",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "email_service_emailconfigurationevent" ("api_key", "created_at", "from_email", "from_name", "id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "reply_to", "site_id", "updated_at") VALUES (NEW."api_key", NEW."created_at", NEW."from_email", NEW."from_name", NEW."id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."reply_to", NEW."site_id", NEW."updated_at"); RETURN NULL;',
-                    hash="e445521baf2cfb51379b2a6be550b4a638d60202",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_992a4",
-                    table="email_service_emailconfiguration",
-                    when="AFTER",
-                ),
-            ),
-        ),
-    ]

email_service/models.py

@@ -1,10 +1,7 @@
 from django.db import models
 from django.contrib.sites.models import Site
-from history_tracking.models import TrackedModel
-import pghistory
 
-@pghistory.track()
+class EmailConfiguration(models.Model):
-class EmailConfiguration(TrackedModel):
     api_key = models.CharField(max_length=255)
     from_email = models.EmailField()
     from_name = models.CharField(max_length=255, help_text="The name that will appear in the From field of emails")

email_service/services.py

@@ -74,7 +74,7 @@ class EmailService:
                 f"{settings.FORWARD_EMAIL_BASE_URL}/v1/emails",
                 json=data,
                 headers=headers,
-            timeout=60)
+            )
 
             # Debug output
             print(f"Response Status: {response.status_code}")

globalLocators.js

@@ -1,3 +0,0 @@
-const locators = {};
-
-module.exports = { locators };

history/apps.py

@@ -1,12 +0,0 @@
-from django.apps import AppConfig
-
-class HistoryConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
-    name = 'history'
-    verbose_name = 'History Tracking'
-
-    def ready(self):
-        """Initialize app and signal handlers"""
-        from django.dispatch import Signal
-        # Create a signal for history updates
-        self.history_updated = Signal()

history/templates/history/partials/history_timeline.html

@@ -1,29 +0,0 @@
-<div id="history-timeline" 
-     hx-get="{% url 'history:timeline' content_type_id=content_type.id object_id=object.id %}"
-     hx-trigger="every 30s, historyUpdate from:body">
-  <div class="space-y-4">
-    {% for event in events %}
-      <div class="component-wrapper bg-white p-4 shadow-sm">
-        <div class="component-header flex items-center gap-2 mb-2">
-          <span class="text-sm font-medium">{{ event.pgh_label|title }}</span>
-          <time class="text-xs text-gray-500">{{ event.pgh_created_at|date:"M j, Y H:i" }}</time>
-        </div>
-        <div class="component-content text-sm">
-          {% if event.pgh_context.metadata.user %}
-            <div class="flex items-center gap-1">
-              <svg class="w-4 h-4" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" fill="currentColor">
-                <path fill-rule="evenodd" d="M10 9a3 3 0 100-6 3 3 0 000 6zm-7 9a7 7 0 1114 0H3z" clip-rule="evenodd" />
-              </svg>
-              <span>{{ event.pgh_context.metadata.user }}</span>
-            </div>
-          {% endif %}
-          {% if event.pgh_data %}
-            <div class="mt-2 text-gray-600">
-              <pre class="text-xs">{{ event.pgh_data|pprint }}</pre>
-            </div>
-          {% endif %}
-        </div>
-      </div>
-    {% endfor %}
-  </div>
-</div>

history/templatetags/history_tags.py

@@ -1,17 +0,0 @@
-from django import template
-import json
-
-register = template.Library()
-
-@register.filter
-def pprint(value):
-    """Pretty print JSON data"""
-    if isinstance(value, str):
-        try:
-            value = json.loads(value)
-        except json.JSONDecodeError:
-            return value
-            
-    if isinstance(value, (dict, list)):
-        return json.dumps(value, indent=2)
-    return str(value)

history/urls.py

@@ -1,10 +0,0 @@
-from django.urls import path
-from .views import HistoryTimelineView
-
-app_name = 'history'
-
-urlpatterns = [
-    path('timeline/<int:content_type_id>/<int:object_id>/', 
-         HistoryTimelineView.as_view(), 
-         name='timeline'),
-]

history/views.py

@@ -1,41 +0,0 @@
-from django.views import View
-from django.shortcuts import render
-from django.http import JsonResponse
-from django.contrib.contenttypes.models import ContentType
-import pghistory
-
-def serialize_event(event):
-    """Serialize a history event for JSON response"""
-    return {
-        'label': event.pgh_label,
-        'created_at': event.pgh_created_at.isoformat(),
-        'context': event.pgh_context,
-        'data': event.pgh_data,
-    }
-
-class HistoryTimelineView(View):
-    """View for displaying object history timeline"""
-    
-    def get(self, request, content_type_id, object_id):
-        # Get content type and object
-        content_type = ContentType.objects.get_for_id(content_type_id)
-        obj = content_type.get_object_for_this_type(id=object_id)
-
-        # Get history events
-        events = pghistory.models.Event.objects.filter(
-            pgh_obj_model=content_type.model_class(),
-            pgh_obj_id=object_id
-        ).order_by('-pgh_created_at')[:25]
-
-        context = {
-            'events': events,
-            'content_type': content_type,
-            'object': obj,
-        }
-
-        if request.htmx:
-            return render(request, "history/partials/history_timeline.html", context)
-            
-        return JsonResponse({
-            'history': [serialize_event(e) for e in events]
-        })

history_tracking/apps.py

@@ -7,9 +7,20 @@ class HistoryTrackingConfig(AppConfig):
     name = "history_tracking"
 
     def ready(self):
-        """
+        from django.apps import apps
-        No initialization needed for pghistory tracking.
+        from .mixins import HistoricalChangeMixin
-        History tracking is handled by the @pghistory.track() decorator
+
-        and triggers installed in migrations.
+        # Get the Park model
-        """
+        try:
-        pass
+            Park = apps.get_model('parks', 'Park')
+            ParkArea = apps.get_model('parks', 'ParkArea')
+            
+            # Apply mixin to historical models
+            if HistoricalChangeMixin not in Park.history.model.__bases__:
+                Park.history.model.__bases__ = (HistoricalChangeMixin,) + Park.history.model.__bases__
+            
+            if HistoricalChangeMixin not in ParkArea.history.model.__bases__:
+                ParkArea.history.model.__bases__ = (HistoricalChangeMixin,) + ParkArea.history.model.__bases__
+        except LookupError:
+            # Models might not be loaded yet
+            pass

history_tracking/migrations/0001_initial.py

@@ -1,32 +1,50 @@
-from django.conf import settings
+# Generated by Django 5.1.3 on 2024-11-12 18:07
-from django.db import migrations, models
+
 import django.db.models.deletion
+from django.db import migrations, models
+
 
 class Migration(migrations.Migration):
+
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("contenttypes", "0002_remove_content_type_name"),
-        ('contenttypes', '0002_remove_content_type_name'),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='HistoricalSlug',
+            name="HistoricalSlug",
             fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                (
-                ('object_id', models.PositiveIntegerField()),
+                    "id",
-                ('slug', models.SlugField(max_length=255)),
+                    models.BigAutoField(
-                ('created_at', models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now)),
+                        auto_created=True,
-                ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.contenttype')),
+                        primary_key=True,
-                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='historical_slugs', to=settings.AUTH_USER_MODEL)),
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("object_id", models.PositiveIntegerField()),
+                ("slug", models.SlugField(max_length=255)),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                (
+                    "content_type",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="contenttypes.contenttype",
+                    ),
+                ),
             ],
             options={
-                'unique_together': {('content_type', 'slug')},
+                "indexes": [
-                'indexes': [
+                    models.Index(
-                    models.Index(fields=['content_type', 'object_id'], name='history_tra_content_1234ab_idx'),
+                        fields=["content_type", "object_id"],
-                    models.Index(fields=['slug'], name='history_tra_slug_1234ab_idx'),
+                        name="history_tra_content_63013c_idx",
+                    ),
+                    models.Index(fields=["slug"], name="history_tra_slug_f843aa_idx"),
                 ],
+                "unique_together": {("content_type", "slug")},
             },
         ),
     ]

history_tracking/migrations/0002_rename_history_tra_content_1234ab_idx_history_tra_content_63013c_idx_and_more.py

@@ -1,28 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-21 17:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("history_tracking", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.RenameIndex(
-            model_name="historicalslug",
-            new_name="history_tra_content_63013c_idx",
-            old_name="history_tra_content_1234ab_idx",
-        ),
-        migrations.RenameIndex(
-            model_name="historicalslug",
-            new_name="history_tra_slug_f843aa_idx",
-            old_name="history_tra_slug_1234ab_idx",
-        ),
-        migrations.AlterField(
-            model_name="historicalslug",
-            name="created_at",
-            field=models.DateTimeField(auto_now_add=True),
-        ),
-    ]

history_tracking/mixins.py

@@ -0,0 +1,74 @@
+# history_tracking/mixins.py
+from django.db import models
+from django.conf import settings
+
+class HistoricalChangeMixin(models.Model):
+    """Mixin for historical models to track changes"""
+    id = models.BigIntegerField(db_index=True, auto_created=True, blank=True)
+    history_date = models.DateTimeField()
+    history_id = models.AutoField(primary_key=True)
+    history_type = models.CharField(max_length=1)
+    history_user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        null=True,
+        on_delete=models.SET_NULL,
+        related_name='+'
+    )
+    history_change_reason = models.CharField(max_length=100, null=True)
+    
+    class Meta:
+        abstract = True
+        ordering = ['-history_date', '-history_id']
+
+    @property
+    def prev_record(self):
+        """Get the previous record for this instance"""
+        try:
+            return self.__class__.objects.filter(
+                history_date__lt=self.history_date,
+                id=self.id
+            ).order_by('-history_date').first()
+        except (AttributeError, TypeError):
+            return None
+
+    @property
+    def diff_against_previous(self):
+        prev_record = self.prev_record
+        if not prev_record:
+            return {}
+
+        changes = {}
+        for field in self.__dict__:
+            if field not in [
+                "history_date",
+                "history_id",
+                "history_type",
+                "history_user_id",
+                "history_change_reason",
+                "history_type",
+                "id",
+                "_state",
+                "_history_user_cache"
+            ] and not field.startswith("_"):
+                try:
+                    old_value = getattr(prev_record, field)
+                    new_value = getattr(self, field)
+                    if old_value != new_value:
+                        changes[field] = {"old": str(old_value), "new": str(new_value)}
+                except AttributeError:
+                    continue
+        return changes
+
+    @property
+    def history_user_display(self):
+        """Get a display name for the history user"""
+        if hasattr(self, 'history_user') and self.history_user:
+            return str(self.history_user)
+        return None
+
+    def get_instance(self):
+        """Get the model instance this history record represents"""
+        try:
+            return self.__class__.objects.get(id=self.id)
+        except self.__class__.DoesNotExist:
+            return None

history_tracking/models.py

@@ -1,70 +1,34 @@
+# history_tracking/models.py
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
-from django.conf import settings
+from simple_history.models import HistoricalRecords
-from typing import Any, Dict, Optional
+from .mixins import HistoricalChangeMixin
+from typing import Any, Type, TypeVar, cast
 from django.db.models import QuerySet
 
-class DiffMixin:
+T = TypeVar('T', bound=models.Model)
-    """Mixin to add diffing capabilities to models"""
-    
-    def get_prev_record(self) -> Optional[Any]:
-        """Get the previous record for this instance"""
-        try:
-            return type(self).objects.filter(
-                pgh_created_at__lt=self.pgh_created_at,
-                pgh_obj_id=self.pgh_obj_id
-            ).order_by('-pgh_created_at').first()
-        except (AttributeError, TypeError):
-            return None
 
-    def diff_against_previous(self) -> Dict:
+class HistoricalModel(models.Model):
-        """Compare this record against the previous one"""
+    """Abstract base class for models with history tracking"""
-        prev_record = self.get_prev_record()
+    id = models.BigAutoField(primary_key=True)
-        if not prev_record:
+    history: HistoricalRecords = HistoricalRecords(
-            return {}
+        inherit=True,
-
+        bases=(HistoricalChangeMixin,)
-        skip_fields = {
+    )
-            'pgh_id', 'pgh_created_at', 'pgh_label', 
-            'pgh_obj_id', 'pgh_context_id', '_state',
-            'created_at', 'updated_at'
-        }
-
-        changes = {}
-        for field, value in self.__dict__.items():
-            # Skip internal fields and those we don't want to track
-            if field.startswith('_') or field in skip_fields or field.endswith('_id'):
-                continue
-
-            try:
-                old_value = getattr(prev_record, field)
-                new_value = value
-                if old_value != new_value:
-                    changes[field] = {
-                        "old": str(old_value) if old_value is not None else "None",
-                        "new": str(new_value) if new_value is not None else "None"
-                    }
-            except AttributeError:
-                continue
-
-        return changes
-
-class TrackedModel(models.Model):
-    """Abstract base class for models that need history tracking"""
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
 
     class Meta:
         abstract = True
 
+    @property
+    def _history_model(self) -> Type[T]:
+        """Get the history model class"""
+        return cast(Type[T], self.history.model)  # type: ignore
+
     def get_history(self) -> QuerySet:
-        """Get all history records for this instance in chronological order"""
+        """Get all history records for this instance"""
-        event_model = self.events.model  # pghistory provides this automatically
+        model = self._history_model
-        if event_model:
+        return model.objects.filter(id=self.pk).order_by('-history_date')
-            return event_model.objects.filter(
-                pgh_obj_id=self.pk
-            ).order_by('-pgh_created_at')
-        return self.__class__.objects.none()
 
 class HistoricalSlug(models.Model):
     """Track historical slugs for models"""
@@ -73,13 +37,6 @@ class HistoricalSlug(models.Model):
     content_object = GenericForeignKey('content_type', 'object_id')
     slug = models.SlugField(max_length=255)
     created_at = models.DateTimeField(auto_now_add=True)
-    user = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        null=True,
-        blank=True,
-        on_delete=models.SET_NULL,
-        related_name='historical_slugs'
-    )
 
     class Meta:
         unique_together = ('content_type', 'slug')

location/apps.py

@@ -1,7 +1,5 @@
 from django.apps import AppConfig
-import os
 
 class LocationConfig(AppConfig):
-    path = os.path.dirname(os.path.abspath(__file__))
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'location'

location/migrations/0001_initial.py

@@ -1,10 +1,10 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.3 on 2024-11-12 18:07
 
 import django.contrib.gis.db.models.fields
 import django.core.validators
 import django.db.models.deletion
-import pgtrigger.compiler
+import simple_history.models
-import pgtrigger.migrations
+from django.conf import settings
 from django.db import migrations, models
 
 
@@ -14,14 +14,140 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
-        ("pghistory", "0006_delete_aggregateevent"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name="HistoricalLocation",
+            fields=[
+                (
+                    "id",
+                    models.BigIntegerField(
+                        auto_created=True, blank=True, db_index=True, verbose_name="ID"
+                    ),
+                ),
+                ("object_id", models.PositiveIntegerField()),
+                (
+                    "name",
+                    models.CharField(
+                        help_text="Name of the location (e.g. business name, landmark)",
+                        max_length=255,
+                    ),
+                ),
+                (
+                    "location_type",
+                    models.CharField(
+                        help_text="Type of location (e.g. business, landmark, address)",
+                        max_length=50,
+                    ),
+                ),
+                (
+                    "latitude",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=6,
+                        help_text="Latitude coordinate (legacy field)",
+                        max_digits=9,
+                        null=True,
+                        validators=[
+                            django.core.validators.MinValueValidator(-90),
+                            django.core.validators.MaxValueValidator(90),
+                        ],
+                    ),
+                ),
+                (
+                    "longitude",
+                    models.DecimalField(
+                        blank=True,
+                        decimal_places=6,
+                        help_text="Longitude coordinate (legacy field)",
+                        max_digits=9,
+                        null=True,
+                        validators=[
+                            django.core.validators.MinValueValidator(-180),
+                            django.core.validators.MaxValueValidator(180),
+                        ],
+                    ),
+                ),
+                (
+                    "point",
+                    django.contrib.gis.db.models.fields.PointField(
+                        blank=True,
+                        help_text="Geographic coordinates as a Point",
+                        null=True,
+                        srid=4326,
+                    ),
+                ),
+                (
+                    "street_address",
+                    models.CharField(blank=True, max_length=255, null=True),
+                ),
+                ("city", models.CharField(blank=True, max_length=100, null=True)),
+                (
+                    "state",
+                    models.CharField(
+                        blank=True,
+                        help_text="State/Region/Province",
+                        max_length=100,
+                        null=True,
+                    ),
+                ),
+                ("country", models.CharField(blank=True, max_length=100, null=True)),
+                ("postal_code", models.CharField(blank=True, max_length=20, null=True)),
+                ("created_at", models.DateTimeField(blank=True, editable=False)),
+                ("updated_at", models.DateTimeField(blank=True, editable=False)),
+                ("history_id", models.AutoField(primary_key=True, serialize=False)),
+                ("history_date", models.DateTimeField(db_index=True)),
+                ("history_change_reason", models.CharField(max_length=100, null=True)),
+                (
+                    "history_type",
+                    models.CharField(
+                        choices=[("+", "Created"), ("~", "Changed"), ("-", "Deleted")],
+                        max_length=1,
+                    ),
+                ),
+                (
+                    "content_type",
+                    models.ForeignKey(
+                        blank=True,
+                        db_constraint=False,
+                        null=True,
+                        on_delete=django.db.models.deletion.DO_NOTHING,
+                        related_name="+",
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+                (
+                    "history_user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="+",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "historical location",
+                "verbose_name_plural": "historical locations",
+                "ordering": ("-history_date", "-history_id"),
+                "get_latest_by": ("history_date", "history_id"),
+            },
+            bases=(simple_history.models.HistoricalChanges, models.Model),
+        ),
         migrations.CreateModel(
             name="Location",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
                 ("object_id", models.PositiveIntegerField()),
                 (
                     "name",
@@ -102,163 +228,16 @@ class Migration(migrations.Migration):
             ],
             options={
                 "ordering": ["name"],
+                "indexes": [
+                    models.Index(
+                        fields=["content_type", "object_id"],
+                        name="location_lo_content_9ee1bd_idx",
+                    ),
+                    models.Index(fields=["city"], name="location_lo_city_99f908_idx"),
+                    models.Index(
+                        fields=["country"], name="location_lo_country_b75eba_idx"
+                    ),
+                ],
             },
         ),
-        migrations.CreateModel(
-            name="LocationEvent",
-            fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
-                ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
-                ("pgh_label", models.TextField(help_text="The event label.")),
-                ("id", models.BigIntegerField()),
-                ("object_id", models.PositiveIntegerField()),
-                (
-                    "name",
-                    models.CharField(
-                        help_text="Name of the location (e.g. business name, landmark)",
-                        max_length=255,
-                    ),
-                ),
-                (
-                    "location_type",
-                    models.CharField(
-                        help_text="Type of location (e.g. business, landmark, address)",
-                        max_length=50,
-                    ),
-                ),
-                (
-                    "latitude",
-                    models.DecimalField(
-                        blank=True,
-                        decimal_places=6,
-                        help_text="Latitude coordinate (legacy field)",
-                        max_digits=9,
-                        null=True,
-                        validators=[
-                            django.core.validators.MinValueValidator(-90),
-                            django.core.validators.MaxValueValidator(90),
-                        ],
-                    ),
-                ),
-                (
-                    "longitude",
-                    models.DecimalField(
-                        blank=True,
-                        decimal_places=6,
-                        help_text="Longitude coordinate (legacy field)",
-                        max_digits=9,
-                        null=True,
-                        validators=[
-                            django.core.validators.MinValueValidator(-180),
-                            django.core.validators.MaxValueValidator(180),
-                        ],
-                    ),
-                ),
-                (
-                    "point",
-                    django.contrib.gis.db.models.fields.PointField(
-                        blank=True,
-                        help_text="Geographic coordinates as a Point",
-                        null=True,
-                        srid=4326,
-                    ),
-                ),
-                (
-                    "street_address",
-                    models.CharField(blank=True, max_length=255, null=True),
-                ),
-                ("city", models.CharField(blank=True, max_length=100, null=True)),
-                (
-                    "state",
-                    models.CharField(
-                        blank=True,
-                        help_text="State/Region/Province",
-                        max_length=100,
-                        null=True,
-                    ),
-                ),
-                ("country", models.CharField(blank=True, max_length=100, null=True)),
-                ("postal_code", models.CharField(blank=True, max_length=20, null=True)),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
-                (
-                    "content_type",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        related_query_name="+",
-                        to="contenttypes.contenttype",
-                    ),
-                ),
-                (
-                    "pgh_context",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        to="pghistory.context",
-                    ),
-                ),
-                (
-                    "pgh_obj",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="events",
-                        to="location.location",
-                    ),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
-        migrations.AddIndex(
-            model_name="location",
-            index=models.Index(
-                fields=["content_type", "object_id"],
-                name="location_lo_content_9ee1bd_idx",
-            ),
-        ),
-        migrations.AddIndex(
-            model_name="location",
-            index=models.Index(fields=["city"], name="location_lo_city_99f908_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="location",
-            index=models.Index(
-                fields=["country"], name="location_lo_country_b75eba_idx"
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="location",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "location_locationevent" ("city", "content_type_id", "country", "created_at", "id", "latitude", "location_type", "longitude", "name", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "point", "postal_code", "state", "street_address", "updated_at") VALUES (NEW."city", NEW."content_type_id", NEW."country", NEW."created_at", NEW."id", NEW."latitude", NEW."location_type", NEW."longitude", NEW."name", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."point", NEW."postal_code", NEW."state", NEW."street_address", NEW."updated_at"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_98cd4",
-                    table="location_location",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="location",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "location_locationevent" ("city", "content_type_id", "country", "created_at", "id", "latitude", "location_type", "longitude", "name", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "point", "postal_code", "state", "street_address", "updated_at") VALUES (NEW."city", NEW."content_type_id", NEW."country", NEW."created_at", NEW."id", NEW."latitude", NEW."location_type", NEW."longitude", NEW."name", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."point", NEW."postal_code", NEW."state", NEW."street_address", NEW."updated_at"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_471d2",
-                    table="location_location",
-                    when="AFTER",
-                ),
-            ),
-        ),
     ]

location/migrations/0002_alter_location_id.py

@@ -1,20 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-21 17:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("location", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="location",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-    ]

location/migrations/0003_remove_location_insert_insert_and_more.py

@@ -1,52 +0,0 @@
-# Generated by Django 5.2.6 on 2025-09-20 13:40
-
-import pgtrigger.compiler
-import pgtrigger.migrations
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("location", "0002_alter_location_id"),
-    ]
-
-    operations = [
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="location",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="location",
-            name="update_update",
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="location",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "location_locationevent" ("city", "content_type_id", "country", "created_at", "id", "latitude", "location_type", "longitude", "name", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "point", "postal_code", "state", "street_address", "updated_at") VALUES (NEW."city", NEW."content_type_id", NEW."country", NEW."created_at", NEW."id", NEW."latitude", NEW."location_type", NEW."longitude", NEW."name", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."point", NEW."postal_code", NEW."state", NEW."street_address", NEW."updated_at"); RETURN NULL;',
-                    hash="8a8f00869cfcaa1a23ab29b3d855e83602172c67",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_98cd4",
-                    table="location_location",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="location",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "location_locationevent" ("city", "content_type_id", "country", "created_at", "id", "latitude", "location_type", "longitude", "name", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "point", "postal_code", "state", "street_address", "updated_at") VALUES (NEW."city", NEW."content_type_id", NEW."country", NEW."created_at", NEW."id", NEW."latitude", NEW."location_type", NEW."longitude", NEW."name", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."point", NEW."postal_code", NEW."state", NEW."street_address", NEW."updated_at"); RETURN NULL;',
-                    hash="f3378cb26a5d88aa82c8fae016d46037b530de90",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_471d2",
-                    table="location_location",
-                    when="AFTER",
-                ),
-            ),
-        ),
-    ]

location/models.py

@@ -3,12 +3,10 @@ from django.db import models
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.core.validators import MinValueValidator, MaxValueValidator
+from simple_history.models import HistoricalRecords
 from django.contrib.gis.geos import Point
-import pghistory
-from history_tracking.models import TrackedModel
 
-@pghistory.track()
+class Location(models.Model):
-class Location(TrackedModel):
     """
     A generic location model that can be associated with any model
     using GenericForeignKey. Stores detailed location information
@@ -65,6 +63,7 @@ class Location(TrackedModel):
     # Metadata
     created_at = models.DateTimeField(auto_now_add=True)
     updated_at = models.DateTimeField(auto_now=True)
+    history = HistoricalRecords()
 
     class Meta:
         indexes = [

location/views.py

@@ -9,8 +9,6 @@ from django.views.decorators.http import require_http_methods
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_protect
 from django.db.models import Q
-
-from location.forms import LocationForm
 from .models import Location
 
 class LocationSearchView(View):
@@ -54,8 +52,8 @@ class LocationSearchView(View):
             response = requests.get(
                 'https://nominatim.openstreetmap.org/search',
                 params=params,
-                headers={'User-Agent': 'ThrillWiki/1.0'}, 
+                headers={'User-Agent': 'ThrillWiki/1.0'}
-            timeout=60)
+            )
             response.raise_for_status()
             results = response.json()
         except requests.RequestException as e:
@@ -172,8 +170,8 @@ def reverse_geocode(request):
                 'format': 'json',
                 'addressdetails': 1
             },
-            headers={'User-Agent': 'ThrillWiki/1.0'}, 
+            headers={'User-Agent': 'ThrillWiki/1.0'}
-        timeout=60)
+        )
         response.raise_for_status()
         result = response.json()
         

manage.py

@@ -6,7 +6,7 @@ import sys
 
 def main():
     """Run administrative tasks."""
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "thrillwiki.settings")
+    os***REMOVED***iron.setdefault("DJANGO_SETTINGS_MODULE", "thrillwiki.settings")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

media/management/commands/download_photos.py

@@ -33,7 +33,7 @@ class Command(BaseCommand):
                     try:
                         # Download image
                         self.stdout.write(f'Downloading from URL: {photo_url}')
-                        response = requests.get(photo_url, timeout=60)
+                        response = requests.get(photo_url)
                         if response.status_code == 200:
                             # Delete any existing photos for this park
                             Photo.objects.filter(
@@ -74,7 +74,7 @@ class Command(BaseCommand):
                             try:
                                 # Download image
                                 self.stdout.write(f'Downloading from URL: {photo_url}')
-                                response = requests.get(photo_url, timeout=60)
+                                response = requests.get(photo_url)
                                 if response.status_code == 200:
                                     # Delete any existing photos for this ride
                                     Photo.objects.filter(

media/migrations/0001_initial.py

@@ -1,10 +1,8 @@
-# Generated by Django 5.1.4 on 2025-02-10 01:10
+# Generated by Django 5.1.3 on 2024-11-12 18:07
 
 import django.db.models.deletion
 import media.models
 import media.storage
-import pgtrigger.compiler
-import pgtrigger.migrations
 from django.conf import settings
 from django.db import migrations, models
 
@@ -15,7 +13,6 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ("contenttypes", "0002_remove_content_type_name"),
-        ("pghistory", "0006_delete_aggregateevent"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
@@ -23,7 +20,15 @@ class Migration(migrations.Migration):
         migrations.CreateModel(
             name="Photo",
             fields=[
-                ("id", models.BigAutoField(primary_key=True, serialize=False)),
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
                 (
                     "image",
                     models.ImageField(
@@ -59,110 +64,12 @@ class Migration(migrations.Migration):
             ],
             options={
                 "ordering": ["-is_primary", "-created_at"],
+                "indexes": [
+                    models.Index(
+                        fields=["content_type", "object_id"],
+                        name="media_photo_content_0187f5_idx",
+                    )
+                ],
             },
         ),
-        migrations.CreateModel(
-            name="PhotoEvent",
-            fields=[
-                ("pgh_id", models.AutoField(primary_key=True, serialize=False)),
-                ("pgh_created_at", models.DateTimeField(auto_now_add=True)),
-                ("pgh_label", models.TextField(help_text="The event label.")),
-                ("id", models.BigIntegerField()),
-                (
-                    "image",
-                    models.ImageField(
-                        max_length=255,
-                        storage=media.storage.MediaStorage(),
-                        upload_to=media.models.photo_upload_path,
-                    ),
-                ),
-                ("caption", models.CharField(blank=True, max_length=255)),
-                ("alt_text", models.CharField(blank=True, max_length=255)),
-                ("is_primary", models.BooleanField(default=False)),
-                ("is_approved", models.BooleanField(default=False)),
-                ("created_at", models.DateTimeField(auto_now_add=True)),
-                ("updated_at", models.DateTimeField(auto_now=True)),
-                ("date_taken", models.DateTimeField(blank=True, null=True)),
-                ("object_id", models.PositiveIntegerField()),
-                (
-                    "content_type",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        related_query_name="+",
-                        to="contenttypes.contenttype",
-                    ),
-                ),
-                (
-                    "pgh_context",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        to="pghistory.context",
-                    ),
-                ),
-                (
-                    "pgh_obj",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="events",
-                        to="media.photo",
-                    ),
-                ),
-                (
-                    "uploaded_by",
-                    models.ForeignKey(
-                        db_constraint=False,
-                        null=True,
-                        on_delete=django.db.models.deletion.DO_NOTHING,
-                        related_name="+",
-                        related_query_name="+",
-                        to=settings.AUTH_USER_MODEL,
-                    ),
-                ),
-            ],
-            options={
-                "abstract": False,
-            },
-        ),
-        migrations.AddIndex(
-            model_name="photo",
-            index=models.Index(
-                fields=["content_type", "object_id"],
-                name="media_photo_content_0187f5_idx",
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="photo",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "media_photoevent" ("alt_text", "caption", "content_type_id", "created_at", "date_taken", "id", "image", "is_approved", "is_primary", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "updated_at", "uploaded_by_id") VALUES (NEW."alt_text", NEW."caption", NEW."content_type_id", NEW."created_at", NEW."date_taken", NEW."id", NEW."image", NEW."is_approved", NEW."is_primary", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."updated_at", NEW."uploaded_by_id"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_e1ca0",
-                    table="media_photo",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="photo",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "media_photoevent" ("alt_text", "caption", "content_type_id", "created_at", "date_taken", "id", "image", "is_approved", "is_primary", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "updated_at", "uploaded_by_id") VALUES (NEW."alt_text", NEW."caption", NEW."content_type_id", NEW."created_at", NEW."date_taken", NEW."id", NEW."image", NEW."is_approved", NEW."is_primary", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."updated_at", NEW."uploaded_by_id"); RETURN NULL;',
-                    hash="[AWS-SECRET-REMOVED]",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_6ff7d",
-                    table="media_photo",
-                    when="AFTER",
-                ),
-            ),
-        ),
     ]

media/migrations/0002_alter_photo_id.py

@@ -1,20 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-21 17:55
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("media", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="photo",
-            name="id",
-            field=models.BigAutoField(
-                auto_created=True, primary_key=True, serialize=False, verbose_name="ID"
-            ),
-        ),
-    ]

media/migrations/0003_remove_photo_insert_insert_and_more.py

@@ -1,52 +0,0 @@
-# Generated by Django 5.2.6 on 2025-09-20 13:40
-
-import pgtrigger.compiler
-import pgtrigger.migrations
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("media", "0002_alter_photo_id"),
-    ]
-
-    operations = [
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="photo",
-            name="insert_insert",
-        ),
-        pgtrigger.migrations.RemoveTrigger(
-            model_name="photo",
-            name="update_update",
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="photo",
-            trigger=pgtrigger.compiler.Trigger(
-                name="insert_insert",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    func='INSERT INTO "media_photoevent" ("alt_text", "caption", "content_type_id", "created_at", "date_taken", "id", "image", "is_approved", "is_primary", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "updated_at", "uploaded_by_id") VALUES (NEW."alt_text", NEW."caption", NEW."content_type_id", NEW."created_at", NEW."date_taken", NEW."id", NEW."image", NEW."is_approved", NEW."is_primary", NEW."object_id", _pgh_attach_context(), NOW(), \'insert\', NEW."id", NEW."updated_at", NEW."uploaded_by_id"); RETURN NULL;',
-                    hash="c75cf37b6fac8d5593598ba2af194f1f9a692838",
-                    operation="INSERT",
-                    pgid="pgtrigger_insert_insert_e1ca0",
-                    table="media_photo",
-                    when="AFTER",
-                ),
-            ),
-        ),
-        pgtrigger.migrations.AddTrigger(
-            model_name="photo",
-            trigger=pgtrigger.compiler.Trigger(
-                name="update_update",
-                sql=pgtrigger.compiler.UpsertTriggerSql(
-                    condition="WHEN (OLD.* IS DISTINCT FROM NEW.*)",
-                    func='INSERT INTO "media_photoevent" ("alt_text", "caption", "content_type_id", "created_at", "date_taken", "id", "image", "is_approved", "is_primary", "object_id", "pgh_context_id", "pgh_created_at", "pgh_label", "pgh_obj_id", "updated_at", "uploaded_by_id") VALUES (NEW."alt_text", NEW."caption", NEW."content_type_id", NEW."created_at", NEW."date_taken", NEW."id", NEW."image", NEW."is_approved", NEW."is_primary", NEW."object_id", _pgh_attach_context(), NOW(), \'update\', NEW."id", NEW."updated_at", NEW."uploaded_by_id"); RETURN NULL;',
-                    hash="09d9b3bda4d950d7a7104c8f013a93d05025da72",
-                    operation="UPDATE",
-                    pgid="pgtrigger_update_update_6ff7d",
-                    table="media_photo",
-                    when="AFTER",
-                ),
-            ),
-        ),
-    ]

media/models.py

@@ -11,8 +11,6 @@ from datetime import datetime
 from .storage import MediaStorage
 from rides.models import Ride
 from django.utils import timezone
-from history_tracking.models import TrackedModel
-import pghistory
 
 def photo_upload_path(instance: models.Model, filename: str) -> str:
     """Generate upload path for photos using normalized filenames"""
@@ -40,8 +38,7 @@ def photo_upload_path(instance: models.Model, filename: str) -> str:
     # For park photos, store directly in park directory
     return f"park/{identifier}/{base_filename}"
 
-@pghistory.track()
+class Photo(models.Model):
-class Photo(TrackedModel):
     """Generic photo model that can be attached to any model"""
     image = models.ImageField(
         upload_to=photo_upload_path,  # type: ignore[arg-type]