Refactor code structure and remove redundant changes

backend/apps/media/commands/move_photos.py

@@ -1,6 +1,7 @@
 import os
 from django.core.management.base import BaseCommand
-from apps.media.models import Photo
+from apps.parks.models import ParkPhoto
+from apps.rides.models import RidePhoto
 from django.conf import settings
 import shutil
 
@@ -12,12 +13,93 @@ class Command(BaseCommand):
         self.stdout.write("Moving photo files to normalized locations...")
 
         # Get all photos
-        photos = Photo.objects.all()
+        park_photos = ParkPhoto.objects.all()
+        ride_photos = RidePhoto.objects.all()
 
         # Track processed files to clean up later
         processed_files = set()
 
-        for photo in photos:
+        # Process park photos
+        for photo in park_photos:
+            try:
+                # Get current file path
+                current_name = photo.image.name
+                current_path = os.path.join(settings.MEDIA_ROOT, current_name)
+
+                # Try to find the actual file
+                if not os.path.exists(current_path):
+                    # Check if file exists in the old location structure
+                    parts = current_name.split("/")
+                    if len(parts) >= 2:
+                        content_type = "park"
+                        identifier = photo.park.slug
+
+                        # Look for any files in that directory
+                        old_dir = os.path.join(
+                            settings.MEDIA_ROOT, content_type, identifier
+                        )
+                        if os.path.exists(old_dir):
+                            files = [
+                                f
+                                for f in os.listdir(old_dir)
+                                if not f.startswith(".")  # Skip hidden files
+                                and not f.startswith("tmp")  # Skip temp files
+                                and os.path.isfile(os.path.join(old_dir, f))
+                            ]
+                            if files:
+                                current_path = os.path.join(old_dir, files[0])
+
+                # Skip if file still not found
+                if not os.path.exists(current_path):
+                    self.stdout.write(f"Skipping {current_name} - file not found")
+                    continue
+
+                # Get content type and object
+                content_type_model = "park"
+                obj = photo.park
+                identifier = getattr(obj, "slug", obj.id)
+
+                # Get photo number
+                photo_number = ParkPhoto.objects.filter(
+                    park=photo.park,
+                    created_at__lte=photo.created_at,
+                ).count()
+
+                # Create new filename
+                _, ext = os.path.splitext(current_path)
+                if not ext:
+                    ext = ".jpg"
+                ext = ext.lower()
+                new_filename = f"{identifier}_{photo_number}{ext}"
+
+                # Create new path
+                new_relative_path = f"{content_type_model}/{identifier}/{new_filename}"
+                new_full_path = os.path.join(settings.MEDIA_ROOT, new_relative_path)
+
+                # Create directory if it doesn't exist
+                os.makedirs(os.path.dirname(new_full_path), exist_ok=True)
+
+                # Move the file
+                if current_path != new_full_path:
+                    shutil.copy2(
+                        current_path, new_full_path
+                    )  # Use copy2 to preserve metadata
+                    processed_files.add(current_path)
+                else:
+                    processed_files.add(current_path)
+
+                # Update database
+                photo.image.name = new_relative_path
+                photo.save()
+
+                self.stdout.write(f"Moved {current_name} to {new_relative_path}")
+
+            except Exception as e:
+                self.stdout.write(f"Error moving park photo {photo.id}: {str(e)}")
+                continue
+
+        # Process ride photos
+        for photo in ride_photos:
             try:
                 # Get current file path
                 current_name = photo.image.name
@@ -52,14 +134,13 @@ class Command(BaseCommand):
                     continue
 
                 # Get content type and object
-                content_type_model = photo.content_type.model
-                obj = photo.content_object
+                content_type_model = "ride"
+                obj = photo.ride
                 identifier = getattr(obj, "slug", obj.id)
 
                 # Get photo number
-                photo_number = Photo.objects.filter(
-                    content_type=photo.content_type,
-                    object_id=photo.object_id,
+                photo_number = RidePhoto.objects.filter(
+                    ride=photo.ride,
                     created_at__lte=photo.created_at,
                 ).count()
 
@@ -93,7 +174,7 @@ class Command(BaseCommand):
                 self.stdout.write(f"Moved {current_name} to {new_relative_path}")
 
             except Exception as e:
-                self.stdout.write(f"Error moving photo {photo.id}: {str(e)}")
+                self.stdout.write(f"Error moving ride photo {photo.id}: {str(e)}")
                 continue
 
         # Clean up old files