Refactor model imports and update admin classes to use pghistory for historical tracking; replace HistoricalModel with TrackedModel in relevant models

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
 
-if TYPE_CHECKING:
-    from history_tracking.models import HistoricalSlug
-
-class Company(models.Model):
+@pghistory.track()
+class Company(TrackedModel):
     name = models.CharField(max_length=255)
     slug = models.SlugField(max_length=255, unique=True)
     website = models.URLField(blank=True)
@@ -37,8 +37,18 @@ class Company(models.Model):
         try:
             return cls.objects.get(slug=slug), False
         except cls.DoesNotExist:
-            # Check historical slugs
-            from history_tracking.models import HistoricalSlug
+            # Check pghistory first
+            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
+            
+            # Check manual slug history as fallback
             try:
                 historical = HistoricalSlug.objects.get(
                     content_type__model='company',
@@ -48,7 +58,8 @@ class Company(models.Model):
             except (HistoricalSlug.DoesNotExist, cls.DoesNotExist):
                 raise cls.DoesNotExist()
 
-class Manufacturer(models.Model):
+@pghistory.track()
+class Manufacturer(TrackedModel):
     name = models.CharField(max_length=255)
     slug = models.SlugField(max_length=255, unique=True)
     website = models.URLField(blank=True)
@@ -78,8 +89,18 @@ class Manufacturer(models.Model):
         try:
             return cls.objects.get(slug=slug), False
         except cls.DoesNotExist:
-            # Check historical slugs
-            from history_tracking.models import HistoricalSlug
+            # Check pghistory first
+            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
+            
+            # Check manual slug history as fallback
             try:
                 historical = HistoricalSlug.objects.get(
                     content_type__model='manufacturer',
@@ -88,43 +109,3 @@ class Manufacturer(models.Model):
                 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()