paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-09-16 21:55:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Actually lets unify it

Browse Source
This commit is contained in:
shamoon
2025-09-14 22:19:36 -07:00
parent 1d6cdf7b1d
commit a2d89e7633
3 changed files with 50 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
src/documents/serialisers.py
View File

@@ -1668,9 +1668,8 @@ class PostDocumentSerializer(serializers.Serializer):
max_value=Document.ARCHIVE_SERIAL_NUMBER_MAX,
)
custom_fields = serializers.PrimaryKeyRelatedField(
many=True,
queryset=CustomField.objects.all(),
# Accept either a list of custom field ids or a dict mapping id -> value
custom_fields = serializers.JSONField(
label="Custom fields",
write_only=True,
required=False,
@@ -1682,12 +1681,6 @@ class PostDocumentSerializer(serializers.Serializer):
required=False,
)
custom_fields_w_values = serializers.JSONField(
label="Custom fields with values",
write_only=True,
required=False,
)
def validate_document(self, document):
document_data = document.file.read()
mime_type = magic.from_buffer(document_data, mime=True)
@@ -1733,33 +1726,61 @@ class PostDocumentSerializer(serializers.Serializer):
return None
def validate_custom_fields(self, custom_fields):
if custom_fields:
return [custom_field.id for custom_field in custom_fields]
else:
if not custom_fields:
return None
def validate_custom_fields_w_values(self, custom_fields_w_values):
if custom_fields_w_values:
if isinstance(custom_fields, dict):
custom_field_serializer = CustomFieldInstanceSerializer()
for field_id, value in custom_fields_w_values.items():
normalized = {}
for field_id, value in custom_fields.items():
try:
field = CustomField.objects.get(id=field_id)
field_id_int = int(field_id)
except (TypeError, ValueError):
raise serializers.ValidationError(
_("Custom field id must be an integer: %(id)s")
% {"id": field_id},
)
try:
field = CustomField.objects.get(id=field_id_int)
except CustomField.DoesNotExist:
raise serializers.ValidationError(
_("Custom field with id %(id)s does not exist")
% {
"id": field_id,
},
% {"id": field_id_int},
)
# validate the value using the CustomFieldInstanceSerializer
custom_field_serializer.validate(
{
"field": field,
"value": value,
},
)
# Normalize keys to integers for later
return {int(k): v for k, v in custom_fields_w_values.items()}
normalized[field_id_int] = value
return normalized
if isinstance(custom_fields, list):
try:
ids = [int(i) for i in custom_fields]
except (TypeError, ValueError):
raise serializers.ValidationError(
_(
"Custom fields must be a list of integers or an object mapping ids to values.",
),
)
if CustomField.objects.filter(id__in=ids).count() != len(set(ids)):
raise serializers.ValidationError(
_("Some custom fields don't exist or were specified twice."),
)
return ids
raise serializers.ValidationError(
_(
"Custom fields must be a list of integers or an object mapping ids to values.",
),
)
# custom_fields_w_values handled via validate_custom_fields
def validate_created(self, created):
# support datetime format for created for backwards compatibility