Add queryset optimizations

backend/bvdata/data/api_v1/serializers.py

@@ -61,9 +61,9 @@ class Meta(ImageSerializerBase.Meta):
         pass
 
     def create(self, validated_data):
-        location_id_string = validated_data.get("location")
-        location = BaseLocation.objects.get(id_string=location_id_string)
-        validated_data["location"] = location
+        validated_data["location"] = BaseLocation.objects.get(
+            id_string=validated_data.get("location")
+        )
         if (
             validated_data.get("description") == ""
             or validated_data.get("description") is None
@@ -78,3 +78,9 @@ class Meta(ImageSerializerBase.Meta):
             "location",
             "image",
         ]
+
+    def update(self, instance, validated_data):
+        validated_data["location"] = BaseLocation.objects.get(
+            id_string=validated_data.get("location")
+        )
+        return super(ImageSerializerUpdate, self).update(instance, validated_data)

backend/bvdata/data/api_v1/viewsets.py

@@ -16,13 +16,13 @@ class ReviewViewSet(ReadOnlyModelViewSet):
 
 
 class ImageViewSet(ModelViewSet):
-    queryset = Image.objects.all()
+    queryset = Image.objects.all().prefetch_related("location", "uploader")
     serializer_class = ImageSerializerDefault
     filter_backends = [filters.DjangoFilterBackend]
     filterset_class = ImageFilter
 
     def get_serializer_class(self):
-        if self.request.method in ["PUT", "PATCH"]:
+        if self.action == "update":
             return ImageSerializerUpdate
         else:
             return ImageSerializerDefault

backend/bvdata/data/views.py

@@ -47,6 +47,9 @@ def get_queryset(self):
                 "boolean_attributes",
                 "positive_integer_attributes",
                 "openinghours_set",
+                "review",
+                "review__reviewimage_set",
+                "image_set",
             )
             .filter(type=self.location_type)
         )