[#3793] Improve factory and fix submissions without references

Author: Viicos

src/openforms/payments/models.py

@@ -43,7 +43,9 @@ def create_for(
         return payment
 
     @staticmethod
-    def create_public_order_id_for(payment: SubmissionPayment) -> str:
+    def create_public_order_id_for(
+        payment: SubmissionPayment, pk: int | None = None
+    ) -> str:
         """Create a public order ID to be sent to the payment provider."""
 
         # TODO it isn't really clear what the required format/max length is
@@ -54,10 +56,17 @@ def create_public_order_id_for(payment: SubmissionPayment) -> str:
         if prefix:
             prefix = f"{prefix}/"
 
-        assert payment.submission.public_registration_reference
-        return (
-            f"{prefix}{payment.submission.public_registration_reference}/{payment.pk}"
-        )
+        reference = payment.submission.public_registration_reference
+        if not reference and config.wait_for_payment_to_register:
+            from openforms.submissions.public_references import (  # circ. ref
+                set_submission_reference,
+            )
+
+            reference = set_submission_reference(payment.submission)
+
+        pk = pk if pk is not None else payment.pk
+
+        return f"{prefix}{payment.submission.public_registration_reference}/{pk}"
 
 
 class SubmissionPaymentQuerySet(models.QuerySet["SubmissionPayment"]):

src/openforms/payments/tests/factories.py

@@ -1,22 +1,42 @@
+from datetime import datetime
 from decimal import Decimal
+from typing import Any
+from unittest.mock import patch
 
 import factory
 
+from openforms.config.models import GlobalConfiguration
 from openforms.submissions.tests.factories import SubmissionFactory
 
-from ..models import SubmissionPayment
+from ..models import SubmissionPayment, SubmissionPaymentManager
+
+
+def mocked_create_public_order_id_for(
+    payment: SubmissionPayment, create: bool, extracted: str | None, **kwargs: Any
+) -> None:
+    if extracted is not None:
+        payment.public_order_id = extracted
+        return
+
+    with patch(
+        "openforms.payments.models.GlobalConfiguration.get_solo",
+        return_value=GlobalConfiguration(),
+    ):
+        pk = factory.Faker("random_int").generate() if not create else None
+        payment.public_order_id = SubmissionPaymentManager.create_public_order_id_for(
+            payment, pk=pk
+        )
 
 
 class SubmissionPaymentFactory(factory.django.DjangoModelFactory):
+    created = datetime.now()
     submission = factory.SubFactory(
         SubmissionFactory, with_public_registration_reference=True
     )
     plugin_id = "demo"
     plugin_options = {"foo": 123}
     amount = Decimal("10.00")
-    public_order_id = factory.LazyAttributeSequence(
-        lambda obj, n: f"{obj.submission.public_registration_reference}_{n}"
-    )
+    public_order_id = factory.PostGeneration(mocked_create_public_order_id_for)
 
     class Meta:
         model = SubmissionPayment

src/openforms/submissions/tests/factories.py

@@ -1,5 +1,7 @@
 import copy
 from datetime import timedelta
+from decimal import Decimal
+from typing import Any
 
 from django.conf import settings
 from django.utils import timezone
@@ -34,6 +36,16 @@
 from ..public_references import get_random_reference
 
 
+def _calculate_price(
+    submission: Submission, create: bool, extracted: Decimal | None, **kwargs: Any
+):
+    if extracted is not None:
+        submission.price = extracted
+        return
+
+    submission.calculate_price(save=create)
+
+
 class SubmissionFactory(factory.django.DjangoModelFactory):
 
     # this repeats the default of the Charfield LazyAttribute evaluation needs;
@@ -57,7 +69,7 @@ class Params:
                 lambda s: s.completed_on - timedelta(hours=4)
             ),
             pre_registration_completed=True,
-            price=factory.PostGenerationMethodCall("calculate_price"),
+            price=factory.PostGeneration(_calculate_price),
             metadata=factory.RelatedFactory(
                 "openforms.submissions.tests.factories.PostCompletionMetadataFactory",
                 factory_related_name="submission",
@@ -70,7 +82,7 @@ class Params:
             created_on=factory.LazyAttribute(
                 lambda s: s.completed_on - timedelta(hours=4)
             ),
-            price=factory.PostGenerationMethodCall("calculate_price"),
+            price=factory.PostGeneration(_calculate_price),
         )
         suspended = factory.Trait(
             suspended_on=factory.Faker("date_time_this_month", tzinfo=timezone.utc),