Only show not hidden photos

Author: epou

api/filters.py

@@ -58,7 +58,7 @@ class ReportFilter(filters.FilterSet):
 
     def filter_has_photos(self, queryset, name, value):
         # Subquery to check for existence of related Photos
-        return queryset.annotate(photo_exist=models.Exists(Photo.objects.filter(report=models.OuterRef('pk')))).filter(photo_exist=value)
+        return queryset.annotate(photo_exist=models.Exists(Photo.objects.filter(report=models.OuterRef('pk'), hide=False))).filter(photo_exist=value)
 
     class Meta:
         model = Report

api/views.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import get_user_model
-from django.db import transaction
+from django.db import models
 
 from django_filters.rest_framework import DjangoFilterBackend
 from drf_spectacular.utils import (
@@ -28,6 +28,7 @@
     Report,
     Fix,
     Notification,
+    Photo
 )
 
 from .filters import ReportFilter, NotificationFilter, CampaignFilter
@@ -145,7 +146,12 @@ class ReportViewSet(
     DestroyModelMixin,
     GenericViewSet,
 ):
-    queryset = Report.objects.prefetch_related("photos").non_deleted()
+    queryset = Report.objects.prefetch_related(
+        models.Prefetch(
+            "photos",
+            queryset=Photo.objects.filter(hide=False)
+        )
+    ).non_deleted()
 
     serializer_class = ReportSerializer
     lookup_url_kwarg = "uuid"

tigaserver_app/migrations/0055_photo_hide_dbindex.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.7 on 2024-10-30 10:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('tigaserver_app', '0054_auto_20241025_1242'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='photo',
+            name='hide',
+            field=models.BooleanField(db_index=True, default=False, help_text='Hide this photo from public views?'),
+        ),
+    ]

tigaserver_app/models.py

@@ -2858,7 +2858,7 @@ class Photo(models.Model):
     photo = models.ImageField(upload_to=make_image_uuid, help_text='Photo uploaded by user.')
     report = models.ForeignKey(Report, related_name='photos', help_text='Report and version to which this photo is associated (36-digit '
                                                  'report_UUID).', on_delete=models.CASCADE, )
-    hide = models.BooleanField(default=False, help_text='Hide this photo from public views?')
+    hide = models.BooleanField(default=False, help_text='Hide this photo from public views?', db_index=True)
     uuid = models.CharField(max_length=36, default=make_uuid)
     blood_genre = models.CharField(max_length=20, choices=BLOOD_GENRE, null=True, default=None)