[FIX] payment_mollie: don't acknowledge webhook on API failure - #290812

diff --git a/addons/payment_mollie/controllers/main.py b/addons/payment_mollie/controllers/main.py
index fa77054b8748..b4e4efeed9a8 100755
--- a/addons/payment_mollie/controllers/main.py
+++ b/addons/payment_mollie/controllers/main.py
@@ -37,7 +37,10 @@ class MollieController(http.Controller):
                           embedded in the return URL.
         """
         _logger.info("handling redirection from Mollie with data:\n%s", pprint.pformat(data))
-        self._verify_and_process(data)
+        try:
+            self._verify_and_process(data)
+        except ValidationError:
+            _logger.error("Unable to process the payment data")
         return request.redirect('/payment/status')
 
     @http.route(_webhook_url, type='http', auth='public', methods=['POST'], csrf=False)
@@ -48,34 +51,27 @@ class MollieController(http.Controller):
                           embedded in the return URL
         :return: An empty string to acknowledge the notification
         :rtype: str
+        :raise ServiceUnavailable: If the payment data could not be fetched from Mollie
         """
         _logger.info("notification received from Mollie with data:\n%s", pprint.pformat(data))
-        self._verify_and_process(data, from_webhook=True)
+        try:
+            self._verify_and_process(data)
+        except ValidationError as error:
+            _logger.error("Unable to process the payment data")
+            raise ServiceUnavailable from error
         return ''  # Acknowledge the notification
 
     @staticmethod
-    def _verify_and_process(data, from_webhook=False):
+    def _verify_and_process(data):
         """Verify and process the payment data sent by Mollie.
 
         :param dict data: The payment data.
-        :param bool from_webhook: Whether the data were sent to the webhook.
         :return: None
-        :raise ServiceUnavailable: If the payment data could not be fetched from Mollie while
-                                   handling a webhook notification, so that Mollie retries later.
+        :raise ValidationError: If the payment data could not be fetched from Mollie
         """
         tx_sudo = request.env['payment.transaction'].sudo()._search_by_reference('mollie', data)
         if not tx_sudo:
             return
 
-        try:
-            verified_data = tx_sudo._send_api_request(
-                'GET', f'/payments/{tx_sudo.provider_reference}'
-            )
-        except ValidationError:
-            _logger.error("Unable to process the payment data")
-            if from_webhook:
-                # Don't acknowledge the notification: Mollie only retries calling the webhook when
-                # it doesn't receive a 2xx response.
-                raise ServiceUnavailable()
-        else:
-            tx_sudo._process('mollie', verified_data)
+        verified_data = tx_sudo._send_api_request("GET", f"/payments/{tx_sudo.provider_reference}")
+        tx_sudo._process("mollie", verified_data)
diff --git a/addons/payment_mollie/tests/test_mollie.py b/addons/payment_mollie/tests/test_mollie.py
index 2fb97fb66575..07bc5bae704a 100644
--- a/addons/payment_mollie/tests/test_mollie.py
+++ b/addons/payment_mollie/tests/test_mollie.py
@@ -40,45 +40,24 @@ class MollieTest(MollieCommon, PaymentHttpCommon):
             self._make_http_post_request(url, data=self.payment_data)
         self.assertEqual(tx.state, 'done')
 
-    @mute_logger('odoo.addons.payment_mollie.controllers.main')
-    def test_webhook_notification_not_acknowledged_when_payment_data_unavailable(self):
-        """ Test that the webhook doesn't acknowledge the notification when the payment data can't
-        be fetched from Mollie, so that Mollie retries later. """
-        tx = self._create_transaction('redirect')
-        url = self._build_url(MollieController._webhook_url)
+    @mute_logger("odoo.addons.payment_mollie.controllers.main")
+    def test_return_from_checkout_redirects_when_payment_data_unavailable(self):
+        self._create_transaction("redirect")
+        url = self._build_url(MollieController._return_url)
         with patch(
-            'odoo.addons.payment.models.payment_provider.PaymentProvider._send_api_request',
+            "odoo.addons.payment.models.payment_provider.PaymentProvider._send_api_request",
             side_effect=ValidationError("Service Unavailable"),
         ):
-            response = self._make_http_post_request(url, data=self.payment_data)
-        self.assertEqual(response.status_code, 503)
-        self.assertEqual(tx.state, 'draft')
+            response = self._make_http_get_request(url, params=self.payment_data)
+        self.assertTrue(response.url.endswith('/payment/status'))
 
-    @mute_logger('odoo.addons.payment.models.payment_transaction')
-    def test_webhook_notification_acknowledged_for_unknown_reference(self):
-        """ Test that the webhook acknowledges the notification when no transaction matches the
-        reference, as Mollie recommends for unknown ids. """
+    @mute_logger("odoo.addons.payment_mollie.controllers.main")
+    def test_webhook_notification_is_rejected_when_payment_data_unavailable(self):
+        self._create_transaction("redirect")
         url = self._build_url(MollieController._webhook_url)
         with patch(
-            'odoo.addons.payment.models.payment_provider.PaymentProvider._send_api_request',
-        ) as send_api_request_mock:
-            response = self._make_http_post_request(
-                url, data=dict(self.payment_data, ref='unknown reference'),
-            )
-        self.assertEqual(response.status_code, 200)
-        send_api_request_mock.assert_not_called()
-
-    @mute_logger('odoo.addons.payment_mollie.controllers.main')
-    def test_return_redirects_to_status_page_when_payment_data_unavailable(self):
-        """ Test that the customer is redirected to the status page when the payment data can't be
-        fetched from Mollie. """
-        tx = self._create_transaction('redirect')
-        url = self._build_url(MollieController._return_url)
-        with patch(
-            'odoo.addons.payment.models.payment_provider.PaymentProvider._send_api_request',
+            "odoo.addons.payment.models.payment_provider.PaymentProvider._send_api_request",
             side_effect=ValidationError("Service Unavailable"),
         ):
-            response = self._make_http_get_request(url, params=self.payment_data)
-        self.assertEqual(response.status_code, 200)
-        self.assertTrue(response.url.endswith('/payment/status'))
-        self.assertEqual(tx.state, 'draft')
+            response = self._make_http_post_request(url, data=self.payment_data)
+        self.assertEqual(response.status_code, 503)