update prefetched fields

core/inventory/api_v2.py

@@ -26,13 +26,16 @@ class ContainerViewSet(viewsets.ModelViewSet):
 class ItemViewSet(viewsets.ModelViewSet):
     serializer_class = ItemSerializer
 
-    def get_queryset(self):
-        queryset = Item.objects.all()
+    def prefetch_queryset(self, queryset):
         serializer = self.get_serializer_class()
         if hasattr(serializer, 'Meta') and hasattr(serializer.Meta, 'prefetch_related_fields'):
             queryset = queryset.prefetch_related(*serializer.Meta.prefetch_related_fields)
         return queryset
 
+    def get_queryset(self):
+        queryset = Item.objects.all()
+        return self.prefetch_queryset(queryset)
+
 
 def filter_items(items, query):
     query_tokens = query.split(' ')
@@ -69,7 +72,7 @@ def item(request, event_slug):
         if request.method == 'GET':
             if not request.user.has_event_perm(event, 'view_item'):
                 return Response(status=403)
-            return Response(ItemSerializer(vs.get_queryset().filter(event=event), many=True).data)
+            return Response(ItemSerializer(vs.prefetch_queryset(Item.objects.filter(event=event)), many=True).data)
         elif request.method == 'POST':
             if not request.user.has_event_perm(event, 'add_item'):
                 return Response(status=403)
@@ -108,7 +111,7 @@ def add_comment(request, event_slug, id):
 def item_by_id(request, event_slug, id):
     try:
         event = Event.objects.get(slug=event_slug)
-        item = ItemViewSet().get_queryset().get(event=event, id=id)
+        item = Item.objects.get(event=event, id=id)
         if request.method == 'GET':
             if not request.user.has_event_perm(event, 'view_item'):
                 return Response(status=403)

core/inventory/models.py

@@ -32,7 +32,11 @@ class Item(SoftDeleteModel):
     @property
     def container(self):
         try:
-            return self.container_history.order_by('-timestamp').first().container
+            history = sorted(self.container_history.all(), key=lambda x: x.timestamp, reverse=True)
+            if history:
+                return history[0].container
+            else:
+                return None
         except AttributeError:
             return None
 

core/inventory/serializers.py

@@ -60,7 +60,12 @@ class ItemSerializer(BasicItemSerializer):
         fields = ['cid', 'box', 'id', 'description', 'file', 'dataImage', 'returned', 'event', 'related_issues',
                   'timeline']
         read_only_fields = ['id']
-        prefetch_related_fields = ['comments', 'issue_relation_changes', 'container_history']
+        prefetch_related_fields = ['comments', 'issue_relation_changes', 'container_history',
+                                   'container_history__container', 'files', 'event',
+                                   'issue_relation_changes__issue_thread',
+                                   'issue_relation_changes__issue_thread__event',
+                                   'issue_relation_changes__issue_thread__state_changes',
+                                   'issue_relation_changes__issue_thread__assignments']
 
     def to_internal_value(self, data):
         container = None