fix: revert optimizations

so it seems 2 queries are slower than N+1 ??

I don't know why this became slower

also the ID query timed out

Author: arcstur

store/migrations/0024_alter_batch_id_alter_tool_id.py

@@ -207,8 +207,7 @@ def tag_ids(self):
 
     @cached_property
     def sorted_tags(self):
-        # tags come sorted through its Meta ordering
-        return self.tags.all()
+        return self.tags.order_by('-priority', 'id')
 
     @cached_property
     def reverting_batches(self):

store/models.py

@@ -14,7 +14,6 @@
 from .serializers import BatchSimpleSerializer, BatchDetailSerializer, BatchCSVSerializer, EditSerializer, ToolSerializer, ToolStatsSerializer
 from django_filters.rest_framework import DjangoFilterBackend
 from tagging.filters import TaggingFilterBackend
-from tagging.models import Tag
 
 class BatchView(generics.RetrieveAPIView):
     serializer_class = BatchDetailSerializer
@@ -47,12 +46,7 @@ class APIBatchView(BatchView):
 
 class BatchesView(generics.ListAPIView):
     serializer_class = BatchSimpleSerializer
-    queryset = (
-        Batch.objects
-        .select_related('tool')
-        .prefetch_related('tags')
-        .order_by('-ended')
-    )
+    queryset = Batch.objects.all().order_by('-ended')
     template_name = 'store/batches.html'
     filter_fields = ('user',)
     filter_backends = (TaggingFilterBackend,)