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

Actually we can simplify this

Browse Source
This commit is contained in:
shamoon 2025-03-08 16:58:45 -08:00
parent 777eced98f
commit 60796c770d
2 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/documents/serialisers.py
View File

@ -873,7 +873,8 @@ class NotesSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Note model = Note
fields = ["note", "created", "user"] fields = ["id", "note", "created", "user"]
ordering = ["-created"]
class DocumentSerializer( class DocumentSerializer(

37
src/documents/views.py
View File

@ -803,33 +803,6 @@ class DocumentViewSet(
except (FileNotFoundError, Document.DoesNotExist): except (FileNotFoundError, Document.DoesNotExist):
raise Http404 raise Http404
def getNotes(self, doc):
return [
{
"id": c.pk,
"note": c.note,
"created": c.created,
"user": {
"id": c.user.id,
"username": c.user.username,
"first_name": c.user.first_name,
"last_name": c.user.last_name,
},
}
for c in Note.objects.select_related("user")
.only(
"pk",
"note",
"created",
"user__id",
"user__username",
"user__first_name",
"user__last_name",
)
.filter(document=doc)
.order_by("-created")
]
@action( @action(
methods=["get", "post", "delete"], methods=["get", "post", "delete"],
detail=True, detail=True,
@ -854,9 +827,11 @@ class DocumentViewSet(
except Document.DoesNotExist: except Document.DoesNotExist:
raise Http404 raise Http404
serializer = self.get_serializer(doc)
if request.method == "GET": if request.method == "GET":
try: try:
notes = self.getNotes(doc) notes = serializer.to_representation(doc).get("notes")
return Response(notes) return Response(notes)
except Exception as e: except Exception as e:
logger.warning(f"An error occurred retrieving notes: {e!s}") logger.warning(f"An error occurred retrieving notes: {e!s}")
@ -897,7 +872,7 @@ class DocumentViewSet(
index.add_or_update_document(doc) index.add_or_update_document(doc)
notes = self.getNotes(doc) notes = serializer.to_representation(doc).get("notes")
return Response(notes) return Response(notes)
except Exception as e: except Exception as e:
@ -934,7 +909,9 @@ class DocumentViewSet(
index.add_or_update_document(doc) index.add_or_update_document(doc)
return Response(self.getNotes(doc)) notes = serializer.to_representation(doc).get("notes")
return Response(notes)
return Response( return Response(
{ {