Refactor comments app to use mixins for comment functionality; update admin interfaces and add historical model fixes

reviews/admin.py

@@ -1,11 +1,7 @@
 from django.contrib import admin
 from django.utils.html import format_html
-from .models import Review, ReviewImage, ReviewLike, ReviewReport
-
-class ReviewImageInline(admin.TabularInline):
-    model = ReviewImage
-    extra = 1
-    fields = ('image', 'caption', 'order')
+from media.admin import PhotoInline
+from .models import Review, ReviewLike, ReviewReport
 
 @admin.register(Review)
 class ReviewAdmin(admin.ModelAdmin):
@@ -14,7 +10,7 @@ class ReviewAdmin(admin.ModelAdmin):
     search_fields = ('user__username', 'content', 'title')
     readonly_fields = ('created_at', 'updated_at')
     actions = ['publish_reviews', 'unpublish_reviews']
-    inlines = [ReviewImageInline]
+    inlines = [PhotoInline]
     
     fieldsets = (
         ('Review Details', {
@@ -55,13 +51,6 @@ class ReviewAdmin(admin.ModelAdmin):
         queryset.update(is_published=False)
     unpublish_reviews.short_description = "Unpublish selected reviews"
 
-@admin.register(ReviewImage)
-class ReviewImageAdmin(admin.ModelAdmin):
-    list_display = ('review', 'caption', 'order')
-    list_filter = ('review__created_at',)
-    search_fields = ('review__title', 'caption')
-    ordering = ('review', 'order')
-
 @admin.register(ReviewLike)
 class ReviewLikeAdmin(admin.ModelAdmin):
     list_display = ('review', 'user', 'created_at')

reviews/mixins.py

@@ -0,0 +1,19 @@
+from django.contrib.contenttypes.models import ContentType
+from django.db.models import QuerySet
+
+class ReviewableMixin:
+    """Mixin for models that can have reviews."""
+
+    def get_reviews(self) -> QuerySet:
+        """Get reviews for this instance."""
+        from reviews.models import Review
+        ct = ContentType.objects.get_for_model(self.__class__)
+        return Review.objects.filter(content_type=ct, object_id=self.pk)
+
+    def add_review(self, review: 'Review') -> None:
+        """Add a review to this instance."""
+        from reviews.models import Review
+        ct = ContentType.objects.get_for_model(self.__class__)
+        review.content_type = ct
+        review.object_id = self.pk
+        review.save()

reviews/models.py

@@ -5,8 +5,11 @@ from django.contrib.contenttypes.models import ContentType
 from django.core.validators import MinValueValidator, MaxValueValidator
 from history_tracking.models import HistoricalModel, VersionBranch, ChangeSet
 from history_tracking.signals import get_current_branch, ChangesetContextManager
+from comments.mixins import CommentableMixin
+from media.mixins import PhotoableModel
 
-class Review(HistoricalModel):
+class Review(HistoricalModel, CommentableMixin, PhotoableModel):
+    comments = GenericRelation('comments.CommentThread')  # Centralized reference
     # Generic relation to allow reviews on different types (rides, parks)
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
     object_id = models.PositiveIntegerField()
@@ -41,17 +44,13 @@ class Review(HistoricalModel):
     )
     moderated_at = models.DateTimeField(null=True, blank=True)
     
-    # Comments
-    comments = GenericRelation('comments.CommentThread',
-        related_name='review_threads',
-        related_query_name='comments_thread'
-    )
 
     class Meta:
         ordering = ['-created_at']
         indexes = [
             models.Index(fields=['content_type', 'object_id']),
         ]
+        excluded_fields = ['comments']  # Exclude from historical tracking
 
     def __str__(self):
         return f"Review of {self.content_object} by {self.user.username}"
@@ -108,22 +107,6 @@ class Review(HistoricalModel):
             return f"{base_url}#review-{self.pk}"
         return reverse('reviews:review_detail', kwargs={'pk': self.pk})
 
-class ReviewImage(models.Model):
-    review = models.ForeignKey(
-        Review,
-        on_delete=models.CASCADE,
-        related_name='images'
-    )
-    image = models.ImageField(upload_to='review_images/')
-    caption = models.CharField(max_length=200, blank=True)
-    order = models.PositiveIntegerField(default=0)
-
-    class Meta:
-        ordering = ['order']
-
-    def __str__(self):
-        return f"Image {self.order + 1} for {self.review}"
-
 class ReviewLike(models.Model):
     review = models.ForeignKey(
         Review,