0002-systempayv2-allow-arbitrary-date-for-deferred-paymen.patch

Emmanuel Cazenave, 12 octobre 2018 15:51

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

Subject: [PATCH 2/2] systempayv2: allow arbitrary date for deferred payment
 (#26992)

 eopayment/systempayv2.py  | 26 +++++++++++--
 tests/test_systempayv2.py | 81 +++++++++++++++++++++++++++++++++++++++
 tox.ini                   |  1 +
 3 files changed, 105 insertions(+), 3 deletions(-)

     import hashlib
     import logging
     import string
     import pytz
     from six.moves.urllib import parse as urlparse
     import warnings
     from gettext import gettext as _
-...
         def request(self, amount, name=None, first_name=None, last_name=None,
                     address=None, email=None, phone=None, orderid=None, info1=None,
                     info2=None, info3=None, next_url=None, **kwargs):
                     info2=None, info3=None, next_url=None, capture_date=None, **kwargs):
             '''
                Create the URL string to send a request to SystemPay
             '''
             self.logger.debug('%s amount %s name %s address %s email %s phone %s '
                               'next_url %s info1 %s info2 %s info3 %s kwargs: %s',
                               'next_url %s info1 %s info2 %s info3 %s capture_date %s kwargs: %s',
                               __name__, amount, name, address, email, phone, info1,
                               info2, info3, next_url, kwargs)
                               info2, info3, next_url, capture_date, kwargs)
             # amount unit is cents
             amount = '%.0f' % (100 * amount)
             kwargs.update(add_vads({'amount': force_text(amount)}))
-...
                         fields[name] = parameter.default()
                     else:
                         fields[name] = parameter.default
             if capture_date:
                 try:
                     capture_date = dt.datetime.strptime(capture_date, "%Y-%m-%d").date()
                 except (TypeError, ValueError):
                     raise ValueError('Bad format for capture date, it should be yyyy-mm-dd.')
                 paris_tz = pytz.timezone('Europe/Paris')
                 utc_tz = pytz.timezone('Etc/UTC')
                 paris_trans_date = utc_tz.localize(
                     dt.datetime.strptime(fields[VADS_TRANS_DATE], "%Y%m%d%H%M%S")
                 ).astimezone(paris_tz)
                 vads_capture_delay = (
                     capture_date - paris_trans_date.date()
                 ).days
                 if vads_capture_delay <= 0:
                     raise ValueError("capture_date needs to be superior to the transaction date")
                 fields['vads_capture_delay'] = force_text(vads_capture_delay)
             check_vads(fields)
             fields[SIGNATURE] = force_text(self.signature(fields))
             self.logger.debug('%s request contains fields: %s', __name__, fields)

     # -*- coding: utf-8 -*-
     from datetime import datetime, timedelta
     import pytest
     from six.moves.urllib import parse as urlparse
-...
         'vads_trans_date': u'20090501193530',
+    }
     def get_field(form, field_name):
         for field in form.fields:
             if field['name'] == field_name:
                 return field
     def test_systempayv2():
         p = Payment(PARAMS)
         data = {'amount': 15.24, 'orderid': '654321',
-...
         # bad response
         with pytest.raises(ResponseError, match='missing signature, vads_ctx_mode or vads_auth_result'):
             p.response('foo=bar')
     def test_systempayv2_deferred_payment():
         default_params = {
             'secret_test': u'1122334455667788',
             'vads_site_id': u'12345678',
             'vads_ctx_mode': u'TEST',
+        }
         default_data = {
             'amount': 15.24, 'orderid': '654321', 'first_name': u'John',
             'last_name': u'Doe'
+        }
         p = Payment(default_params.copy())
         data = default_data.copy()
         data['capture_date'] = (datetime.now().date() + timedelta(days=3)).isoformat()
         transaction_id, f, form = p.request(**data)
         assert get_field(form, 'vads_capture_delay')['value'] == '3'
         # default vads_capture_delay used if no capture date
         params = default_params.copy()
         params['vads_capture_delay'] = 1
         p = Payment(params)
         transaction_id, f, form = p.request(**default_data.copy())
         assert get_field(form, 'vads_capture_delay')['value'] == '1'
         # capture date override vads_capture_delay
         params = default_params.copy()
         params['vads_capture_delay'] = 1
         p = Payment(params)
         data = default_data.copy()
         data['capture_date'] = (datetime.now().date() + timedelta(days=3)).isoformat()
         transaction_id, f, form = p.request(**data)
         assert get_field(form, 'vads_capture_delay')['value'] == '3'
         # capture date can't be inferior to the transaction date
         params = default_params.copy()
         params['vads_trans_date'] = (datetime.utcnow() + timedelta(days=3)).strftime("%Y%m%d%H%M%S")
         p = Payment(params)
         data = default_data.copy()
         data['capture_date'] = (datetime.now().date()).isoformat()
         with pytest.raises(
                 ValueError, match='capture_date needs to be superior to the transaction date'):
             transaction_id, f, form = p.request(**data)
         # capture date should have the right format
         p = Payment(params)
         data = default_data.copy()
         data['capture_date'] = 'not a date'
         with pytest.raises(
                 ValueError, match='Bad format for capture date, it should be yyyy-mm-dd.'):
             transaction_id, f, form = p.request(**data)
     @pytest.mark.freeze_time('2018-10-02 23:50:00')
     def test_paris_timezone():
         params = {
             'secret_test': u'1122334455667788',
             'vads_site_id': u'12345678',
             'vads_ctx_mode': u'TEST',
+        }
         data = {
             'amount': 15.24, 'orderid': '654321', 'first_name': u'John',
             'last_name': u'Doe', 'capture_date': '2018-10-03',
+        }
         p = Payment(params)
         with pytest.raises(
                 ValueError, match='capture_date needs to be superior to the transaction date'):
             # utcnow will return 2018-10-02 23:50:00,
             # converted to Europe/Paris is already 2018-10-03 ...
             # so 2018-10-03 for capture_date is invalid
             transaction_id, f, form = p.request(**data)

tox.ini
16	16	usedevelop = True
17	17	deps = coverage
18	18	pytest
	19	pytest-freezegun
19	20	py2: pytest-cov
20	21	mock
21		-

Projet

Général

Profil

Produits Entr'ouvert » EOPayment

0002-systempayv2-allow-arbitrary-date-for-deferred-paymen.patch