Merge serializers

src/documents/tests/test_api_filter_by_custom_fields.py

@@ -7,10 +7,10 @@ from urllib.parse import quote
 from django.contrib.auth.models import User
 from rest_framework.test import APITestCase
 
-from documents.serialisers import DocumentSerializer
 from documents.tests.utils import DirectoriesMixin
 from paperless.models import CustomField
 from paperless.models import Document
+from paperless.serialisers import DocumentSerializer
 
 
 class DocumentWrapper:

src/paperless/views.py

@@ -130,30 +130,6 @@ from documents.permissions import get_objects_for_user_owner_aware
 from documents.permissions import has_perms_owner_aware
 from documents.permissions import set_permissions_for_object
 from documents.schema import generate_object_with_permissions_schema
-from documents.serialisers import AcknowledgeTasksViewSerializer
-from documents.serialisers import BulkDownloadSerializer
-from documents.serialisers import BulkEditObjectsSerializer
-from documents.serialisers import BulkEditSerializer
-from documents.serialisers import CorrespondentSerializer
-from documents.serialisers import CustomFieldSerializer
-from documents.serialisers import DocumentListSerializer
-from documents.serialisers import DocumentSerializer
-from documents.serialisers import DocumentTypeSerializer
-from documents.serialisers import PostDocumentSerializer
-from documents.serialisers import RunTaskViewSerializer
-from documents.serialisers import SavedViewSerializer
-from documents.serialisers import SearchResultSerializer
-from documents.serialisers import ShareLinkSerializer
-from documents.serialisers import StoragePathSerializer
-from documents.serialisers import StoragePathTestSerializer
-from documents.serialisers import TagSerializer
-from documents.serialisers import TagSerializerVersion1
-from documents.serialisers import TasksViewSerializer
-from documents.serialisers import TrashSerializer
-from documents.serialisers import UiSettingsViewSerializer
-from documents.serialisers import WorkflowActionSerializer
-from documents.serialisers import WorkflowSerializer
-from documents.serialisers import WorkflowTriggerSerializer
 from documents.signals import document_updated
 from documents.tasks import consume_file
 from documents.tasks import empty_trash
@@ -189,11 +165,35 @@ from paperless.models import UiSettings
 from paperless.models import Workflow
 from paperless.models import WorkflowAction
 from paperless.models import WorkflowTrigger
+from paperless.serialisers import AcknowledgeTasksViewSerializer
 from paperless.serialisers import ApplicationConfigurationSerializer
+from paperless.serialisers import BulkDownloadSerializer
+from paperless.serialisers import BulkEditObjectsSerializer
+from paperless.serialisers import BulkEditSerializer
+from paperless.serialisers import CorrespondentSerializer
+from paperless.serialisers import CustomFieldSerializer
+from paperless.serialisers import DocumentListSerializer
+from paperless.serialisers import DocumentSerializer
+from paperless.serialisers import DocumentTypeSerializer
 from paperless.serialisers import GroupSerializer
 from paperless.serialisers import PaperlessAuthTokenSerializer
+from paperless.serialisers import PostDocumentSerializer
 from paperless.serialisers import ProfileSerializer
+from paperless.serialisers import RunTaskViewSerializer
+from paperless.serialisers import SavedViewSerializer
+from paperless.serialisers import SearchResultSerializer
+from paperless.serialisers import ShareLinkSerializer
+from paperless.serialisers import StoragePathSerializer
+from paperless.serialisers import StoragePathTestSerializer
+from paperless.serialisers import TagSerializer
+from paperless.serialisers import TagSerializerVersion1
+from paperless.serialisers import TasksViewSerializer
+from paperless.serialisers import TrashSerializer
+from paperless.serialisers import UiSettingsViewSerializer
 from paperless.serialisers import UserSerializer
+from paperless.serialisers import WorkflowActionSerializer
+from paperless.serialisers import WorkflowSerializer
+from paperless.serialisers import WorkflowTriggerSerializer
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 from paperless_mail.oauth import PaperlessMailOAuth2Manager

src/paperless_mail/serialisers.py

@@ -1,25 +1,14 @@
 from rest_framework import serializers
 
-from documents.serialisers import CorrespondentField
+from paperless.serialisers import CorrespondentField
-from documents.serialisers import DocumentTypeField
+from paperless.serialisers import DocumentTypeField
-from documents.serialisers import OwnedObjectSerializer
+from paperless.serialisers import ObfuscatedPasswordField
-from documents.serialisers import TagsField
+from paperless.serialisers import OwnedObjectSerializer
+from paperless.serialisers import TagsField
 from paperless_mail.models import MailAccount
 from paperless_mail.models import MailRule
 
 
-class ObfuscatedPasswordField(serializers.CharField):
-    """
-    Sends *** string instead of password in the clear
-    """
-
-    def to_representation(self, value) -> str:
-        return "*" * max(10, len(value))
-
-    def to_internal_value(self, data):
-        return data
-
-
 class MailAccountSerializer(OwnedObjectSerializer):
     password = ObfuscatedPasswordField()