Re-org where some of the new classes are found

src/documents/serialisers.py

@@ -28,8 +28,6 @@ from .models import UiSettings
 from .models import PaperlessTask
 from .parsers import is_mime_type_supported
 
-from paperless_mail.models import MailAccount, MailRule
-
 
 # https://www.django-rest-framework.org/api-guide/serializers/#example
 class DynamicFieldsModelSerializer(serializers.ModelSerializer):
@@ -690,107 +688,3 @@ class AcknowledgeTasksViewSerializer(serializers.Serializer):
     def validate_tasks(self, tasks):
         self._validate_task_id_list(tasks)
         return tasks
-
-
-class ObfuscatedPasswordField(serializers.Field):
-    """
-    Sends *** string instead of password in the clear
-    """
-
-    def to_representation(self, value):
-        return re.sub(".", "*", value)
-
-    def to_internal_value(self, data):
-        return data
-
-
-class MailAccountSerializer(serializers.ModelSerializer):
-    password = ObfuscatedPasswordField()
-
-    class Meta:
-        model = MailAccount
-        depth = 1
-        fields = [
-            "id",
-            "name",
-            "imap_server",
-            "imap_port",
-            "imap_security",
-            "username",
-            "password",
-            "character_set",
-        ]
-
-    def update(self, instance, validated_data):
-        if "password" in validated_data:
-            if len(validated_data.get("password").replace("*", "")) == 0:
-                validated_data.pop("password")
-        super().update(instance, validated_data)
-        return instance
-
-    def create(self, validated_data):
-        mail_account = MailAccount.objects.create(**validated_data)
-        return mail_account
-
-
-class AccountField(serializers.PrimaryKeyRelatedField):
-    def get_queryset(self):
-        return MailAccount.objects.all().order_by("-id")
-
-
-class MailRuleSerializer(serializers.ModelSerializer):
-    account = AccountField(required=True)
-    action_parameter = serializers.CharField(
-        allow_null=True,
-        required=False,
-        default="",
-    )
-    assign_correspondent = CorrespondentField(allow_null=True, required=False)
-    assign_tags = TagsField(many=True, allow_null=True, required=False)
-    assign_document_type = DocumentTypeField(allow_null=True, required=False)
-    order = serializers.IntegerField(required=False)
-
-    class Meta:
-        model = MailRule
-        depth = 1
-        fields = [
-            "id",
-            "name",
-            "account",
-            "folder",
-            "filter_from",
-            "filter_subject",
-            "filter_body",
-            "filter_attachment_filename",
-            "maximum_age",
-            "action",
-            "action_parameter",
-            "assign_title_from",
-            "assign_tags",
-            "assign_correspondent_from",
-            "assign_correspondent",
-            "assign_document_type",
-            "order",
-            "attachment_type",
-        ]
-
-    def update(self, instance, validated_data):
-        super().update(instance, validated_data)
-        return instance
-
-    def create(self, validated_data):
-        if "assign_tags" in validated_data:
-            assign_tags = validated_data.pop("assign_tags")
-        mail_rule = MailRule.objects.create(**validated_data)
-        if assign_tags:
-            mail_rule.assign_tags.set(assign_tags)
-        return mail_rule
-
-    def validate(self, attrs):
-        if (
-            attrs["action"] == MailRule.MailAction.TAG
-            or attrs["action"] == MailRule.MailAction.MOVE
-        ) and attrs["action_parameter"] is None:
-            raise serializers.ValidationError("An action parameter is required.")
-
-        return attrs