diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py index d5c1c0353..1ff3798db 100644 --- a/src/documents/serialisers.py +++ b/src/documents/serialisers.py @@ -480,7 +480,7 @@ class OwnedObjectListSerializer(serializers.ListSerializer[Any]): class CorrespondentSerializer(MatchingModelSerializer, OwnedObjectSerializer): last_correspondence = serializers.DateField(read_only=True, required=False) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = Correspondent fields = ( "id", @@ -499,7 +499,7 @@ class CorrespondentSerializer(MatchingModelSerializer, OwnedObjectSerializer): class DocumentTypeSerializer(MatchingModelSerializer, OwnedObjectSerializer): - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = DocumentType fields = ( "id", @@ -624,7 +624,7 @@ class TagSerializer(MatchingModelSerializer, OwnedObjectSerializer): # children as nested Tag objects children = serializers.SerializerMethodField() - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = Tag fields = ( "id", @@ -710,7 +710,7 @@ class CustomFieldSerializer(serializers.ModelSerializer[CustomField]): document_count = serializers.IntegerField(read_only=True) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = CustomField fields = [ "id", @@ -916,7 +916,7 @@ class CustomFieldInstanceSerializer(serializers.ModelSerializer[CustomFieldInsta return data - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = CustomFieldInstance fields = [ "value", @@ -926,7 +926,7 @@ class CustomFieldInstanceSerializer(serializers.ModelSerializer[CustomFieldInsta class BasicUserSerializer(serializers.ModelSerializer[User]): # Different than paperless.serializers.UserSerializer - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = User fields = ["id", "username", "first_name", "last_name"] @@ -934,7 +934,7 @@ class BasicUserSerializer(serializers.ModelSerializer[User]): class NotesSerializer(serializers.ModelSerializer[Note]): user = BasicUserSerializer(read_only=True) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = Note fields = ["id", "note", "created", "user"] ordering = ["-created"] @@ -1223,7 +1223,7 @@ class DocumentSerializer( super().__init__(*args, **kwargs) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = Document fields = ( "id", @@ -1316,7 +1316,7 @@ class SearchResultSerializer(DocumentSerializer): class SavedViewFilterRuleSerializer(serializers.ModelSerializer[SavedViewFilterRule]): - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = SavedViewFilterRule fields = ["rule_type", "value"] @@ -1324,7 +1324,7 @@ class SavedViewFilterRuleSerializer(serializers.ModelSerializer[SavedViewFilterR class SavedViewSerializer(OwnedObjectSerializer): filter_rules = SavedViewFilterRuleSerializer(many=True) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = SavedView fields = [ "id", @@ -2366,7 +2366,7 @@ class EmailSerializer(DocumentListSerializer): class StoragePathSerializer(MatchingModelSerializer, OwnedObjectSerializer): - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = StoragePath fields = ( "id", @@ -2414,7 +2414,7 @@ class StoragePathSerializer(MatchingModelSerializer, OwnedObjectSerializer): class UiSettingsViewSerializer(serializers.ModelSerializer[UiSettings]): settings = serializers.DictField(required=False, allow_null=True) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = UiSettings depth = 1 fields = [ @@ -2459,7 +2459,7 @@ class TaskSerializerV10(OwnedObjectSerializer): read_only=True, ) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = PaperlessTask fields = ( "id", @@ -2512,7 +2512,7 @@ class TaskSerializerV9(serializers.ModelSerializer[PaperlessTask]): # v9 field: duplicate_documents -> list of duplicate IDs from result_data duplicate_documents = serializers.SerializerMethodField() - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = PaperlessTask fields = ( "id", @@ -2655,7 +2655,7 @@ class AcknowledgeTasksViewSerializer(serializers.Serializer[dict[str, Any]]): class ShareLinkSerializer(OwnedObjectSerializer): - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = ShareLink fields = ( "id", @@ -2700,7 +2700,7 @@ class ShareLinkBundleSerializer(OwnedObjectSerializer): ) document_count = SerializerMethodField() - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = ShareLinkBundle fields = ( "id", @@ -2913,7 +2913,7 @@ class WorkflowTriggerSerializer(serializers.ModelSerializer[WorkflowTrigger]): label="Trigger Type", ) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = WorkflowTrigger fields = [ "id", @@ -3009,7 +3009,7 @@ class WorkflowTriggerSerializer(serializers.ModelSerializer[WorkflowTrigger]): class WorkflowActionEmailSerializer(serializers.ModelSerializer[WorkflowActionEmail]): id = serializers.IntegerField(allow_null=True, required=False) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = WorkflowActionEmail fields = [ "id", @@ -3029,7 +3029,7 @@ class WorkflowActionWebhookSerializer( url_validator(url) return url - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = WorkflowActionWebhook fields = [ "id", @@ -3052,7 +3052,7 @@ class WorkflowActionSerializer(serializers.ModelSerializer[WorkflowAction]): email = WorkflowActionEmailSerializer(allow_null=True, required=False) webhook = WorkflowActionWebhookSerializer(allow_null=True, required=False) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = WorkflowAction fields = [ "id", @@ -3171,7 +3171,7 @@ class WorkflowSerializer(serializers.ModelSerializer[Workflow]): triggers = WorkflowTriggerSerializer(many=True) actions = WorkflowActionSerializer(many=True) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = Workflow fields = [ "id", diff --git a/src/documents/tests/factories.py b/src/documents/tests/factories.py index 1458d7435..7a1bdcc68 100644 --- a/src/documents/tests/factories.py +++ b/src/documents/tests/factories.py @@ -17,7 +17,7 @@ from documents.models import Tag class CorrespondentFactory(DjangoModelFactory[Correspondent]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = Correspondent name = factory.Sequence(lambda n: f"{factory.Faker('company')} {n}") @@ -26,7 +26,7 @@ class CorrespondentFactory(DjangoModelFactory[Correspondent]): class DocumentTypeFactory(DjangoModelFactory[DocumentType]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = DocumentType name = factory.Sequence(lambda n: f"{factory.Faker('bs')} {n}") @@ -35,7 +35,7 @@ class DocumentTypeFactory(DjangoModelFactory[DocumentType]): class TagFactory(DjangoModelFactory[Tag]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = Tag name = factory.Sequence(lambda n: f"{factory.Faker('word')} {n}") @@ -45,7 +45,7 @@ class TagFactory(DjangoModelFactory[Tag]): class StoragePathFactory(DjangoModelFactory[StoragePath]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = StoragePath name = factory.Sequence( @@ -57,7 +57,7 @@ class StoragePathFactory(DjangoModelFactory[StoragePath]): class DocumentFactory(DjangoModelFactory[Document]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = Document title = factory.Faker("sentence", nb_words=4) @@ -69,7 +69,7 @@ class DocumentFactory(DjangoModelFactory[Document]): class PaperlessTaskFactory(DjangoModelFactory[PaperlessTask]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = PaperlessTask task_id = factory.Faker("uuid4") diff --git a/src/paperless/serialisers.py b/src/paperless/serialisers.py index 88cb51712..92676df4e 100644 --- a/src/paperless/serialisers.py +++ b/src/paperless/serialisers.py @@ -89,7 +89,7 @@ class UserSerializer(PasswordValidationMixin, serializers.ModelSerializer[User]) mfa_adapter = get_mfa_adapter() return mfa_adapter.is_mfa_enabled(user) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = User fields = ( "id", @@ -149,7 +149,7 @@ class GroupSerializer(serializers.ModelSerializer[Group]): slug_field="codename", ) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = Group fields = ( "id", @@ -161,7 +161,7 @@ class GroupSerializer(serializers.ModelSerializer[Group]): class SocialAccountSerializer(serializers.ModelSerializer[SocialAccount]): name = serializers.SerializerMethodField() - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = SocialAccount fields = ( "id", @@ -195,7 +195,7 @@ class ProfileSerializer(PasswordValidationMixin, serializers.ModelSerializer[Use def get_has_usable_password(self, user: User) -> bool: return user.has_usable_password() - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = User fields = ( "email", @@ -291,6 +291,6 @@ class ApplicationConfigurationSerializer( return value - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = ApplicationConfiguration fields = "__all__" diff --git a/src/paperless_mail/serialisers.py b/src/paperless_mail/serialisers.py index 0a912ca23..8a0772732 100644 --- a/src/paperless_mail/serialisers.py +++ b/src/paperless_mail/serialisers.py @@ -28,7 +28,7 @@ class ObfuscatedPasswordField(serializers.CharField): class MailAccountSerializer(OwnedObjectSerializer): password = ObfuscatedPasswordField() - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = MailAccount fields = [ "id", @@ -86,7 +86,7 @@ class MailRuleSerializer(OwnedObjectSerializer): assign_document_type = DocumentTypeField(allow_null=True, required=False) order = serializers.IntegerField(required=False) - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = MailRule fields = [ "id", @@ -162,7 +162,7 @@ class MailRuleSerializer(OwnedObjectSerializer): class ProcessedMailSerializer(OwnedObjectSerializer): - class Meta(serializers.ModelSerializer.Meta): + class Meta: model = ProcessedMail fields = [ "id", diff --git a/src/paperless_mail/tests/factories.py b/src/paperless_mail/tests/factories.py index 6c6cefcad..747ad1054 100644 --- a/src/paperless_mail/tests/factories.py +++ b/src/paperless_mail/tests/factories.py @@ -10,7 +10,7 @@ from paperless_mail.models import ProcessedMail class MailAccountFactory(DjangoModelFactory[MailAccount]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = MailAccount name = factory.Sequence(lambda n: f"Mail Account {n}") @@ -25,7 +25,7 @@ class MailAccountFactory(DjangoModelFactory[MailAccount]): class MailRuleFactory(DjangoModelFactory[MailRule]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = MailRule name = factory.Sequence(lambda n: f"Mail Rule {n}") @@ -45,7 +45,7 @@ class MailRuleFactory(DjangoModelFactory[MailRule]): class ProcessedMailFactory(DjangoModelFactory[ProcessedMail]): - class Meta(DjangoModelFactory.Meta): + class Meta: model = ProcessedMail rule = factory.SubFactory(MailRuleFactory)