Refactor code structure and remove redundant sections for improved readability and maintainability

backend/apps/rides/migrations/0013_fix_ride_model_slugs.py

@@ -0,0 +1,38 @@
+# Generated by Django 5.2.5 on 2025-08-28 19:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("rides", "0012_make_ride_model_slug_unique"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="ridemodel",
+            unique_together={("manufacturer", "name")},
+        ),
+        migrations.AlterField(
+            model_name="ridemodel",
+            name="slug",
+            field=models.SlugField(
+                help_text="URL-friendly identifier (unique within manufacturer)",
+                max_length=255,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="ridemodelevent",
+            name="slug",
+            field=models.SlugField(
+                db_index=False,
+                help_text="URL-friendly identifier (unique within manufacturer)",
+                max_length=255,
+            ),
+        ),
+        migrations.AlterUniqueTogether(
+            name="ridemodel",
+            unique_together={("manufacturer", "name"), ("manufacturer", "slug")},
+        ),
+    ]

backend/apps/rides/migrations/0014_update_ride_model_slugs_data.py

@@ -0,0 +1,64 @@
+# Generated by Django 5.2.5 on 2025-08-28 19:19
+
+from django.db import migrations
+from django.utils.text import slugify
+
+
+def update_ride_model_slugs(apps, schema_editor):
+    """Update RideModel slugs to be just the model name, not manufacturer + name."""
+    RideModel = apps.get_model('rides', 'RideModel')
+
+    for ride_model in RideModel.objects.all():
+        # Generate new slug from just the name
+        new_slug = slugify(ride_model.name)
+
+        # Ensure uniqueness within the same manufacturer
+        counter = 1
+        base_slug = new_slug
+        while RideModel.objects.filter(
+            manufacturer=ride_model.manufacturer,
+            slug=new_slug
+        ).exclude(pk=ride_model.pk).exists():
+            new_slug = f"{base_slug}-{counter}"
+            counter += 1
+
+        # Update the slug
+        ride_model.slug = new_slug
+        ride_model.save(update_fields=['slug'])
+        print(f"Updated {ride_model.name}: {ride_model.slug}")
+
+
+def reverse_ride_model_slugs(apps, schema_editor):
+    """Reverse the slug update by regenerating the old format."""
+    RideModel = apps.get_model('rides', 'RideModel')
+
+    for ride_model in RideModel.objects.all():
+        # Generate old-style slug with manufacturer + name
+        old_slug = slugify(
+            f"{ride_model.manufacturer.name if ride_model.manufacturer else ''} {ride_model.name}"
+        )
+
+        # Ensure uniqueness globally (old way)
+        counter = 1
+        base_slug = old_slug
+        while RideModel.objects.filter(slug=old_slug).exclude(pk=ride_model.pk).exists():
+            old_slug = f"{base_slug}-{counter}"
+            counter += 1
+
+        # Update the slug
+        ride_model.slug = old_slug
+        ride_model.save(update_fields=['slug'])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rides', '0013_fix_ride_model_slugs'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            update_ride_model_slugs,
+            reverse_ride_model_slugs,
+        ),
+    ]

backend/apps/rides/models/rides.py

@@ -30,8 +30,8 @@ class RideModel(TrackedModel):
     """
 
     name = models.CharField(max_length=255, help_text="Name of the ride model")
-    slug = models.SlugField(max_length=255, unique=True,
-                            help_text="URL-friendly identifier")
+    slug = models.SlugField(max_length=255,
+                            help_text="URL-friendly identifier (unique within manufacturer)")
     manufacturer = models.ForeignKey(
         Company,
         on_delete=models.SET_NULL,
@@ -152,7 +152,10 @@ class RideModel(TrackedModel):
 
     class Meta(TrackedModel.Meta):
         ordering = ["manufacturer__name", "name"]
-        unique_together = ["manufacturer", "name"]
+        unique_together = [
+            ["manufacturer", "name"],
+            ["manufacturer", "slug"]
+        ]
         constraints = [
             # Height range validation
             models.CheckConstraint(
@@ -198,13 +201,16 @@ class RideModel(TrackedModel):
     def save(self, *args, **kwargs) -> None:
         if not self.slug:
             from django.utils.text import slugify
-            base_slug = slugify(
-                f"{self.manufacturer.name if self.manufacturer else ''} {self.name}")
+            # Only use the ride model name for the slug, not manufacturer
+            base_slug = slugify(self.name)
             self.slug = base_slug
 
-            # Ensure uniqueness
+            # Ensure uniqueness within the same manufacturer
             counter = 1
-            while RideModel.objects.filter(slug=self.slug).exclude(pk=self.pk).exists():
+            while RideModel.objects.filter(
+                manufacturer=self.manufacturer, 
+                slug=self.slug
+            ).exclude(pk=self.pk).exists():
                 self.slug = f"{base_slug}-{counter}"
                 counter += 1