0001-lingo-add-support-for-async-payment-notification-in-.patch

Frédéric Péters, 17 août 2017 09:20

Voir les différences: en ligne côte à côte

Subject: [PATCH] lingo: add support for async payment notification in case of
 errors (#6638)

 .../lingo/management/commands/notify_payments.py   | 11 +++--
 combo/apps/lingo/views.py                          |  6 +--
 tests/test_lingo_payment.py                        | 53 ++++++++++++++++++++++
 3 files changed, 64 insertions(+), 6 deletions(-)

     # along with this program.  If not, see <http://www.gnu.org/licenses/>.
     import logging
     import datetime
     from django.core.management.base import BaseCommand
     from django.utils import timezone
     from combo.apps.lingo.models import BasketItem
-...
         def handle(self, *args, **kwargs):
             logger = logging.getLogger(__name__)
             for item in BasketItem.objects.filter(payment_date__isnull=False,
                     notification_date__isnull=True):
             now = timezone.now()
             for item in BasketItem.objects.filter(
                     notification_date__isnull=True,
                     cancellation_date__isnull=True,
                     payment_date__lt=now-datetime.timedelta(minutes=5)):
                 try:
                     item.notify_payment()
                 except:
                     logger.exception('error notifying payment for basket item %s', item.id)
                     logger.exception('error in async notification for basket item %s', item.id)

                 item.save()
                 try:
                     item.notify_payment()
                 except RuntimeError:
                     # ignore errors, it should be retried later on if it fails
                     pass
                 except:
                     # ignore errors, it will be retried later on if it fails
                     logger.exception('error in sync notification for basket item %s', item.id)
             regie.compute_extra_fees(user=transaction.user)
             if transaction.remote_items:
                 transaction.first_notify_remote_items_of_payments()

     from combo.apps.lingo.models import (Regie, BasketItem, Transaction,
             TransactionOperation, RemoteItem, EXPIRED, LingoBasketCell)
     from combo.apps.lingo.management.commands.update_transactions import Command as UpdateTransactionsCommand
     from combo.apps.lingo.management.commands.notify_payments import Command as NotifyPaymentsCommand
     from combo.utils import sign_url
     pytestmark = pytest.mark.django_db
-...
         resp = client.get(callback_url, data)
         assert resp.status_code == 200
         assert Transaction.objects.get(order_id=transaction_id).status == 3
     def test_payment_callback_error(regie, user):
         item = BasketItem.objects.create(user=user, regie=regie,
                             subject='test_item', amount='10.5',
                             source_url='http://example.org/testitem/')
         login()
         resp = client.post(reverse('lingo-pay'), {'regie': regie.pk})
         assert resp.status_code == 302
         location = resp.get('location')
         parsed = urlparse.urlparse(location)
         qs = urlparse.parse_qs(parsed.query)
         transaction_id = qs['transaction_id'][0]
         data = {'transaction_id': transaction_id, 'signed': True,
                 'amount': qs['amount'][0], 'ok': True}
         assert data['amount'] == '10.50'
         # call callback with GET
         callback_url = reverse('lingo-callback', kwargs={'regie_pk': regie.id})
         with mock.patch('combo.utils.RequestsSession.request') as request:
             mock_response = mock.Mock()
             def kaboom():
                 raise Exception('kaboom')
             mock_response.status_code = 500
             mock_response.raise_for_status = kaboom
             request.return_value = mock_response
             get_resp = client.get(callback_url, data)
             url = request.call_args[0][1]
             assert url.startswith('http://example.org/testitem/jump/trigger/paid')
         assert get_resp.status_code == 200
         assert Transaction.objects.get(order_id=transaction_id).status == 3
         assert BasketItem.objects.get(id=item.id).payment_date
         assert not BasketItem.objects.get(id=item.id).notification_date
         # too soon
         NotifyPaymentsCommand().handle()
         assert BasketItem.objects.get(id=item.id).payment_date
         assert not BasketItem.objects.get(id=item.id).notification_date
         # fake delay
         basket_item = BasketItem.objects.get(id=item.id)
         basket_item.payment_date = timezone.now() - timedelta(hours=1)
         basket_item.save()
         with mock.patch('combo.utils.RequestsSession.request') as request:
             mock_response = mock.Mock()
             mock_response.status_code = 200
             request.return_value = mock_response
             NotifyPaymentsCommand().handle()
             url = request.call_args[0][1]
             assert url.startswith('http://example.org/testitem/jump/trigger/paid')
         assert BasketItem.objects.get(id=item.id).payment_date
         assert BasketItem.objects.get(id=item.id).notification_date
+    -

Projet

Général

Profil

Produits Entr'ouvert » Combo

0001-lingo-add-support-for-async-payment-notification-in-.patch