diff --git a/src/documents/tests/test_api_bulk_edit.py b/src/documents/tests/test_api_bulk_edit.py index 434665ffb4..bfe8e5564f 100644 --- a/src/documents/tests/test_api_bulk_edit.py +++ b/src/documents/tests/test_api_bulk_edit.py @@ -1144,6 +1144,33 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): ], ) + def test_api_selection_data_with_excluded_documents(self) -> None: + response = self.client.post( + "/api/documents/selection_data/", + json.dumps( + { + "all": True, + "excluded_documents": [self.doc2.id], + }, + ), + content_type="application/json", + ) + self.assertEqual(response.status_code, status.HTTP_200_OK) + self.assertCountEqual( + response.data["selected_correspondents"], + [ + {"id": self.c1.id, "document_count": 0}, + {"id": self.c2.id, "document_count": 1}, + ], + ) + self.assertCountEqual( + response.data["selected_tags"], + [ + {"id": self.t1.id, "document_count": 1}, + {"id": self.t2.id, "document_count": 2}, + ], + ) + def test_api_selection_data_requires_view_permission(self) -> None: self.doc2.owner = self.user self.doc2.save() diff --git a/src/documents/views.py b/src/documents/views.py index af06aca214..e8a0fe386a 100644 --- a/src/documents/views.py +++ b/src/documents/views.py @@ -193,7 +193,7 @@ from documents.serialisers import BulkEditSerializer from documents.serialisers import CorrespondentSerializer from documents.serialisers import CustomFieldSerializer from documents.serialisers import DeleteDocumentsSerializer -from documents.serialisers import DocumentListSerializer +from documents.serialisers import DocumentSelectionSerializer from documents.serialisers import DocumentSerializer from documents.serialisers import DocumentTypeSerializer from documents.serialisers import DocumentVersionLabelSerializer @@ -3529,16 +3529,19 @@ class PostDocumentView(GenericAPIView[Any]): }, ), ) -class SelectionDataView(GenericAPIView[Any]): +class SelectionDataView(DocumentSelectionMixin, GenericAPIView[Any]): permission_classes = (IsAuthenticated, ViewDocumentsPermissions) - serializer_class = DocumentListSerializer + serializer_class = DocumentSelectionSerializer parser_classes = (parsers.MultiPartParser, parsers.JSONParser) def post(self, request, format=None): serializer = self.get_serializer(data=request.data) serializer.is_valid(raise_exception=True) - ids = serializer.validated_data.get("documents") + ids = self._resolve_document_ids( + user=request.user, + validated_data=serializer.validated_data, + ) permitted_documents = Document.objects.filter( id__in=permitted_document_ids(request.user), )