diff --git a/src/documents/tests/test_api_ocr_templates.py b/src/documents/tests/test_api_ocr_templates.py index 96a99e231c..602c8427c1 100644 --- a/src/documents/tests/test_api_ocr_templates.py +++ b/src/documents/tests/test_api_ocr_templates.py @@ -24,6 +24,7 @@ from documents.models import OcrTemplateZone from documents.search import get_backend from documents.signals import document_consumption_finished from documents.tasks import extract_zones +from paperless_testing.factories import CustomFieldFactory from paperless_testing.factories import DocumentFactory from paperless_testing.factories import OcrTemplateFactory from paperless_testing.factories import OcrTemplateZoneFactory @@ -82,7 +83,7 @@ def make_zone_data(custom_field_id: int | None, **overrides: Any) -> dict[str, A @pytest.fixture def text_field(db: None) -> CustomField: - return CustomField.objects.create( + return CustomFieldFactory( name="Invoice Number", data_type=CustomField.FieldDataType.STRING, ) @@ -90,7 +91,7 @@ def text_field(db: None) -> CustomField: @pytest.fixture def date_field(db: None) -> CustomField: - return CustomField.objects.create( + return CustomFieldFactory( name="Invoice Date", data_type=CustomField.FieldDataType.DATE, ) @@ -98,7 +99,7 @@ def date_field(db: None) -> CustomField: @pytest.fixture def doclink_field(db: None) -> CustomField: - return CustomField.objects.create( + return CustomFieldFactory( name="Related Docs", data_type=CustomField.FieldDataType.DOCUMENTLINK, ) @@ -215,7 +216,7 @@ class TestZoneOcrIndexing: source_width=100, source_height=100, ) - field = CustomField.objects.create(name="Invoice code", data_type="string") + field = CustomFieldFactory(name="Invoice code", data_type="string") OcrTemplateZoneFactory( template=template, name="Title", diff --git a/src/documents/tests/test_zone_ocr.py b/src/documents/tests/test_zone_ocr.py index b54ec8a2c4..6b0f1db29e 100644 --- a/src/documents/tests/test_zone_ocr.py +++ b/src/documents/tests/test_zone_ocr.py @@ -32,6 +32,7 @@ from documents.zone_ocr import _resolve_doc_path from documents.zone_ocr import extract_zone_preview from documents.zone_ocr import get_templates_for_document from documents.zone_ocr import run_zone_extraction +from paperless_testing.factories import CustomFieldFactory from paperless_testing.factories import DocumentFactory from paperless_testing.factories import OcrTemplateFactory from paperless_testing.factories import OcrTemplateZoneFactory @@ -527,7 +528,7 @@ class TestSavedZoneExtraction: THEN: - Each raw value is converted to its field type and saved """ - field = CustomField.objects.create(name="Paid", data_type="boolean") + field = CustomFieldFactory(name="Paid", data_type="boolean") zones = [ make_zone(template, "Title"), make_zone(template, "ASN", "asn"), @@ -572,7 +573,7 @@ class TestSavedZoneExtraction: THEN: - Only the valid title is written and the other values are preserved """ - field = CustomField.objects.create(name="Number", data_type="integer") + field = CustomFieldFactory(name="Number", data_type="integer") CustomFieldInstance.objects.create( document=document, field=field, @@ -630,7 +631,7 @@ class TestSavedZoneExtraction: - The error propagates, the write is rolled back and the in-memory document is restored """ - field = CustomField.objects.create(name="Number", data_type="integer") + field = CustomFieldFactory(name="Number", data_type="integer") zones = [ make_zone(template, "Title"), make_zone(template, "Number", "custom_field", custom_field=field), @@ -2009,7 +2010,7 @@ class TestRunZoneExtraction: @pytest.fixture def custom_field(self) -> CustomField: - return CustomField.objects.create( + return CustomFieldFactory( name="Invoice Number", data_type=CustomField.FieldDataType.STRING, ) diff --git a/src/paperless_testing/factories.py b/src/paperless_testing/factories.py index 74ac38d334..5384b71671 100644 --- a/src/paperless_testing/factories.py +++ b/src/paperless_testing/factories.py @@ -8,6 +8,7 @@ import factory from django.contrib.auth.models import User from documents.models import Correspondent +from documents.models import CustomField from documents.models import Document from documents.models import DocumentBarcode from documents.models import DocumentType @@ -48,6 +49,14 @@ class TagFactory(TypedModelFactory[Tag]): is_inbox_tag = False +class CustomFieldFactory(TypedModelFactory[CustomField]): + class Meta: + model = CustomField + + name = factory.Sequence(lambda n: f"Custom field {n}") + data_type = CustomField.FieldDataType.STRING + + class StoragePathFactory(TypedModelFactory[StoragePath]): class Meta: model = StoragePath