lgcosta/paperless-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get custom field data from initial_data

Browse Source
This commit is contained in:
shamoon 2023-11-01 10:20:18 -07:00
parent 079df6aeb0
commit 4d6d95f0fb
2 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/documents/serialisers.py
View File

@ -2,7 +2,6 @@ import datetime
import math import math
import re import re
import zoneinfo import zoneinfo
from typing import Any
import magic import magic
from celery import states from celery import states
@ -459,24 +458,16 @@ class DocumentSerializer(OwnedObjectSerializer, DynamicFieldsModelSerializer):
doc["content"] = doc.get("content")[0:550] doc["content"] = doc.get("content")[0:550]
return doc return doc
def to_internal_value(self, data: Any) -> Any:
# hack-y
values = super().to_internal_value(data)
if "custom_fields" in values:
for index, field_instance in enumerate(values["custom_fields"]):
data_custom_field = data["custom_fields"][index]
field_instance["field"]["id"] = data_custom_field["field"]["id"]
field_instance["value"] = data_custom_field["value"]
return values
def update(self, instance: Document, validated_data): def update(self, instance: Document, validated_data):
if "custom_fields" in validated_data: if "custom_fields" in validated_data:
custom_fields = validated_data.pop("custom_fields") custom_fields = validated_data.pop("custom_fields")
for field_data in custom_fields: for index, field_data in enumerate(custom_fields):
# get field value from initial_data since its not on the model
initial_field_data = self.initial_data["custom_fields"][index]
CustomFieldInstance.from_json( CustomFieldInstance.from_json(
document=instance, document=instance,
field=field_data["field"], field=initial_field_data["field"],
value=field_data["value"], value=initial_field_data["value"],
) )
existing_fields = CustomFieldInstance.objects.filter(document=instance) existing_fields = CustomFieldInstance.objects.filter(document=instance)
for existing_field in existing_fields: for existing_field in existing_fields:
@ -484,7 +475,7 @@ class DocumentSerializer(OwnedObjectSerializer, DynamicFieldsModelSerializer):
not len( not len(
[ [
f f
for f in custom_fields for f in self.initial_data["custom_fields"]
if f["field"]["id"] == existing_field.field.id if f["field"]["id"] == existing_field.field.id
], ],
) )

5
src/documents/tests/test_api_custom_fields.py
View File

@ -82,35 +82,30 @@ class TestCustomField(DirectoriesMixin, APITestCase):
{ {
"field": { "field": {
"id": custom_field_string.id, "id": custom_field_string.id,
"name": custom_field_string.name,
}, },
"value": "test value", "value": "test value",
}, },
{ {
"field": { "field": {
"id": custom_field_date.id, "id": custom_field_date.id,
"name": custom_field_date.name,
}, },
"value": "2023-10-31", "value": "2023-10-31",
}, },
{ {
"field": { "field": {
"id": custom_field_int.id, "id": custom_field_int.id,
"name": custom_field_int.name,
}, },
"value": 3, "value": 3,
}, },
{ {
"field": { "field": {
"id": custom_field_boolean.id, "id": custom_field_boolean.id,
"name": custom_field_boolean.name,
}, },
"value": True, "value": True,
}, },
{ {
"field": { "field": {
"id": custom_field_url.id, "id": custom_field_url.id,
"name": custom_field_url.name,
}, },
"value": "https://example.com", "value": "https://example.com",
}, },