Refactor code structure and remove redundant changes

backend/apps/parks/models/__init__.py

@@ -13,7 +13,7 @@ from .areas import ParkArea
 from .location import ParkLocation
 from .reviews import ParkReview
 from .companies import Company, CompanyHeadquarters
-
+from .media import ParkPhoto
 # Alias Company as Operator for clarity
 Operator = Company
 
@@ -23,6 +23,7 @@ __all__ = [
     "ParkArea",
     "ParkLocation",
     "ParkReview",
+    "ParkPhoto",
     # Company models with clear naming
     "Operator",
     "CompanyHeadquarters",

backend/apps/parks/models/media.py

@@ -0,0 +1,122 @@
+"""
+Park-specific media models for ThrillWiki.
+
+This module contains media models specific to parks domain.
+"""
+
+from typing import Any, Optional, cast
+from django.db import models
+from django.conf import settings
+from django.utils import timezone
+from apps.core.history import TrackedModel
+from apps.core.services.media_service import MediaService
+import pghistory
+
+
+def park_photo_upload_path(instance: models.Model, filename: str) -> str:
+    """Generate upload path for park photos."""
+    photo = cast('ParkPhoto', instance)
+    park = photo.park
+
+    if park is None:
+        raise ValueError("Park cannot be None")
+
+    return MediaService.generate_upload_path(
+        domain="park",
+        identifier=park.slug,
+        filename=filename
+    )
+
+
+@pghistory.track()
+class ParkPhoto(TrackedModel):
+    """Photo model specific to parks."""
+
+    park = models.ForeignKey(
+        'parks.Park',
+        on_delete=models.CASCADE,
+        related_name='photos'
+    )
+
+    image = models.ImageField(
+        upload_to=park_photo_upload_path,
+        max_length=255,
+    )
+
+    caption = models.CharField(max_length=255, blank=True)
+    alt_text = models.CharField(max_length=255, blank=True)
+    is_primary = models.BooleanField(default=False)
+    is_approved = models.BooleanField(default=False)
+
+    # Metadata
+    created_at = models.DateTimeField(auto_now_add=True)
+    updated_at = models.DateTimeField(auto_now=True)
+    date_taken = models.DateTimeField(null=True, blank=True)
+
+    # User who uploaded the photo
+    uploaded_by = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.SET_NULL,
+        null=True,
+        related_name="uploaded_park_photos",
+    )
+
+    class Meta:
+        app_label = "parks"
+        ordering = ["-is_primary", "-created_at"]
+        indexes = [
+            models.Index(fields=["park", "is_primary"]),
+            models.Index(fields=["park", "is_approved"]),
+            models.Index(fields=["created_at"]),
+        ]
+        constraints = [
+            # Only one primary photo per park
+            models.UniqueConstraint(
+                fields=['park'],
+                condition=models.Q(is_primary=True),
+                name='unique_primary_park_photo'
+            )
+        ]
+
+    def __str__(self) -> str:
+        return f"Photo of {self.park.name} - {self.caption or 'No caption'}"
+
+    def save(self, *args: Any, **kwargs: Any) -> None:
+        # Extract EXIF date if this is a new photo
+        if not self.pk and not self.date_taken and self.image:
+            self.date_taken = MediaService.extract_exif_date(self.image)
+
+        # Set default caption if not provided
+        if not self.caption and self.uploaded_by:
+            self.caption = MediaService.generate_default_caption(
+                self.uploaded_by.username
+            )
+
+        # If this is marked as primary, unmark other primary photos for this park
+        if self.is_primary:
+            ParkPhoto.objects.filter(
+                park=self.park,
+                is_primary=True,
+            ).exclude(pk=self.pk).update(is_primary=False)
+
+        super().save(*args, **kwargs)
+
+    @property
+    def file_size(self) -> Optional[int]:
+        """Get file size in bytes."""
+        try:
+            return self.image.size
+        except (ValueError, OSError):
+            return None
+
+    @property
+    def dimensions(self) -> Optional[tuple]:
+        """Get image dimensions as (width, height)."""
+        try:
+            return (self.image.width, self.image.height)
+        except (ValueError, OSError):
+            return None
+
+    def get_absolute_url(self) -> str:
+        """Get absolute URL for this photo."""
+        return f"/parks/{self.park.slug}/photos/{self.pk}/"

backend/apps/parks/models/parks.py

@@ -1,11 +1,9 @@
 from django.db import models
 from django.urls import reverse
 from django.utils.text import slugify
-from django.contrib.contenttypes.fields import GenericRelation
 from django.core.exceptions import ValidationError
 from typing import Tuple, Optional, Any, TYPE_CHECKING
 import pghistory
-from apps.media.models import Photo
 from apps.core.history import TrackedModel
 
 if TYPE_CHECKING:
@@ -74,7 +72,6 @@ class Park(TrackedModel):
         help_text="Company that owns the property (if different from operator)",
         limit_choices_to={"roles__contains": ["PROPERTY_OWNER"]},
     )
-    photos = GenericRelation(Photo, related_query_name="park")
     areas: models.Manager["ParkArea"]  # Type hint for reverse relation
     # Type hint for reverse relation from rides app
     rides: models.Manager["Ride"]