paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reduce number of db queries (#4990)

Browse Source
This commit is contained in:
Adam Bogdał 2023-12-15 20:36:25 +01:00 committed by GitHub
parent 122e4141b0
commit 9d5b07537d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 61 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
src/documents/views.py
View File

@ -182,10 +182,14 @@ class PassUserMixin(CreateModelMixin):
class CorrespondentViewSet(ModelViewSet, PassUserMixin): class CorrespondentViewSet(ModelViewSet, PassUserMixin):
model = Correspondent model = Correspondent
queryset = Correspondent.objects.annotate( queryset = (
document_count=Count("documents"), Correspondent.objects.annotate(
last_correspondence=Max("documents__created"), document_count=Count("documents"),
).order_by(Lower("name")) last_correspondence=Max("documents__created"),
)
.select_related("owner")
.order_by(Lower("name"))
)
serializer_class = CorrespondentSerializer serializer_class = CorrespondentSerializer
pagination_class = StandardPagination pagination_class = StandardPagination
@ -208,8 +212,12 @@ class CorrespondentViewSet(ModelViewSet, PassUserMixin):
class TagViewSet(ModelViewSet, PassUserMixin): class TagViewSet(ModelViewSet, PassUserMixin):
model = Tag model = Tag
queryset = Tag.objects.annotate(document_count=Count("documents")).order_by( queryset = (
Lower("name"), Tag.objects.annotate(document_count=Count("documents"))
.select_related("owner")
.order_by(
Lower("name"),
)
) )
def get_serializer_class(self, *args, **kwargs): def get_serializer_class(self, *args, **kwargs):
@ -232,9 +240,13 @@ class TagViewSet(ModelViewSet, PassUserMixin):
class DocumentTypeViewSet(ModelViewSet, PassUserMixin): class DocumentTypeViewSet(ModelViewSet, PassUserMixin):
model = DocumentType model = DocumentType
queryset = DocumentType.objects.annotate( queryset = (
document_count=Count("documents"), DocumentType.objects.annotate(
).order_by(Lower("name")) document_count=Count("documents"),
)
.select_related("owner")
.order_by(Lower("name"))
)
serializer_class = DocumentTypeSerializer serializer_class = DocumentTypeSerializer
pagination_class = StandardPagination pagination_class = StandardPagination
@ -283,7 +295,12 @@ class DocumentViewSet(
) )
def get_queryset(self): def get_queryset(self):
return Document.objects.distinct().annotate(num_notes=Count("notes")) return (
Document.objects.distinct()
.annotate(num_notes=Count("notes"))
.select_related("correspondent", "storage_path", "document_type", "owner")
.prefetch_related("tags", "custom_fields", "notes")
)
def get_serializer(self, *args, **kwargs): def get_serializer(self, *args, **kwargs):
fields_param = self.request.query_params.get("fields", None) fields_param = self.request.query_params.get("fields", None)
@ -627,9 +644,18 @@ class DocumentViewSet(
class SearchResultSerializer(DocumentSerializer, PassUserMixin): class SearchResultSerializer(DocumentSerializer, PassUserMixin):
def to_representation(self, instance): def to_representation(self, instance):
doc = Document.objects.get(id=instance["id"]) doc = (
Document.objects.select_related(
"correspondent",
"storage_path",
"document_type",
"owner",
)
.prefetch_related("tags", "custom_fields", "notes")
.get(id=instance["id"])
)
notes = ",".join( notes = ",".join(
[str(c.note) for c in Note.objects.filter(document=instance["id"])], [str(c.note) for c in doc.notes.all()],
) )
r = super().to_representation(doc) r = super().to_representation(doc)
r["__search_hit__"] = { r["__search_hit__"] = {
@ -752,7 +778,11 @@ class SavedViewViewSet(ModelViewSet, PassUserMixin):
def get_queryset(self): def get_queryset(self):
user = self.request.user user = self.request.user
return SavedView.objects.filter(owner=user) return (
SavedView.objects.filter(owner=user)
.select_related("owner")
.prefetch_related("filter_rules")
)
def perform_create(self, serializer): def perform_create(self, serializer):
serializer.save(owner=self.request.user) serializer.save(owner=self.request.user)
@ -1080,8 +1110,12 @@ class BulkDownloadView(GenericAPIView):
class StoragePathViewSet(ModelViewSet, PassUserMixin): class StoragePathViewSet(ModelViewSet, PassUserMixin):
model = StoragePath model = StoragePath
queryset = StoragePath.objects.annotate(document_count=Count("documents")).order_by( queryset = (
Lower("name"), StoragePath.objects.annotate(document_count=Count("documents"))
.select_related("owner")
.order_by(
Lower("name"),
)
) )
serializer_class = StoragePathSerializer serializer_class = StoragePathSerializer
@ -1347,7 +1381,18 @@ class ConsumptionTemplateViewSet(ModelViewSet):
model = ConsumptionTemplate model = ConsumptionTemplate
queryset = ConsumptionTemplate.objects.all().order_by("order") queryset = (
ConsumptionTemplate.objects.prefetch_related(
"assign_tags",
"assign_view_users",
"assign_view_groups",
"assign_change_users",
"assign_change_groups",
"assign_custom_fields",
)
.all()
.order_by("order")
)
class CustomFieldViewSet(ModelViewSet): class CustomFieldViewSet(ModelViewSet):