[#3793] Revert fallback to random reference, fix related tests

Author: Viicos

src/openforms/payments/contrib/demo/tests/test_plugin.py

@@ -23,7 +23,7 @@ class DemoPaymentTests(TestCase):
 
     def test_payment(self):
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             form__slug="myform",
             form__payment_backend="demo",
             form__product__price=Decimal("11.35"),

src/openforms/payments/contrib/ogone/tests/test_plugin.py

@@ -29,7 +29,7 @@ def test_payment(self):
             pspid="psp123",
         )
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             form__slug="myform",
             form__payment_backend="ogone-legacy",
             form__payment_backend_options={"merchant_id": merchant.id},
@@ -131,7 +131,7 @@ def test_webhook(self):
             pspid="psp123",
         )
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             form__slug="myform",
             form__payment_backend="ogone-legacy",
             form__payment_backend_options={"merchant_id": merchant.id},

src/openforms/payments/models.py

@@ -56,17 +56,13 @@ def create_public_order_id_for(
         if prefix:
             prefix = f"{prefix}/"
 
-        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)
+        assert payment.submission.public_registration_reference
 
         pk = pk if pk is not None else payment.pk
 
-        return f"{prefix}{payment.submission.public_registration_reference}/{pk}"
+        return (
+            f"{prefix}{payment.submission.public_registration_reference}/{payment.pk}"
+        )
 
 
 class SubmissionPaymentQuerySet(models.QuerySet["SubmissionPayment"]):

src/openforms/payments/tests/test_models.py

@@ -86,38 +86,6 @@ def test_create_for_with_prefix(self, m: MagicMock):
         )
         self.assertEqual(payment.public_order_id, "xyz2020/OF-123456/4")
 
-    @patch(
-        "openforms.payments.models.GlobalConfiguration.get_solo",
-        return_value=GlobalConfiguration(
-            payment_order_id_prefix="", wait_for_payment_to_register=True
-        ),
-    )
-    @patch(
-        "openforms.submissions.public_references.get_random_reference",
-        return_value="OF-123456",
-    )
-    def test_create_for_no_registration(self, m1: MagicMock, m2: MagicMock):
-        amount = Decimal("11.25")
-        options = {
-            "foo": 123,
-        }
-
-        submission = SubmissionFactory.create(completed_not_preregistered=True)
-        # create some pre-existing records
-        SubmissionPaymentFactory.create_batch(size=2)
-
-        # create payment with auto-generated order_id
-        payment = SubmissionPayment.objects.create_for(
-            submission, "plugin1", options, amount
-        )
-
-        self.assertEqual(payment.public_order_id, "OF-123456/3")
-
-        payment = SubmissionPayment.objects.create_for(
-            submission, "plugin1", options, amount
-        )
-        self.assertEqual(payment.public_order_id, "OF-123456/4")
-
     def test_queryset_sum_amount(self):
         self.assertEqual(0, SubmissionPayment.objects.none().sum_amount())
 

src/openforms/payments/tests/test_views.py

@@ -48,7 +48,7 @@ def test_views(self, on_post_submission_event_mock):
         self.addCleanup(registry_mock.stop)
 
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             form__product__price=Decimal("11.25"),
             form__payment_backend="plugin1",
             form_url="http://allowed.foo/my-form",
@@ -191,7 +191,7 @@ def test_start_plugin_not_enabled(
         registry_mock.start()
         self.addCleanup(registry_mock.stop)
         submission = SubmissionFactory.create(
-            completed=True,
+            with_public_registration_reference=True,
             form__product__price=Decimal("11.25"),
             form__payment_backend="plugin1",
             form_url="http://allowed.foo/my-form",

src/openforms/payments/views.py

@@ -99,11 +99,13 @@ class PaymentFlowBaseView(APIView):
 class PaymentStartView(PaymentFlowBaseView, GenericAPIView):
     lookup_field = "uuid"
     lookup_url_kwarg = "uuid"
-    queryset = Submission.objects.all()
+    queryset = Submission.objects.exclude(completed_on__isnull=True)
     serializer_class = PaymentInfoSerializer
 
     def post(self, request, uuid: str, plugin_id: str):
-        submission = self.get_object()
+        submission: Submission = self.get_object()
+        assert submission.public_registration_reference
+
         try:
             plugin = register[plugin_id]
         except KeyError: